updating imports and adding faults loop up table

Author: lachlangrose

loopstructural/gui/modelling/model_definition/dem.py

@@ -4,7 +4,7 @@
 from qgis.core import QgsMapLayerProxyModel
 from qgis.PyQt import uic
 
-from ...main.helpers import ColumnMatcher, get_layer_names
+from ....main.helpers import ColumnMatcher, get_layer_names
 
 
 class DEMWidget(QWidget):
@@ -31,7 +31,6 @@ def set_dem_layer(self, layer):
             self.useDEMCheckBox.setChecked(False)
         self._persist_selection()
 
-
     def onUseDEMClicked(self):
         if self.useDEMCheckBox.isChecked():
             self.demLayerQgsMapLayerComboBox.setEnabled(True)
@@ -67,6 +66,7 @@ def _guess_layer(self):
         layer_names = get_layer_names(self.demLayerQgsMapLayerComboBox)
         matcher = ColumnMatcher(layer_names)
         match = matcher.find_match('DEM') or matcher.find_match('DTM')
+        print("DEMWidget: guessed layer match:", match)
         if match:
             layer = self.data_manager.find_layer_by_name(match)
             if layer:

loopstructural/gui/modelling/model_definition/fault_layers.py

@@ -4,7 +4,7 @@
 from qgis.core import QgsFieldProxyModel, QgsMapLayerProxyModel, QgsWkbTypes
 from qgis.PyQt import uic
 
-from ...main.helpers import ColumnMatcher, get_layer_names
+from ....main.helpers import ColumnMatcher, get_layer_names
 
 
 class FaultLayersWidget(QWidget):
@@ -108,13 +108,15 @@ def _guess_layer_and_fields(self):
                 self.faultTraceLayer.setLayer(layer)
                 fields = [field.name() for field in layer.fields()]
                 field_matcher = ColumnMatcher(fields)
-                if name_match := field_matcher.find_match('FAULT_NAME') or field_matcher.find_match('NAME'):
+                if name_match := field_matcher.find_match('FAULT_NAME') or field_matcher.find_match(
+                    'NAME'
+                ):
                     self.faultNameField.setField(name_match)
                 if dip_match := field_matcher.find_match('DIP'):
                     self.faultDipField.setField(dip_match)
-                if disp_match := field_matcher.find_match('DISPLACEMENT') or field_matcher.find_match(
-                    'SLIP'
-                ):
+                if disp_match := field_matcher.find_match(
+                    'DISPLACEMENT'
+                ) or field_matcher.find_match('SLIP'):
                     self.faultDisplacementField.setField(disp_match)
 
     def _persist_selection(self):

loopstructural/gui/modelling/model_definition/stratigraphic_layers.py

@@ -5,7 +5,7 @@
 from qgis.core import QgsMapLayerProxyModel, QgsWkbTypes
 from qgis.PyQt import uic
 
-from ...main.helpers import ColumnMatcher, get_layer_names
+from ....main.helpers import ColumnMatcher, get_layer_names
 
 
 class StratigraphicLayersWidget(QWidget):
@@ -189,9 +189,9 @@ def _guess_layers_and_fields(self):
         # Structural data
         structural_names = get_layer_names(self.structuralDataLayer)
         structural_matcher = ColumnMatcher(structural_names)
-        structural_match = structural_matcher.find_match('STRUCTURE') or structural_matcher.find_match(
-            'ORIENTATION'
-        )
+        structural_match = structural_matcher.find_match(
+            'STRUCTURE'
+        ) or structural_matcher.find_match('ORIENTATION')
         if structural_match:
             layer = self.data_manager.find_layer_by_name(structural_match)
             if layer:
@@ -209,12 +209,16 @@ def _persist_selection(self):
         if not self.data_manager:
             return
         settings = {
-            'basal_layer': self.basalContactsLayer.currentLayer().name()
-            if self.basalContactsLayer.currentLayer()
-            else None,
-            'structural_layer': self.structuralDataLayer.currentLayer().name()
-            if self.structuralDataLayer.currentLayer()
-            else None,
+            'basal_layer': (
+                self.basalContactsLayer.currentLayer().name()
+                if self.basalContactsLayer.currentLayer()
+                else None
+            ),
+            'structural_layer': (
+                self.structuralDataLayer.currentLayer().name()
+                if self.structuralDataLayer.currentLayer()
+                else None
+            ),
             'unit_name_field': self.unitNameField.currentField(),
             'orientation_field': self.orientationField.currentField(),
             'dip_field': self.dipField.currentField(),

loopstructural/main/data_manager.py

@@ -2,10 +2,10 @@
 from collections import defaultdict
 
 import numpy as np
-from LoopStructural.datatypes import BoundingBox
 from qgis.core import QgsPointXY, QgsProject, QgsVectorLayer
 
 from LoopStructural import FaultTopology, StratigraphicColumn
+from LoopStructural.datatypes import BoundingBox
 from LoopStructural.modelling.core.stratigraphic_column import StratigraphicColumnElementType
 
 from .vectorLayerWrapper import qgsLayerToGeoDataFrame
@@ -596,10 +596,13 @@ def find_layer_by_name(self, layer_name, layer_type=QgsVectorLayer):
                     log_level=2,
                 )
             i = 0
+
             while i < len(layers) and not issubclass(type(layers[i]), layer_type):
 
                 i += 1
-
+            if i >= len(layers):
+                self.logger(message=f"Layer '{layer_name}' is not a vector layer.", log_level=2)
+                return None
             if issubclass(type(layers[i]), layer_type):
                 return layers[i]
             else:

loopstructural/main/helpers.py

@@ -65,6 +65,15 @@ class ColumnMatcher:
         'MIN_AGE': ['min_age', 'minage', 'age_min', 'younger', 'min_age_ma', 'age_low'],
         'MAX_AGE': ['max_age', 'maxage', 'age_max', 'older', 'max_age_ma', 'age_high'],
         'GROUP': ['group', 'group_name', 'groupname', 'series', 'supergroup'],
+        'FAULT': [
+            'fault',
+            'faults',
+            'fault_layer',
+            'faults_layer',
+            'faultid',
+            'fault_id',
+            'fault_name',
+        ],
         'X': ['x', 'easting', 'longitude', 'lon', 'long', 'x_coord'],
         'Y': ['y', 'northing', 'latitude', 'lat', 'y_coord'],
         'Z': ['z', 'elevation', 'altitude', 'height', 'elev', 'z_coord'],