Merge branch 'noelle/sorter' into processing/processing_tools

Author: rabii-chaarani

m2l/main/vectorLayerWrapper.py

@@ -454,3 +454,35 @@ def dataframeToQgsLayer(
     feedback.pushInfo("Done.")
     feedback.setProgress(100)
     return sink, sink_id
+
+from qgis.core import NULL
+from PyQt5.QtCore import QVariant
+
+def qvariantToFloat(f, field_name):
+    val = f.attribute(field_name)  # usually returns a native Python type
+    # null / empty values
+    if val in (None, NULL, ''):
+        return None
+    # strings with decimal comma (depending on locale)
+    if isinstance(val, str):
+        val = val.strip()
+        if val == '':
+            return None
+        val = val.replace(',', '.')  # replace comma with dot if present
+        try:
+            return float(val)
+        except ValueError:
+            pass
+    # residual QVariant
+    if isinstance(val, QVariant):
+        # toDouble() -> (value, ok)
+        d, ok = val.toDouble()
+        return float(d) if ok else None
+    # native int/float
+    if isinstance(val, (int, float)):
+        return float(val)
+    # fallback conversion attempt
+    try:
+        return float(val)
+    except Exception:
+        return None

m2l/processing/algorithms/__init__.py

@@ -1,4 +1,4 @@
 from .extract_basal_contacts import BasalContactsAlgorithm
 from .sorter import StratigraphySorterAlgorithm
 from .thickness_calculator import ThicknessCalculatorAlgorithm
-from .sampler import SamplerAlgorithm
+from .sampler import SamplerAlgorithm

m2l/processing/algorithms/extract_basal_contacts.py

@@ -41,6 +41,7 @@ class BasalContactsAlgorithm(QgsProcessingAlgorithm):
     INPUT_STRATI_COLUMN = 'STRATIGRAPHIC_COLUMN'
     INPUT_IGNORE_UNITS = 'IGNORE_UNITS'
     OUTPUT = "BASAL_CONTACTS"
+    ALL_CONTACTS = "ALL_CONTACTS"
 
     def name(self) -> str:
         """Return the algorithm name."""
@@ -127,6 +128,13 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
             )
         )
 
+        self.addParameter(
+            QgsProcessingParameterFeatureSink(
+                "ALL_CONTACTS",
+                "All Contacts",
+            )
+        )
+
     def processAlgorithm(
         self,
         parameters: dict[str, Any],
@@ -172,6 +180,7 @@ def processAlgorithm(
 
         feedback.pushInfo("Extracting Basal Contacts...")
         contact_extractor = ContactExtractor(geology, faults)
+        all_contacts = contact_extractor.extract_all_contacts()
         basal_contacts = contact_extractor.extract_basal_contacts(strati_column)
 
         feedback.pushInfo("Exporting Basal Contacts Layer...")
@@ -183,7 +192,15 @@ def processAlgorithm(
             output_key=self.OUTPUT,
             feedback=feedback,
             )
-        return {self.OUTPUT: basal_contacts}
+        contacts_layer = GeoDataFrameToQgsLayer(
+            self, 
+            all_contacts,
+            parameters=parameters,
+            context=context,
+            output_key=self.ALL_CONTACTS,
+            feedback=feedback,
+            )
+        return {self.OUTPUT: basal_contacts, self.ALL_CONTACTS: contacts_layer}
 
     def createInstance(self) -> QgsProcessingAlgorithm:
         """Create a new instance of the algorithm."""

m2l/processing/algorithms/sampler.py

@@ -26,15 +26,21 @@
     QgsProcessingParameterFeatureSource,
     QgsProcessingParameterRasterLayer,
     QgsProcessingParameterEnum,
+    QgsProcessingParameterRasterLayer,
+    QgsProcessingParameterEnum,
     QgsProcessingParameterNumber,
     QgsFields,
+    QgsFields,
     QgsField,
     QgsFeature,
     QgsGeometry,
     QgsPointXY,
     QgsVectorLayer,
     QgsWkbTypes,
     QgsCoordinateReferenceSystem
+    QgsVectorLayer,
+    QgsWkbTypes,
+    QgsCoordinateReferenceSystem
 )
 # Internal imports
 from ...main.vectorLayerWrapper import qgsLayerToGeoDataFrame
@@ -74,20 +80,25 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
 
 
         self.addParameter(
+            QgsProcessingParameterEnum(
             QgsProcessingParameterEnum(
                 self.INPUT_SAMPLER_TYPE,
                 "SAMPLER_TYPE",
                 ["Decimator", "Spacing"],
                 defaultValue=0
+                ["Decimator", "Spacing"],
+                defaultValue=0
             )
         )
 
         self.addParameter(
+            QgsProcessingParameterRasterLayer(
             QgsProcessingParameterRasterLayer(
                 self.INPUT_DTM,
                 "DTM",
                 [QgsProcessing.TypeRaster],
                 optional=True,
+                optional=True,
             )
         )
 
@@ -115,6 +126,8 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
                 "DECIMATION",
                 QgsProcessingParameterNumber.Integer,
                 defaultValue=1,
+                QgsProcessingParameterNumber.Integer,
+                defaultValue=1,
                 optional=True,
             )
         )
@@ -125,6 +138,8 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
                 "SPACING",
                 QgsProcessingParameterNumber.Double,
                 defaultValue=200.0,
+                QgsProcessingParameterNumber.Double,
+                defaultValue=200.0,
                 optional=True,
             )
         )
@@ -133,6 +148,7 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
             QgsProcessingParameterFeatureSink(
                 self.OUTPUT,
                 "Sampled Points",
+                "Sampled Points",
             )
         )
 
@@ -161,12 +177,18 @@ def processAlgorithm(
         geology = qgsLayerToGeoDataFrame(geology)
         spatial_data_gdf = qgsLayerToGeoDataFrame(spatial_data)
         dtm_gdal = gdal.Open(dtm.source()) if dtm is not None and dtm.isValid() else None
+        spatial_data_gdf = qgsLayerToGeoDataFrame(spatial_data)
+        dtm_gdal = gdal.Open(dtm.source()) if dtm is not None and dtm.isValid() else None
 
+        if sampler_type == "Decimator":
         if sampler_type == "Decimator":
             feedback.pushInfo("Sampling...")
             sampler = SamplerDecimator(decimation=decimation, dtm_data=dtm_gdal, geology_data=geology)
             samples = sampler.sample(spatial_data_gdf)
+            sampler = SamplerDecimator(decimation=decimation, dtm_data=dtm_gdal, geology_data=geology)
+            samples = sampler.sample(spatial_data_gdf)
 
+        if sampler_type == "Spacing":
         if sampler_type == "Spacing":
             feedback.pushInfo("Sampling...")
             sampler = SamplerSpacing(spacing=spacing, dtm_data=dtm_gdal, geology_data=geology)
@@ -192,6 +214,33 @@ def processAlgorithm(
             crs
         )
 
+        if samples is not None and not samples.empty:
+            for _index, row in samples.iterrows():
+                feature = QgsFeature(fields)
+                
+                # decimator has z values
+                if 'Z' in samples.columns and pd.notna(row.get('Z')):
+                    wkt = f"POINT Z ({row['X']} {row['Y']} {row['Z']})"
+                    feature.setGeometry(QgsGeometry.fromWkt(wkt))
+                else:
+                    #spacing has no z values
+                    feature.setGeometry(QgsGeometry.fromPointXY(QgsPointXY(row['X'], row['Y'])))
+                
+                feature.setAttributes([
+                    str(row.get('ID', '')),
+                    float(row.get('X', 0)),
+                    float(row.get('Y', 0)),
+                    float(row.get('Z', 0)) if pd.notna(row.get('Z')) else 0.0,
+                    str(row.get('featureId', ''))
+                ])
+                
+                sink.addFeature(feature)
+
+            fields,
+            QgsWkbTypes.PointZ if 'Z' in (samples.columns if samples is not None else []) else QgsWkbTypes.Point,
+            crs
+        )
+
         if samples is not None and not samples.empty:
             for _index, row in samples.iterrows():
                 feature = QgsFeature(fields)