Close map2loop dialogs after successful runs

Co-authored-by: lachlangrose <7371904+lachlangrose@users.noreply.github.com>

Author: Copilot

loopstructural/gui/map2loop_tools/basal_contacts_widget.py

@@ -177,7 +177,7 @@ def _run_extractor(self):
         # Validate inputs
         if not self.geologyLayerComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a geology layer.")
-            return
+            return False
 
         try:
             result, contact_type = self._extract_contacts()
@@ -197,14 +197,16 @@ def _run_extractor(self):
                             message=f"[map2loop] Failed to save basal contacts debug output: {err}",
                             log_level=2,
                         )
-        except Exception as err:
-            if self._debug:
-                self._debug.plugin.log(
-                    message=f"[map2loop] Basal contacts extraction failed: {err}",
-                    log_level=2,
-                )
-                raise err
-            QMessageBox.critical(self, "Error", f"An error occurred: {err}")
+                return True
+            except Exception as err:
+                if self._debug:
+                    self._debug.plugin.log(
+                        message=f"[map2loop] Basal contacts extraction failed: {err}",
+                        log_level=2,
+                    )
+                    raise err
+                QMessageBox.critical(self, "Error", f"An error occurred: {err}")
+        return False
 
     def get_parameters(self):
         """Get current widget parameters.

loopstructural/gui/map2loop_tools/dialogs.py

@@ -36,8 +36,8 @@ def setup_ui(self):
 
     def _run_and_accept(self):
         """Run the sampler and accept dialog if successful."""
-        self.widget._run_sampler()
-        # Dialog stays open so user can see the result
+        if self.widget._run_sampler():
+            self.accept()
 
 
 class SorterDialog(QDialog):
@@ -73,7 +73,8 @@ def setup_ui(self):
 
     def _run_and_accept(self):
         """Run the sorter and accept dialog if successful."""
-        self.widget._run_sorter()
+        if self.widget._run_sorter():
+            self.accept()
 
 
 class UserDefinedSorterDialog(QDialog):
@@ -101,16 +102,15 @@ def setup_ui(self):
         layout.addWidget(self.widget)
 
         # Replace the run button with dialog buttons
-        # self.widget.runButton.hide()
-
-        # self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, self)
-        # self.button_box.accepted.connect(self._run_and_accept)
-        # self.button_box.rejected.connect(self.reject)
-        # layout.addWidget(self.button_box)
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, self)
+        self.button_box.accepted.connect(self._run_and_accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
 
     def _run_and_accept(self):
         """Run the sorter and accept dialog if successful."""
-        self.widget._run_sorter()
+        if self.widget._run_sorter():
+            self.accept()
 
 
 class BasalContactsDialog(QDialog):
@@ -146,7 +146,8 @@ def setup_ui(self):
 
     def _run_and_accept(self):
         """Run the extractor and accept dialog if successful."""
-        self.widget._run_extractor()
+        if self.widget._run_extractor():
+            self.accept()
 
 
 class ThicknessCalculatorDialog(QDialog):
@@ -182,7 +183,8 @@ def setup_ui(self):
 
     def _run_and_accept(self):
         """Run the calculator and accept dialog if successful."""
-        self.widget._run_calculator()
+        if self.widget._run_calculator():
+            self.accept()
 
 
 class PaintStratigraphicOrderDialog(QDialog):
@@ -218,5 +220,5 @@ def setup_ui(self):
 
     def _run_and_accept(self):
         """Run the painter and accept dialog if successful."""
-        self.widget._run_painter()
-
+        if self.widget._run_painter():
+            self.accept()

loopstructural/gui/map2loop_tools/fault_topology_widget.py

@@ -90,3 +90,4 @@ def _run_topology(self):
         # addGeoDataFrameToproject(gdf, "Input Faults")
         # addGeoDataFrameToproject(df, "Fault Topology Table")
         QMessageBox.information(self, "Success", f"Calculated fault topology for {len(df)} pairs.")
+        return True

loopstructural/gui/map2loop_tools/sampler_widget.py

@@ -149,7 +149,7 @@ def _run_sampler(self):
         # Validate inputs
         if not self.spatialDataLayerComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a spatial data layer.")
-            return
+            return False
 
         sampler_type = self.samplerTypeComboBox.currentText()
 
@@ -158,10 +158,10 @@ def _run_sampler(self):
                 QMessageBox.warning(
                     self, "Missing Input", "Geology layer is required for Decimator."
                 )
-                return
+                return False
             if not self.dtmLayerComboBox.currentLayer():
                 QMessageBox.warning(self, "Missing Input", "DTM layer is required for Decimator.")
-                return
+                return False
 
         # Run the sampler API
         try:
@@ -274,6 +274,8 @@ def _run_sampler(self):
                 )
             else:
                 QMessageBox.warning(self, "Warning", "No samples were generated.")
+                return False
+            return True
 
         except Exception as e:
             if self._debug:
@@ -284,6 +286,7 @@ def _run_sampler(self):
             if PlgOptionsManager.get_debug_mode():
                 raise e
             QMessageBox.critical(self, "Error", f"An error occurred: {str(e)}")
+            return False
 
     def get_parameters(self):
         """Get current widget parameters.

loopstructural/gui/map2loop_tools/sorter_widget.py

@@ -288,11 +288,11 @@ def _run_sorter(self):
         # Validate inputs
         if not self.geologyLayerComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a geology layer.")
-            return
+            return False
 
         if not self.contactsLayerComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a contacts layer.")
-            return
+            return False
 
         algorithm_index = self.sortingAlgorithmComboBox.currentIndex()
         algorithm_name = self.sorting_algorithms[algorithm_index]
@@ -305,12 +305,12 @@ def _run_sorter(self):
                     "Missing Input",
                     "Structure layer is required for observation projections.",
                 )
-                return
+                return False
             if not self.dtmLayerComboBox.currentLayer():
                 QMessageBox.warning(
                     self, "Missing Input", "DTM layer is required for observation projections."
                 )
-                return
+                return False
 
         # Run the sorter API
         try:
@@ -366,6 +366,7 @@ def _run_sorter(self):
                 )
             else:
                 QMessageBox.warning(self, "Error", "Failed to create stratigraphic column.")
+            return True
 
         except Exception as e:
             if self._debug:
@@ -376,6 +377,7 @@ def _run_sorter(self):
             if PlgOptionsManager.get_debug_mode():
                 raise e
             QMessageBox.critical(self, "Error", f"An error occurred: {str(e)}")
+            return False
 
     def get_parameters(self):
         """Get current widget parameters.

loopstructural/gui/map2loop_tools/thickness_calculator_widget.py

@@ -221,21 +221,21 @@ def _run_calculator(self):
         # Validate inputs
         if not self.geologyLayerComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a geology layer.")
-            return
+            return False
 
         if not self.basalContactsComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a basal contacts layer.")
-            return
+            return False
 
         if not self.sampledContactsComboBox.currentLayer():
             QMessageBox.warning(self, "Missing Input", "Please select a sampled contacts layer.")
-            return
+            return False
 
         if not self.structureLayerComboBox.currentLayer():
             QMessageBox.warning(
                 self, "Missing Input", "Please select a structure/orientation layer."
             )
-            return
+            return False
 
         calculator_type = self.calculatorTypeComboBox.currentText()
 
@@ -316,6 +316,8 @@ def _run_calculator(self):
                 )
             else:
                 QMessageBox.warning(self, "Error", "No thickness data was calculated.")
+                return False
+            return True
 
         except Exception as e:
             if self._debug:
@@ -326,6 +328,7 @@ def _run_calculator(self):
             if PlgOptionsManager.get_debug_mode():
                 raise e
             QMessageBox.critical(self, "Error", f"An error occurred: {str(e)}")
+            return False
 
     def get_parameters(self):
         """Get current widget parameters.