From 43e76e39c4f39d09a2d7b7d3144f7933c4f58799 Mon Sep 17 00:00:00 2001 From: Jean Bilheux Date: Mon, 21 Aug 2023 10:25:27 -0400 Subject: [PATCH 1/5] Adding pip in the list of conda dependencies --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 63211da..b2a3efa 100644 --- a/environment.yml +++ b/environment.yml @@ -19,6 +19,7 @@ dependencies: - pyqtgraph - tqdm - dxchange + - pip - pip: - NeuNorm - inflect From c219f5572a7e5231b3998de945b2bee5b16d8a50 Mon Sep 17 00:00:00 2001 From: Jean Bilheux Date: Mon, 21 Aug 2023 11:55:12 -0400 Subject: [PATCH 2/5] removed duplicate --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index b2a3efa..318b32d 100644 --- a/environment.yml +++ b/environment.yml @@ -18,7 +18,6 @@ dependencies: - tomopy - pyqtgraph - tqdm - - dxchange - pip - pip: - NeuNorm From c8c99ae9307903847d5f867fd1c89bc0406df61f Mon Sep 17 00:00:00 2001 From: Jean Bilheux Date: Mon, 21 Aug 2023 11:55:38 -0400 Subject: [PATCH 3/5] removed duplicate --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 318b32d..0f70403 100644 --- a/environment.yml +++ b/environment.yml @@ -21,5 +21,4 @@ dependencies: - pip - pip: - NeuNorm - - inflect - neutronbraggedge From bb84eccaa6e659ca00e00e4187a03c5ec156a78e Mon Sep 17 00:00:00 2001 From: JeanBilheux Date: Mon, 21 Aug 2023 13:39:56 -0400 Subject: [PATCH 4/5] making sure UI works from macPro. this refs #76 --- src/hyperctui/pre_processing_monitor/event_handler.py | 4 +++- src/hyperctui/setup_projections/event_handler.py | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hyperctui/pre_processing_monitor/event_handler.py b/src/hyperctui/pre_processing_monitor/event_handler.py index 4d65cd4..2c3ef5e 100644 --- a/src/hyperctui/pre_processing_monitor/event_handler.py +++ b/src/hyperctui/pre_processing_monitor/event_handler.py @@ -28,7 +28,7 @@ def update_ob_monitor_table(self, """ this method check the new OB folders showing up and updates the table """ - logging.info(f"updating the monitor table of {DataType.ob}") + logging.info(f"-- checking if new {DataType.ob} showed up and updating the monitor table.") table_ui = self.parent.ui.obs_tableWidget @@ -37,8 +37,10 @@ def update_ob_monitor_table(self, name_of_output_ob_folder = self.grand_parent.ui.obs_output_location_label.text() list_ob_folders = o_get.list_ob_folders_in_output_directory(output_folder=name_of_output_ob_folder, title=title) + logging.info(f"-- list_ob_folders: {list_ob_folders}") list_folder_previously_found = self.grand_parent.session_dict[ SessionKeys.list_ob_folders_initially_there] + logging.info(f"-- list_folder_previously_found: {list_folder_previously_found}") if len(list_ob_folders) == len(list_folder_previously_found): logging.info(f"No new OBs have been found! nothing to update.") diff --git a/src/hyperctui/setup_projections/event_handler.py b/src/hyperctui/setup_projections/event_handler.py index 4de15ef..0126ef3 100644 --- a/src/hyperctui/setup_projections/event_handler.py +++ b/src/hyperctui/setup_projections/event_handler.py @@ -40,8 +40,6 @@ def produce_unused_formatted_run_title(self, run_title): full_file_name = os.path.join(mcp_raw, run_title) - print(f"{full_file_name =}") - if not os.path.exists(full_file_name): return run_title, False From ab656c7ac744524a4ee5faa26fcf1e44f55ad4bb Mon Sep 17 00:00:00 2001 From: JeanBilheux Date: Mon, 21 Aug 2023 14:48:52 -0400 Subject: [PATCH 5/5] brought back the code to the loading of the reconstructions. this refs #76 --- src/hyperctui/autonomous_reconstruction/event_handler.py | 5 ++++- static/reconstruction_config.json | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 static/reconstruction_config.json diff --git a/src/hyperctui/autonomous_reconstruction/event_handler.py b/src/hyperctui/autonomous_reconstruction/event_handler.py index 3675fc6..1e9dd39 100644 --- a/src/hyperctui/autonomous_reconstruction/event_handler.py +++ b/src/hyperctui/autonomous_reconstruction/event_handler.py @@ -350,7 +350,8 @@ def checking_state_of_projections_table(self): self.parent.ui.autonomous_reconstruction_tabWidget.setCurrentIndex(1) # fill table with as many as TOF regions reconstruction requested - tof_regions_dict = self.parent.session_dict[SessionKeys.tof_regions] + # tof_regions_dict = self.parent.session_dict[SessionKeys.tof_regions] + tof_regions_dict = self.parent.tof_regions o_table = TableHandler(table_ui=self.parent.ui.autonomous_reconstructions_tableWidget) row_index = 0 @@ -399,6 +400,8 @@ def refresh_reconstruction_table_clicked(self): + + def fill_table_with_list_folders(self, list_folders=None, starting_row_index=0): if list_folders is None: diff --git a/static/reconstruction_config.json b/static/reconstruction_config.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/static/reconstruction_config.json @@ -0,0 +1 @@ +{} \ No newline at end of file