fix: enhance contact rextraction tool

Author: rabii-chaarani

m2l/processing/algorithms/extract_basal_contacts.py

@@ -23,7 +23,9 @@
     QgsProcessingParameterFeatureSink,
     QgsProcessingParameterFeatureSource,
     QgsProcessingParameterString,
-    QgsProcessingParameterField
+    QgsProcessingParameterField,
+    QgsProcessingParameterMatrix,
+    QgsSettings
 )
 # Internal imports
 from ...main.vectorLayerWrapper import qgsLayerToGeoDataFrame, GeoDataFrameToQgsLayer
@@ -37,6 +39,7 @@ class BasalContactsAlgorithm(QgsProcessingAlgorithm):
     INPUT_GEOLOGY = 'GEOLOGY'
     INPUT_FAULTS = 'FAULTS'
     INPUT_STRATI_COLUMN = 'STRATIGRAPHIC_COLUMN'
+    INPUT_IGNORE_UNITS = 'IGNORE_UNITS'
     OUTPUT = "BASAL_CONTACTS"
 
     def name(self) -> str:
@@ -83,12 +86,25 @@ def initAlgorithm(self, config: Optional[dict[str, Any]] = None) -> None:
                 optional=True,
             )
         )
-
+        strati_settings = QgsSettings()
+        last_strati_column = strati_settings.value("m2l/strati_column", "")
+        self.addParameter(
+            QgsProcessingParameterMatrix(
+                name=self.INPUT_STRATI_COLUMN,
+                description="Stratigraphic Order",
+                headers=["Unit"],
+                numberRows=0,
+                defaultValue=last_strati_column
+            )
+        )
+        ignore_settings = QgsSettings()
+        last_ignore_units = ignore_settings.value("m2l/ignore_units", "")
         self.addParameter(
-            QgsProcessingParameterString(
-                self.INPUT_STRATI_COLUMN,
-                "Stratigraphic Column Names",
-                defaultValue="",
+            QgsProcessingParameterMatrix(
+                self.INPUT_IGNORE_UNITS,
+                "Unit(s) to ignore",
+                headers=["Unit"],
+                defaultValue=last_ignore_units,
                 optional=True
             )
         )
@@ -107,25 +123,35 @@ def processAlgorithm(
         feedback: QgsProcessingFeedback,
     ) -> dict[str, Any]:
 
+        feedback.pushInfo("Loading data...")
         geology = self.parameterAsVectorLayer(parameters, self.INPUT_GEOLOGY, context)
         faults = self.parameterAsVectorLayer(parameters, self.INPUT_FAULTS, context)
-        strati_column = self.parameterAsString(parameters, self.INPUT_STRATI_COLUMN, context)
-        
-        if strati_column and strati_column.strip():
-            strati_column = [unit.strip() for unit in strati_column.split(',')]
-        
+        strati_column = self.parameterAsMatrix(parameters, self.INPUT_STRATI_COLUMN, context)
+        ignore_units = self.parameterAsMatrix(parameters, self.INPUT_IGNORE_UNITS, context) 
+        # if strati_column and strati_column.strip():
+        #     strati_column = [unit.strip() for unit in strati_column.split(',')]
+        # Save stratigraphic column settings
+        strati_column_settings = QgsSettings()
+        strati_column_settings.setValue('m2l/strati_column', strati_column)
+
+        ignore_settings = QgsSettings()
+        ignore_settings.setValue("m2l/ignore_units", ignore_units)
+
         unit_name_field = self.parameterAsString(parameters, 'UNIT_NAME_FIELD', context)
 
         geology = qgsLayerToGeoDataFrame(geology)
-
+        mask = ~geology['Formation'].astype(str).str.strip().isin(ignore_units)
+        geology = geology[mask].reset_index(drop=True)
+        
         faults = qgsLayerToGeoDataFrame(faults) if faults else None
         if unit_name_field != 'UNITNAME' and unit_name_field in geology.columns:
             geology = geology.rename(columns={unit_name_field: 'UNITNAME'})
-        
+
         feedback.pushInfo("Extracting Basal Contacts...")
         contact_extractor = ContactExtractor(geology, faults)
         basal_contacts = contact_extractor.extract_basal_contacts(strati_column)
 
+        feedback.pushInfo("Exporting Basal Contacts Layer...")
         basal_contacts = GeoDataFrameToQgsLayer(
             self, 
             contact_extractor.basal_contacts,