diff --git a/scripts/GUI.py b/scripts/GUI.py index fa72517a3f048954e24985b691d4329606740fcd..5a574f7f9cd0334e1727a63b9787264045aac9b6 100644 --- a/scripts/GUI.py +++ b/scripts/GUI.py @@ -26,7 +26,7 @@ class VRSceneCreatorGUI(QMainWindow): self.DEBUG_TOOL_DIR = DEBUG_TOOL_DIR # Read configuration - self.config_reader = ConfigReader(self.SCRIPT_DIR, self.ROOT_DIR) + self.config_reader = ConfigReader(self.DEBUG_TOOL_DIR, self.ROOT_DIR) # Setup UI self.setup_ui() diff --git a/scripts/simple_tab.py b/scripts/simple_tab.py index 77d2420b368ea072cb5d93d19e5cd52a5fea19b4..a80dae8cb91a799c6aa706b9f5ad3b4a02fc18da 100644 --- a/scripts/simple_tab.py +++ b/scripts/simple_tab.py @@ -102,12 +102,25 @@ class PipelineWorker(QThread): print("Completed material_recognition") def run_edge_net(self): - print("Starting edge_net") # Debug print - self.progress.emit("Running EdgeNet...") - self.tab.edge_net.include_top = self.tab.include_top_check.isChecked() - self.tab.edge_net.run_all_steps() - print("Completed edge_net") # Debug print + print("Starting edge_net") + self.progress.emit("Running EdgeNet enhance360.py and infer360.py...") + + try: + self.tab.edge_net.include_top = self.tab.include_top_check.isChecked() + self.tab.edge_net._run_edge_net_process() + print("Completed edge_net") + except Exception as e: + print(f"EdgeNet failed: {str(e)}") + raise + def run_post_processing(self): + self.progress.emit("Running post-processing...") + self.tab.edge_net._run_mesh_split_process() + self.progress.emit("Completed mesh split (replace.py)") + self.tab.edge_net._run_blender_flip_process() + self.progress.emit("Completed blender flip (blenderFlip.py)") + self.progress.emit("Post-processing completed!") + def run_pipeline(self): self.clean_temp_files() self.copy_file() @@ -115,6 +128,8 @@ class PipelineWorker(QThread): self.run_depth_estimation() self.run_material_recognition() self.run_edge_net() + self.run_post_processing() + self.progress.emit("Pipeline completed!") class SimpleTab(QWidget): def __init__(self, config_reader): @@ -201,10 +216,12 @@ class SimpleTab(QWidget): layout.addWidget(preview_group) def handle_file_select(self): + file_path = select_file( self, "Select Input Image", - "Images (*.png *.jpg *.jpeg)" + "Images (*.png *.jpg *.jpeg)", + initial_dir=self.config_reader.directories['edgeNetDir'] + '/Data' ) if file_path: