Merge branch 'dev-0.1.12' into copilot/add-structured-logging-feature

Author: lachlangrose

loopstructural/gui/map2loop_tools/sorter_widget.py

@@ -286,7 +286,7 @@ def _run_sorter(self):
                 'geology': self.geologyLayerComboBox.currentLayer(),
                 'contacts': self.contactsLayerComboBox.currentLayer(),
                 'sorting_algorithm': algorithm_name,
-                'unit_name_column': self.unitNameFieldComboBox.currentField(),
+                'unit_name_field': self.unitNameFieldComboBox.currentField(),
                 'updater': lambda msg: QMessageBox.information(self, "Progress", msg),
             }
 

loopstructural/gui/map2loop_tools/thickness_calculator_widget.py

@@ -2,7 +2,7 @@
 
 import os
 
-from PyQt5.QtWidgets import QMessageBox, QWidget
+from PyQt5.QtWidgets import QLabel, QMessageBox, QWidget
 from qgis.PyQt import uic
 
 from loopstructural.toolbelt.preferences import PlgOptionsManager
@@ -256,8 +256,14 @@ def _run_calculator(self):
                 u = result['thicknesses'].loc[idx, 'name']
                 thick = result['thicknesses'].loc[idx, 'ThicknessStdDev']
                 if thick > 0:
-
-                    self.data_manager._stratigraphic_column.get_unit_by_name(u).thickness = thick
+                    unit = self.data_manager._stratigraphic_column.get_unit_by_name(u)
+                    if unit:
+                        unit.thickness = thick
+                    else:
+                        self.data_manager.logger(
+                            f"Warning: Unit '{u}' not found in stratigraphic column.",
+                            level=QLabel.Warning,
+                        )
             # Save debugging files if checkbox is checked
             if self.saveDebugCheckBox.isChecked():
                 if 'lines' in result:

loopstructural/gui/modelling/stratigraphic_column/stratigraphic_unit.py

@@ -130,20 +130,46 @@ def setData(self, data: Optional[dict] = None):
         data : dict or None
             Dictionary containing 'name' and 'colour' keys. If None, defaults are used.
         """
+        # Safely update internal state first
         if data:
             self.name = str(data.get("name", ""))
             self.colour = data.get("colour", "")
-            self.lineEditName.setText(self.name)
-            self.setStyleSheet(f"background-color: {self.colour};" if self.colour else "")
-            # self.lineEditColour.setText(self.colour)
         else:
             self.name = ""
             self.colour = ""
-            self.lineEditName.clear()
-            self.setStyleSheet("")
-            # self.lineEditColour.clear()
 
-        self.validateFields()
+        # Guard all direct Qt calls since the wrapped C++ objects may have been deleted
+        try:
+            if data:
+                if hasattr(self, 'lineEditName') and self.lineEditName is not None:
+                    try:
+                        self.lineEditName.setText(self.name)
+                    except RuntimeError:
+                        # Widget has been deleted; abort GUI updates
+                        return
+                try:
+                    self.setStyleSheet(f"background-color: {self.colour};" if self.colour else "")
+                except RuntimeError:
+                    return
+            else:
+                if hasattr(self, 'lineEditName') and self.lineEditName is not None:
+                    try:
+                        self.lineEditName.clear()
+                    except RuntimeError:
+                        return
+                try:
+                    self.setStyleSheet("")
+                except RuntimeError:
+                    return
+
+            # Validate fields if widgets still exist
+            try:
+                self.validateFields()
+            except RuntimeError:
+                return
+        except RuntimeError:
+            # Catch any unexpected RuntimeError from underlying Qt objects
+            return
 
     def getData(self) -> dict:
         """Return the widget data as a dictionary.

loopstructural/main/m2l_api.py

@@ -100,7 +100,6 @@ def sort_stratigraphic_column(
     unitname1_field=None,
     unitname2_field=None,
     structure=None,
-    unit_name_column=None,
     dip_field="DIP",
     dipdir_field="DIPDIR",
     orientation_type="Dip Direction",
@@ -154,22 +153,29 @@ def sort_stratigraphic_column(
     # Convert layers to GeoDataFrames
     geology_gdf = qgsLayerToGeoDataFrame(geology)
     contacts_gdf = qgsLayerToGeoDataFrame(contacts)
-    print(geology_gdf.columns)
     # Build units DataFrame
-    units_df = geology_gdf[['UNITNAME']].drop_duplicates().reset_index(drop=True)
-    if unit_name_field and unit_name_field != 'UNITNAME' and unit_name_field in geology_gdf.columns:
+    if (
+        unit_name_field
+        and unit_name_field != unit_name_field
+        and unit_name_field in geology_gdf.columns
+    ):
         units_df = geology_gdf[[unit_name_field]].drop_duplicates().reset_index(drop=True)
-        units_df.columns = ['UNITNAME']
+        units_df = units_df.rename(columns={unit_name_field: unit_name_field})
+
+    elif unit_name_field in geology_gdf.columns:
+        units_df = geology_gdf[[unit_name_field]].drop_duplicates().reset_index(drop=True)
+    else:
+        raise ValueError(f"Unit name field '{unit_name_field}' not found in geology data")
     if min_age_field and min_age_field in geology_gdf.columns:
         units_df = units_df.merge(
-            geology_gdf[['UNITNAME', min_age_field]].drop_duplicates(),
-            on='UNITNAME',
+            geology_gdf[[unit_name_field, min_age_field]].drop_duplicates(),
+            on=unit_name_field,
             how='left',
         )
     if max_age_field and max_age_field in geology_gdf.columns:
         units_df = units_df.merge(
-            geology_gdf[['UNITNAME', max_age_field]].drop_duplicates(),
-            on='UNITNAME',
+            geology_gdf[[unit_name_field, max_age_field]].drop_duplicates(),
+            on=unit_name_field,
             how='left',
         )
     # Build relationships DataFrame (contacts without geometry)
@@ -195,7 +201,7 @@ def sort_stratigraphic_column(
         'orientation_type': orientation_type,
         'dtm': dtm,
         'updater': updater,
-        'unit_name_column': unit_name_column,
+        'unit_name_column': unit_name_field,
     }
 
     # Only pass required arguments to the sorter
@@ -399,10 +405,10 @@ def calculate_thickness(
         geology_gdf = geology_gdf.rename(columns={unit_name_field: 'UNITNAME'})
     units = geology_gdf.copy()
 
-    units_unique = units.drop_duplicates(subset=[unit_name_field]).reset_index(drop=True)
-    units = pd.DataFrame({'name': units_unique[unit_name_field]})
+    units_unique = units.drop_duplicates(subset=['UNITNAME']).reset_index(drop=True)
+    units = pd.DataFrame({'name': units_unique['UNITNAME']})
     basal_contacts_gdf['type'] = 'BASAL'  # required by calculator
-
+  
     thickness = calculator.compute(
         units,
         stratigraphic_order,

loopstructural/plugin_main.py

@@ -47,6 +47,13 @@
 
 
 class LoopstructuralPlugin:
+    def show_fault_topology_dialog(self):
+        """Show the fault topology calculator dialog."""
+        from loopstructural.gui.map2loop_tools.fault_topology_widget import FaultTopologyWidget
+
+        dialog = FaultTopologyWidget(self.iface.mainWindow())
+        dialog.exec_()
+
     """QGIS plugin entrypoint for LoopStructural.
 
     This class initializes plugin resources, UI elements and data/model managers
@@ -113,6 +120,11 @@ def initGui(self):
         self.iface.registerOptionsWidgetFactory(self.options_factory)
 
         # -- Actions
+        self.action_fault_topology = QAction(
+            "Fault Topology Calculator",
+            self.iface.mainWindow(),
+        )
+        self.action_fault_topology.triggered.connect(self.show_fault_topology_dialog)
         self.action_help = QAction(
             QgsApplication.getThemeIcon("mActionHelpContents.svg"),
             self.tr("Help"),
@@ -142,6 +154,7 @@ def initGui(self):
         )
 
         self.toolbar.addAction(self.action_modelling)
+        self.toolbar.addAction(self.action_fault_topology)
         # -- Menu
         self.iface.addPluginToMenu(__title__, self.action_settings)
         self.iface.addPluginToMenu(__title__, self.action_help)
@@ -185,12 +198,14 @@ def initGui(self):
         self.toolbar.addAction(self.action_user_sorter)
         self.toolbar.addAction(self.action_basal_contacts)
         self.toolbar.addAction(self.action_thickness)
+        self.toolbar.addAction(self.action_fault_topology)
 
         self.iface.addPluginToMenu(__title__, self.action_sampler)
         self.iface.addPluginToMenu(__title__, self.action_sorter)
         self.iface.addPluginToMenu(__title__, self.action_user_sorter)
         self.iface.addPluginToMenu(__title__, self.action_basal_contacts)
         self.iface.addPluginToMenu(__title__, self.action_thickness)
+        self.iface.addPluginToMenu(__title__, self.action_fault_topology)
         self.action_basal_contacts.triggered.connect(self.show_basal_contacts_dialog)
 
         # Add all map2loop tool actions to the toolbar
@@ -403,58 +418,90 @@ def initProcessing(self):
         QgsApplication.processingRegistry().addProvider(self.provider)
 
     def unload(self):
-        """Clean up when plugin is disabled or uninstalled."""
+        """Clean up when plugin is disabled or uninstalled.
+
+        This implementation is defensive: initGui may not have been run when
+        QGIS asks the plugin to unload (plugin reloader), so attributes may be
+        missing. Use getattr to check for presence and guard removals/deletions.
+        """
         # -- Clean up dock widgets
-        if self.loop_dockwidget:
-            self.iface.removeDockWidget(self.loop_dockwidget)
-            del self.loop_dockwidget
-        if self.modelling_dockwidget:
-            self.iface.removeDockWidget(self.modelling_dockwidget)
-            del self.modelling_dockwidget
-        if self.visualisation_dockwidget:
-            self.iface.removeDockWidget(self.visualisation_dockwidget)
-            del self.visualisation_dockwidget
-
-        # -- Clean up menu
-        self.iface.removePluginMenu(__title__, self.action_help)
-        self.iface.removePluginMenu(__title__, self.action_settings)
-        self.iface.removePluginMenu(__title__, self.action_sampler)
-        self.iface.removePluginMenu(__title__, self.action_sorter)
-        self.iface.removePluginMenu(__title__, self.action_user_sorter)
-        self.iface.removePluginMenu(__title__, self.action_basal_contacts)
-        self.iface.removePluginMenu(__title__, self.action_thickness)
-        # self.iface.removeMenu(self.menu)
+        for dock_attr in ("loop_dockwidget", "modelling_dockwidget", "visualisation_dockwidget"):
+            dock = getattr(self, dock_attr, None)
+            if dock:
+                try:
+                    self.iface.removeDockWidget(dock)
+                except Exception:
+                    # ignore errors during unload
+                    pass
+                try:
+                    delattr(self, dock_attr)
+                except Exception:
+                    pass
+
+        # -- Clean up menu/actions (only remove if they exist)
+        for attr in (
+            "action_help",
+            "action_settings",
+            "action_sampler",
+            "action_sorter",
+            "action_user_sorter",
+            "action_basal_contacts",
+            "action_thickness",
+            "action_fault_topology",
+            "action_modelling",
+            "action_visualisation",
+        ):
+            act = getattr(self, attr, None)
+            if act:
+                try:
+                    self.iface.removePluginMenu(__title__, act)
+                except Exception:
+                    pass
+                try:
+                    delattr(self, attr)
+                except Exception:
+                    pass
+
         # -- Clean up preferences panel in QGIS settings
-        self.iface.unregisterOptionsWidgetFactory(self.options_factory)
-        # -- Unregister processing
-        QgsApplication.processingRegistry().removeProvider(self.provider)
+        options_factory = getattr(self, "options_factory", None)
+        if options_factory:
+            try:
+                self.iface.unregisterOptionsWidgetFactory(options_factory)
+            except Exception:
+                pass
+            try:
+                delattr(self, "options_factory")
+            except Exception:
+                pass
+
+        # -- Unregister processing provider
+        provider = getattr(self, "provider", None)
+        if provider:
+            try:
+                QgsApplication.processingRegistry().removeProvider(provider)
+            except Exception:
+                pass
+            try:
+                delattr(self, "provider")
+            except Exception:
+                pass
 
         # remove from QGIS help/extensions menu
-        if self.action_help_plugin_menu_documentation:
-            self.iface.pluginHelpMenu().removeAction(self.action_help_plugin_menu_documentation)
-
-        # remove actions
-        del self.action_settings
-        del self.action_help
-        del self.toolbar
-
-    def run(self):
-        """Run main process.
-
-        Raises
-        ------
-        Exception
-            If there is no item in the feed.
-        """
-        try:
-            self.log(
-                message=self.tr("Everything ran OK."),
-                log_level=3,
-                push=False,
-            )
-        except Exception as err:
-            self.log(
-                message=self.tr("Houston, we've got a problem: {}".format(err)),
-                log_level=2,
-                push=True,
-            )
+        help_action = getattr(self, "action_help_plugin_menu_documentation", None)
+        if help_action:
+            try:
+                self.iface.pluginHelpMenu().removeAction(help_action)
+            except Exception:
+                pass
+            try:
+                delattr(self, "action_help_plugin_menu_documentation")
+            except Exception:
+                pass
+
+        # remove toolbar if present
+        if getattr(self, "toolbar", None):
+            try:
+                # There's no explicit removeToolbar API; deleting reference is fine.
+                delattr(self, "toolbar")
+            except Exception:
+                pass