From df9ad81a10cfe32706291570e67088c7990f2665 Mon Sep 17 00:00:00 2001 From: Somdev Sangwan Date: Tue, 30 May 2023 06:53:25 +0530 Subject: [PATCH] bruh moment 8 --- run.py | 103 --------------------------------------------------------- 1 file changed, 103 deletions(-) diff --git a/run.py b/run.py index 63ed35d..1cecab2 100755 --- a/run.py +++ b/run.py @@ -1,22 +1,6 @@ #!/usr/bin/env python3 -<<<<<<< HEAD import sys import time -======= -<<<<<<< HEAD -<<<<<<< HEAD -import sys -import time -<<<<<<< HEAD -======= - ->>>>>>> 54f800d (Add GPU support, Quit on missing model, Remove globals (sorry)) -======= -import sys ->>>>>>> dc0653a (Restore globals, add process time for better comparison) -======= ->>>>>>> 2b14613 (Move process time to the correct place) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video import torch import shutil import core.globals @@ -69,23 +53,8 @@ def start_processing(): start_time = time.time() if args['gpu']: process_video(args['source_img'], args["frame_paths"]) -<<<<<<< HEAD end_time = time.time() print(flush=True) -======= -<<<<<<< HEAD -<<<<<<< HEAD - end_time = time.time() - print(flush=True) -======= - print(flush=True) - end_time = time.time() ->>>>>>> 2b14613 (Move process time to the correct place) -======= - end_time = time.time() - print(flush=True) ->>>>>>> 0f782ff (Move process time to the correct place) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video print(f"Processing time: {end_time - start_time:.2f} seconds", flush=True) return frame_paths = args["frame_paths"] @@ -98,13 +67,6 @@ def start_processing(): p.get() pool.close() pool.join() -<<<<<<< HEAD - end_time = time.time() - print(flush=True) - print(f"Processing time: {end_time - start_time:.2f} seconds", flush=True) -======= -<<<<<<< HEAD -<<<<<<< HEAD end_time = time.time() print(flush=True) print(f"Processing time: {end_time - start_time:.2f} seconds", flush=True) @@ -138,15 +100,6 @@ def preview_video(video_path): img_label.pack() cap.release() -======= - print(flush=True) -======= ->>>>>>> 0f782ff (Move process time to the correct place) - end_time = time.time() - print(flush=True) - print(f"Processing time: {end_time - start_time:.2f} seconds", flush=True) ->>>>>>> 2b14613 (Move process time to the correct place) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video def select_face(): @@ -229,15 +182,7 @@ if __name__ == "__main__": start() quit() window = tk.Tk() -<<<<<<< HEAD - window.geometry("600x500") -======= -<<<<<<< HEAD window.geometry("600x700") -======= - window.geometry("600x500") ->>>>>>> a440cef (better gui) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video window.title("roop") window.configure(bg="#2d3436") window.resizable(width=False, height=False) @@ -249,57 +194,21 @@ if __name__ == "__main__": # Select a face button face_button = tk.Button(window, text="Select a face", command=select_face, bg="#2d3436", fg="#74b9ff", highlightthickness=4, relief="flat", highlightbackground="#74b9ff", activebackground="#74b9ff", borderwidth=4) -<<<<<<< HEAD - face_button.place(x=60,y=120,width=180,height=80) - - # Select a target button - target_button = tk.Button(window, text="Select a target", command=select_target, bg="#2d3436", fg="#74b9ff", highlightthickness=4, relief="flat", highlightbackground="#74b9ff", activebackground="#74b9ff", borderwidth=4) - target_button.place(x=360,y=120,width=180,height=80) -======= -<<<<<<< HEAD face_button.place(x=60,y=320,width=180,height=80) # Select a target button target_button = tk.Button(window, text="Select a target", command=select_target, bg="#2d3436", fg="#74b9ff", highlightthickness=4, relief="flat", highlightbackground="#74b9ff", activebackground="#74b9ff", borderwidth=4) target_button.place(x=360,y=320,width=180,height=80) -======= - face_button.place(x=60,y=120,width=180,height=80) - - # Select a target button - target_button = tk.Button(window, text="Select a target", command=select_target, bg="#2d3436", fg="#74b9ff", highlightthickness=4, relief="flat", highlightbackground="#74b9ff", activebackground="#74b9ff", borderwidth=4) - target_button.place(x=360,y=120,width=180,height=80) ->>>>>>> a440cef (better gui) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video # FPS limit checkbox limit_fps = tk.IntVar() fps_checkbox = tk.Checkbutton(window, relief="groove", activebackground="#2d3436", activeforeground="#74b9ff", selectcolor="black", text="Limit FPS to 30", fg="#dfe6e9", borderwidth=0, highlightthickness=0, bg="#2d3436", variable=limit_fps, command=toggle_fps_limit) -<<<<<<< HEAD - fps_checkbox.place(x=30,y=230,width=240,height=31) -======= -<<<<<<< HEAD fps_checkbox.place(x=30,y=500,width=240,height=31) -======= - fps_checkbox.place(x=30,y=230,width=240,height=31) ->>>>>>> a440cef (better gui) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video fps_checkbox.select() # Keep frames checkbox keep_frames = tk.IntVar() frames_checkbox = tk.Checkbutton(window, relief="groove", activebackground="#2d3436", activeforeground="#74b9ff", selectcolor="black", text="Keep frames dir", fg="#dfe6e9", borderwidth=0, highlightthickness=0, bg="#2d3436", variable=keep_frames, command=toggle_keep_frames) -<<<<<<< HEAD - frames_checkbox.place(x=37,y=280,width=240,height=31) - - # Start button - start_button = tk.Button(window, text="Start", bg="#f1c40f", relief="flat", borderwidth=0, highlightthickness=0, command=lambda: [save_file(), start()]) - start_button.place(x=240,y=360,width=120,height=49) - - # Status label - status_label = tk.Label(window, width=580, justify="center", text="Status: waiting for input...", fg="#2ecc71", bg="#2d3436") - status_label.place(x=10,y=440,width=580,height=30) -======= -<<<<<<< HEAD frames_checkbox.place(x=37,y=450,width=240,height=31) # Start button @@ -310,16 +219,4 @@ if __name__ == "__main__": status_label = tk.Label(window, width=580, justify="center", text="Status: waiting for input...", fg="#2ecc71", bg="#2d3436") status_label.place(x=10,y=640,width=580,height=30) -======= - frames_checkbox.place(x=37,y=280,width=240,height=31) - - # Start button - start_button = tk.Button(window, text="Start", bg="#f1c40f", relief="flat", borderwidth=0, highlightthickness=0, command=lambda: [save_file(), start()]) - start_button.place(x=240,y=360,width=120,height=49) - - # Status label - status_label = tk.Label(window, width=580, justify="center", text="Status: waiting for input...", fg="#2ecc71", bg="#2d3436") - status_label.place(x=10,y=440,width=580,height=30) ->>>>>>> a440cef (better gui) ->>>>>>> TitasDas-feature/preview-for-face-image-and-input-video window.mainloop()