merge with noelle/thickness_calculator

Author: noellehmcheng

m2l/processing/algorithms/sampler.py

@@ -10,7 +10,7 @@
 """
 # Python imports
 from typing import Any, Optional
-from qgis.PyQt.QtCore import QMetaType
+from qgis.PyQt.QtCore import QVariant
 from osgeo import gdal
 import pandas as pd
 
@@ -182,11 +182,11 @@ def processAlgorithm(
                 dtype_str = str(dtype)
 
                 if dtype_str in ['float16', 'float32', 'float64']:
-                    field_type = QMetaType.Type.Double
+                    field_type = QVariant.Double
                 elif dtype_str in ['int8', 'int16', 'int32', 'int64']:
-                    field_type = QMetaType.Type.Int
+                    field_type = QVariant.Int
                 else:
-                    field_type = QMetaType.Type.QString 
+                    field_type = QVariant.String
 
                 fields.append(QgsField(column_name, field_type))
 

m2l/processing/algorithms/thickness_calculator.py

@@ -48,6 +48,7 @@ class ThicknessCalculatorAlgorithm(QgsProcessingAlgorithm):
 
     INPUT_THICKNESS_CALCULATOR_TYPE = 'THICKNESS_CALCULATOR_TYPE'
     INPUT_DTM = 'DTM'
+    INPUT_BOUNDING_BOX_TYPE = 'BOUNDING_BOX_TYPE'
     INPUT_BOUNDING_BOX = 'BOUNDING_BOX'
     INPUT_MAX_LINE_LENGTH = 'MAX_LINE_LENGTH'
     INPUT_STRATI_COLUMN = 'STRATIGRAPHIC_COLUMN'
@@ -56,7 +57,7 @@ class ThicknessCalculatorAlgorithm(QgsProcessingAlgorithm):
     INPUT_DIPDIR_FIELD = 'DIPDIR_FIELD'
     INPUT_DIP_FIELD = 'DIP_FIELD'
     INPUT_GEOLOGY = 'GEOLOGY'
-    INPUT_THICKNESS_ORIENTATION_TYPE = 'THICKNESS_ORIENTATION_TYPE'
+    INPUT_ORIENTATION_TYPE = 'ORIENTATION_TYPE'
     INPUT_UNIT_NAME_FIELD = 'UNIT_NAME_FIELD'
     INPUT_SAMPLED_CONTACTS = 'SAMPLED_CONTACTS'
     INPUT_STRATIGRAPHIC_COLUMN_LAYER = 'STRATIGRAPHIC_COLUMN_LAYER'
@@ -100,6 +101,29 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
             )
         )
 
+        self.addParameter(
+            QgsProcessingParameterEnum(
+                self.INPUT_BOUNDING_BOX_TYPE,
+                "Bounding Box Type",
+                options=['Extract from geology layer', 'User defined'],
+                allowMultiple=False,
+                defaultValue=1
+            )
+        )
+        
+        bbox_settings = QgsSettings()
+        last_bbox = bbox_settings.value("m2l/bounding_box", "")
+        self.addParameter(
+            QgsProcessingParameterMatrix(
+                self.INPUT_BOUNDING_BOX,
+                description="Static Bounding Box",
+                headers=['minx','miny','maxx','maxy'],
+                numberRows=1,
+                defaultValue=last_bbox,
+                optional=True
+            )
+        )
+        
         self.addParameter(
             QgsProcessingParameterNumber(
                 self.INPUT_MAX_LINE_LENGTH,
@@ -171,8 +195,8 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
         )
         self.addParameter(
             QgsProcessingParameterEnum(
-                'THICKNESS_ORIENTATION_TYPE',
-                'Thickness Orientation Type',
+                self.INPUT_ORIENTATION_TYPE,
+                'Orientation Type',
                 options=['Dip Direction', 'Strike'],
                 defaultValue=0  # Default to Dip Direction
             )
@@ -213,26 +237,38 @@ def processAlgorithm(
         thickness_type_index = self.parameterAsEnum(parameters, self.INPUT_THICKNESS_CALCULATOR_TYPE, context)
         thickness_type = ['InterpolatedStructure', 'StructuralPoint'][thickness_type_index]
         dtm_data = self.parameterAsRasterLayer(parameters, self.INPUT_DTM, context)
-        bounding_box = self.parameterAsMatrix(parameters, self.INPUT_BOUNDING_BOX, context)
+        bounding_box_type = self.parameterAsEnum(parameters, self.INPUT_BOUNDING_BOX_TYPE, context)
         max_line_length = self.parameterAsSource(parameters, self.INPUT_MAX_LINE_LENGTH, context)
         basal_contacts = self.parameterAsSource(parameters, self.INPUT_BASAL_CONTACTS, context)
         geology_data = self.parameterAsSource(parameters, self.INPUT_GEOLOGY, context)
         structure_data = self.parameterAsSource(parameters, self.INPUT_STRUCTURE_DATA, context)
-        thickness_orientation_type = self.parameterAsEnum(parameters, self.INPUT_THICKNESS_ORIENTATION_TYPE, context)
-        is_strike = (thickness_orientation_type == 1)
+        orientation_type = self.parameterAsEnum(parameters, self.INPUT_ORIENTATION_TYPE, context)
+        is_strike = (orientation_type == 1)
         structure_dipdir_field = self.parameterAsString(parameters, self.INPUT_DIPDIR_FIELD, context)
         structure_dip_field = self.parameterAsString(parameters, self.INPUT_DIP_FIELD, context)
         sampled_contacts = self.parameterAsSource(parameters, self.INPUT_SAMPLED_CONTACTS, context)
         unit_name_field = self.parameterAsString(parameters, self.INPUT_UNIT_NAME_FIELD, context)
 
-        geology_layer = self.parameterAsVectorLayer(parameters, self.INPUT_GEOLOGY, context)
-        extent = geology_layer.extent()
-        bounding_box = {
-            'minx': extent.xMinimum(),
-            'miny': extent.yMinimum(),
-            'maxx': extent.xMaximum(),
-            'maxy': extent.yMaximum()
-        }
+        if bounding_box_type == 0:
+            geology_layer = self.parameterAsVectorLayer(parameters, self.INPUT_GEOLOGY, context)
+            extent = geology_layer.extent()
+            bounding_box = {
+                'minx': extent.xMinimum(),
+                'miny': extent.yMinimum(),
+                'maxx': extent.xMaximum(),
+                'maxy': extent.yMaximum()
+            }
+            feedback.pushInfo("Using bounding box from geology layer")
+        else:
+            static_bbox_matrix = self.parameterAsMatrix(parameters, self.INPUT_BOUNDING_BOX, context)
+            if not static_bbox_matrix or len(static_bbox_matrix) == 0:
+                raise QgsProcessingException("Bounding box is required")
+            
+            bounding_box = matrixToDict(static_bbox_matrix)
+            
+            bbox_settings = QgsSettings()
+            bbox_settings.setValue("m2l/bounding_box", static_bbox_matrix)
+            feedback.pushInfo("Using bounding box from user input")
 
         stratigraphic_column_source = self.parameterAsSource(parameters, self.INPUT_STRATIGRAPHIC_COLUMN_LAYER, context)
         stratigraphic_order = []