Close map2loop dialogs after successful runs

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,6 +197,7 @@ def _run_extractor(self):
                             message=f"[map2loop] Failed to save basal contacts debug output: {err}",
                             log_level=2,
                         )
+                return True
         except Exception as err:
             if self._debug:
                 self._debug.plugin.log(
@@ -205,6 +206,7 @@ def _run_extractor(self):
                 )
                 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