fix: add option to use shapefile z values instead of dem when the shapefile has a 3D element

Author: lachlangrose

loopstructural/gui/modelling/model_definition/fault_layers.py

@@ -37,14 +37,24 @@ def enableZCheckbox(self, enable):
     def onUseZCoordinateClicked(self):
         """Handle changes to the Z coordinate checkbox."""
         self.useZCoordinate = self.useZCoordinateCheckBox.isChecked()
-    def set_fault_trace_layer(self, layer, fault_name_field=None, fault_dip_field=None, fault_displacement_field=None):
+    def set_fault_trace_layer(self, layer, fault_name_field=None, fault_dip_field=None, fault_displacement_field=None, use_z_coordinate=False):
         self.faultTraceLayer.setLayer(layer)
         if fault_name_field:
             self.faultNameField.setField(fault_name_field)
         if fault_dip_field:
             self.faultDipField.setField(fault_dip_field)
         if fault_displacement_field:
             self.faultDisplacementField.setField(fault_displacement_field)
+        if layer is not None and layer.isValid():
+            if layer.wkbType() != QgsWkbTypes.Unknown:
+                has_z = QgsWkbTypes.hasZ(layer.wkbType())
+                self.data_manager.logger(message=f"Layer {layer.name()} has Z coordinate: {has_z}", log_level=2)
+                self.enableZCheckbox(has_z)
+                self.useZCoordinateCheckBox.setChecked(use_z_coordinate)
+                self.useZCoordinate = use_z_coordinate
+            else:
+                self.data_manager.logger(message="Unknown geometry type.", log_level=2)
+    
     def onFaultTraceLayerChanged(self, layer):
         self.faultNameField.setLayer(layer)
         self.faultDipField.setLayer(layer)

loopstructural/gui/modelling/model_definition/stratigraphic_layers.py

@@ -49,7 +49,7 @@ def enableStructuralPointsZCheckBox(self, enable):
             self.useStructuralPointsZCoordinatesCheckBox.setChecked(self.structural_points_use_z)
         else:
             self.useStructuralPointsZCoordinatesCheckBox.setChecked(False)
-    def set_basal_contacts(self, layer, unitname_field=None):
+    def set_basal_contacts(self, layer, unitname_field=None, use_z_coordinate=False):
         self.basalContactsLayer.setLayer(layer)
         if layer is not None and layer.isValid():
             if layer.wkbType() != QgsWkbTypes.Unknown:
@@ -62,7 +62,9 @@ def set_basal_contacts(self, layer, unitname_field=None):
             self.enableBasalContactsZCheckBox(False)
         if unitname_field:
             self.unitNameField.setField(unitname_field)
-    def set_orientations_layer(self, layer, strike_field=None, dip_field=None, unitname_field=None, orientation_type=None):
+        self.basal_contacts_use_z = use_z_coordinate
+        self.useBasalContactsZCoordinatesCheckBox.setChecked(use_z_coordinate)
+    def set_orientations_layer(self, layer, strike_field=None, dip_field=None, unitname_field=None, orientation_type=None, use_z_coordinate=False):
         self.structuralDataLayer.setLayer(layer)
         if layer is not None and layer.isValid():
             if layer.wkbType() != QgsWkbTypes.Unknown:
@@ -83,6 +85,9 @@ def set_orientations_layer(self, layer, strike_field=None, dip_field=None, unitn
             index = self.orientationType.findText(orientation_type, Qt.MatchFixedString)
             if index >= 0:
                 self.orientationType.setCurrentIndex(index)
+        if use_z_coordinate:
+            self.structural_points_use_z = use_z_coordinate
+            self.useStructuralPointsZCoordinatesCheckBox.setChecked(use_z_coordinate)
     def onBasalContactsChanged(self, layer):
         self.unitNameField.setLayer(layer)
         self.data_manager.set_basal_contacts(layer, self.unitNameField.currentField())