fix: add widget for painting stratigraphic order from column onto shapefile

Author: lachlangrose

.github/workflows/documentation.yml

@@ -53,7 +53,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Cache Sphinx cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: docs/_build/cache
         key: ${{ runner.os }}-sphinx-${{ hashFiles('docs/**/*') }}
@@ -69,7 +69,7 @@ jobs:
       run: sphinx-build -b html -j auto -d docs/_build/cache -q docs docs/_build/html
 
     - name: Save build doc as artifact
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: documentation
         path: docs/_build/html/*

.github/workflows/package_and_release.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Compile translations
         run: lrelease ${{ env.PROJECT_FOLDER }}/resources/i18n/*.ts
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: translations-build
           path: ${{ env.PROJECT_FOLDER }}/**/*.qm
@@ -81,7 +81,7 @@ jobs:
           python -m pip install -U -r requirements/packaging.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: translations-build
           path: ${{ env.PROJECT_FOLDER }}
@@ -102,7 +102,7 @@ jobs:
             --allow-uncommitted-changes \
             --plugin-repo-url $(gh api "repos/$GITHUB_REPOSITORY/pages" --jq '.html_url')
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: ${{ env.PROJECT_FOLDER }}-latest
           path: |
@@ -138,7 +138,7 @@ jobs:
           python -m pip install -U -r requirements/packaging.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: translations-build
           path: ${{ env.PROJECT_FOLDER }}

.github/workflows/packager.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Package the latest version
         run: qgis-plugin-ci package latest --allow-uncommitted-changes
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: ${{ env.PROJECT_FOLDER }}-latest
           path: ${{ env.PROJECT_FOLDER }}.*.zip

docs/usage/interface.md

@@ -44,6 +44,31 @@ The fault-fault relationship table defines the interaction between faults in the
 
 ![Fault Topology](../static/fault_topology_hamersley.png)
 
+## Processing Tools
+
+The plugin provides several QGIS Processing algorithms for working with geological data. These can be accessed through the QGIS Processing Toolbox.
+
+### Paint Stratigraphic Order
+
+The **Paint Stratigraphic Order** algorithm allows you to visualize the stratigraphic order on geology polygons. This tool is useful for:
+- Visually debugging the stratigraphic column
+- Quality checking unit order
+- Creating visualizations of stratigraphic relationships
+
+The algorithm takes:
+- **Input Polygons**: A polygon layer containing geological units (e.g., your geology map)
+- **Unit Name Field**: The field in your polygon layer that contains unit names
+- **Stratigraphic Column**: A table or layer with the stratigraphic column (ordered from youngest to oldest)
+- **Paint Mode**: Choose between:
+  - **Stratigraphic Order** (0 = youngest, N = oldest): Paints a numeric order onto each polygon
+  - **Cumulative Thickness**: Paints the cumulative thickness from the bottom (oldest) unit
+
+The algorithm adds a new field to your polygon layer:
+- `strat_order`: The stratigraphic order (when using Stratigraphic Order mode)
+- `cum_thickness`: The cumulative thickness in the stratigraphic column (when using Cumulative Thickness mode)
+
+Units that don't match the stratigraphic column will have null values, helping you identify data quality issues.
+
 ## Model parameters
 Once the layers have been selected, stratigraphic column defined and the fault topology relationships set, the LoopStructural model can be initialised.
 

loopstructural/gui/map2loop_tools/__init__.py

@@ -6,6 +6,7 @@
 
 from .dialogs import (
     BasalContactsDialog,
+    PaintStratigraphicOrderDialog,
     SamplerDialog,
     SorterDialog,
     ThicknessCalculatorDialog,
@@ -14,6 +15,7 @@
 
 __all__ = [
     'BasalContactsDialog',
+    'PaintStratigraphicOrderDialog',
     'SamplerDialog',
     'SorterDialog',
     'ThicknessCalculatorDialog',

loopstructural/gui/map2loop_tools/basal_contacts_widget.py

@@ -288,7 +288,7 @@ def _is_null_like(v):
                     continue
                 if val not in values:
                     values.append(val)
-            stratigraphic_order = values 
+            stratigraphic_order = values
             print(f"Extracting all contacts for units: {stratigraphic_order}")
             self.data_manager.logger(f"Extracting all contacts for units: {stratigraphic_order}")
 
@@ -310,4 +310,10 @@ def _is_null_like(v):
                 contact_type = "all contacts and basal contacts"
             elif not all_contacts and result['basal_contacts'].empty is False:
                 addGeoDataFrameToproject(result['basal_contacts'], "Basal contacts")
+            else:
+                QMessageBox.information(
+                    self,
+                    "No Contacts Found",
+                    "No contacts were found with the given parameters.",
+                )
         return result, contact_type

loopstructural/gui/map2loop_tools/dialogs.py

@@ -183,3 +183,40 @@ def setup_ui(self):
     def _run_and_accept(self):
         """Run the calculator and accept dialog if successful."""
         self.widget._run_calculator()
+
+
+class PaintStratigraphicOrderDialog(QDialog):
+    """Dialog for painting stratigraphic order onto geology polygons."""
+
+    def __init__(self, parent=None, data_manager=None, debug_manager=None):
+        """Initialize the paint stratigraphic order dialog."""
+        super().__init__(parent)
+        self.setWindowTitle("Paint Stratigraphic Order")
+        self.data_manager = data_manager
+        self.debug_manager = debug_manager
+        self.setup_ui()
+
+    def setup_ui(self):
+        """Set up the dialog UI."""
+        from .paint_stratigraphic_order_widget import PaintStratigraphicOrderWidget
+
+        layout = QVBoxLayout(self)
+        self.widget = PaintStratigraphicOrderWidget(
+            self,
+            data_manager=self.data_manager,
+            debug_manager=self.debug_manager,
+        )
+        layout.addWidget(self.widget)
+
+        # Replace the run button with dialog buttons
+        self.widget.runButton.hide()
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, self)
+        self.button_box.accepted.connect(self._run_and_accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+    def _run_and_accept(self):
+        """Run the painter and accept dialog if successful."""
+        self.widget._run_painter()
+