Re-organize reset function for readability

Signed-off-by: Brianna Major <[email protected]>
HEXRD · Dec 22, 2024 · 530d703 · 530d703
1 parent 450b976
commit 530d703
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/hexrdgui/llnl_import_tool_dialog.py b/hexrdgui/llnl_import_tool_dialog.py
@@ -800,15 +800,29 @@ def check_for_unsaved_changes(self):
             self.complete_current_selection()
 
     def reset_panel(self):
-        HexrdConfig().enable_image_mode_widget.emit(True)
+        # Remove any templates that exist
         self.clear_boundry()
+        # Reset internal state
+        self.completed = []
+        self.defaults.clear()
+        self.config_file = None
+        self.import_in_progress = False
+        self.loaded_images.clear()
+        self.edited_images.clear()
+        # Reset all UI values that are populated during import
         self.ui.image_plates.setCurrentIndex(0)
         self.ui.detectors.setCurrentIndex(0)
         self.ui.image_plate_files_label.setText('')
         self.ui.detector_files_label.setText('')
         self.ui.dark_files_label.setText('')
         self.ui.completed_dets_and_ips.setText('')
-        self.edited_images.clear()
+        not_default = self.ui.config_selection.currentIndex() != 0
+        self.ui.load_config.setEnabled(not_default)
+        self.ui.config_file_label.setEnabled(not_default)
+        self.ui.config_file_label.setText('No File Selected')
+        self.ui.config_file_label.setToolTip(
+            'Defaults to currently loaded configuration')
+        # Reset widget states - disable/enable/show/hide as appropriate
         self.enable_widgets(
             self.ui.image_plate_raw_image,
             self.ui.config,
@@ -832,17 +846,8 @@ def reset_panel(self):
             self.ui.instr_settings_label,
             self.ui.instr_settings,
         visible=False)
-        not_default = self.ui.config_selection.currentIndex() != 0
-        self.ui.load_config.setEnabled(not_default)
-        self.ui.config_file_label.setEnabled(not_default)
-        self.ui.config_file_label.setText('No File Selected')
-        self.ui.config_file_label.setToolTip(
-            'Defaults to currently loaded configuration')
-        self.completed = []
-        self.defaults.clear()
-        self.config_file = None
-        self.import_in_progress = False
-        self.loaded_images.clear()
+        # We're all reset and ready to re-enable the main UI features
+        HexrdConfig().enable_image_mode_widget.emit(True)
 
     def import_complete(self):
         self.import_in_progress = False