UI/refactor into separate classes

.github/labeler.yml

@@ -44,7 +44,7 @@ tooling:
     - any-glob-to-any-file:
         - .pre-commit-config.yaml
         - setup.cfg
-        
+
 
 UI:
   - head-branch:

.github/workflows/auto-labeler.yml

@@ -1,9 +1,9 @@
-name: "🏷 PR Labeler"
+name: "Pull Request Labeler"
 on:
-  - pull_request_target
+- pull_request_target
 
 jobs:
-  triage:
+  labeler:
     permissions:
       contents: read
       pull-requests: write

.github/workflows/documentation.yml

@@ -10,7 +10,7 @@ on:
       - "loopstructural/**/*.py"
       - "loopstructural/metadata.txt"
       - 'requirements/documentation.txt'
-    tags: 
+    tags:
       - "*"
 
   pull_request:
@@ -87,9 +87,8 @@ jobs:
       with:
         # Upload entire repository
         path: docs/_build/html/
-        
+
     - name: Deploy to GitHub Pages
       id: deployment
       if: ${{ github.event_name == 'push' && ( startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' ) }}
       uses: actions/deploy-pages@v4
-

.github/workflows/linter.yml

@@ -16,6 +16,8 @@ on:
 env:
   PROJECT_FOLDER: "loopstructural"
   PYTHON_VERSION: 3.9
+permissions:
+  contents: write
 
 
 jobs:
@@ -44,8 +46,7 @@ jobs:
       - name: Lint with ruff
         run: |
           ruff check ${{env.PROJECT_FOLDER}} --fix
-      - uses: stefanzweifel/git-auto-commit-action@v6
-        with:
-          repo-token: "${{ secrets.GH_PAT }}"
-          commit_message: "style: style fixes by ruff and autoformatting by black"
+      # - uses: stefanzweifel/git-auto-commit-action@v6
+      #   with:
+      #     commit_message: "style: style fixes by ruff and autoformatting by black"
 

.github/workflows/packager.yml

@@ -35,7 +35,7 @@ jobs:
           python -m pip install -U -r requirements/packaging.txt
           python -m pip install --no-deps -U -r requirements/embedded.txt -t ${{ env.PROJECT_FOLDER }}/embedded_external_libs
           ls loopstructural
-          
+
       - name: Update translations
         run: pylupdate5 -noobsolete -verbose ${{ env.PROJECT_FOLDER }}/resources/i18n/plugin_translation.pro
 
@@ -50,4 +50,3 @@ jobs:
           name: ${{ env.PROJECT_FOLDER }}-latest
           path: ${{ env.PROJECT_FOLDER }}.*.zip
           if-no-files-found: error
-

.github/workflows/release-please.yml

@@ -18,7 +18,7 @@ jobs:
         id: release
       - name: debug
         run: echo "release_created=${{ steps.release.outputs.loopstructural--tag_name }}"
-          
+
     outputs:
       release_created: ${{ steps.release.outputs.releases_created }}
   package:
@@ -40,4 +40,3 @@ jobs:
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/Loop3d/${{ env.PACKAGE_NAME }}/actions/workflows/release.yml/dispatches \
             -d "{\"ref\":\"${{ steps.tag.outputs.tag }}\"}"
-

.github/workflows/releaser.yml

@@ -56,5 +56,3 @@ jobs:
         --create-plugin-repo
         --osgeo-username "$OSGEO_USERNAME"
         --osgeo-password "$OSGEO_PASSWORD"
-
-

.github/workflows/tester.yml

@@ -80,4 +80,3 @@ jobs:
   #       run: |
   #         Xvfb :1 &
   #         python3 -m pytest tests/qgis/
-

.pre-commit-config.yaml

@@ -26,33 +26,7 @@ repos:
           - --fix-only
           - --target-version=py39
 
-  - repo: https://github.com/python/black
-    rev: 24.1.1
-    hooks:
-      - id: black
-        args:
-          - --target-version=py39
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        args:
-          - --profile
-          - black
-          - --filter-files
 
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        files: ^loopstructural/.*\.py$
-        additional_dependencies: ["flake8-qgis<2"]
-        args:
-          [
-            "--config=setup.cfg",
-            "--select=E9,F63,F7,F82,QGS101,QGS102,QGS103,QGS104,QGS106",
-          ]
 
 ci:
     autoupdate_schedule: quarterly

.vscode/extensions.json

@@ -2,9 +2,9 @@
   "recommendations": [
     "davidanson.vscode-markdownlint",
     "ms-python.black-formatter",
-    
+
     "ms-python.isort",
-    
+
     "ms-python.python",
     "njpwerner.autodocstring",
     "redhat.vscode-yaml",

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 0.1.3 - 2025-04-15
 
-### Fixed 
+### Fixed
 
 - updating CI so that plugin is automatically pushed to QGIS plugin repository on release
 

CONTRIBUTING.md

@@ -17,4 +17,3 @@ Make sure your code *roughly* follows [PEP-8](https://www.python.org/dev/peps/pe
 - docstrings: [sphinx-style](https://sphinx-rtd-tutorial.readthedocs.io/en/latest/docstrings.html#the-sphinx-docstring-format) is used to write technical documentation.
 - formatting: [black](https://black.readthedocs.io/) is used to automatically format the code without debate.
 - sorted imports: [isort](https://pycqa.github.io/isort/) is used to sort imports
-

docs/conf.py

@@ -1,7 +1,6 @@
 #!python3
 
-"""
-    Configuration for project documentation using Sphinx.
+"""Configuration for project documentation using Sphinx.
 """
 
 # standard
@@ -12,7 +11,6 @@
 sys.path.insert(0, path.abspath(".."))  # move into project package
 
 # 3rd party
-import sphinx_rtd_theme  # theme of Read the Docs
 
 # Package
 from loopstructural import __about__

docs/development/design.md

@@ -0,0 +1,62 @@
+# Design Document for LoopStructural Plugin
+## Overview
+The LoopStructural plugin is designed to integrate geological modeling capabilities from LoopStructural into QGIS. It provides tools for visualizing, managing, and analyzing geological data, enabling users to create and refine geological models directly within the QGIS environment.
+
+### Design Choices
+1. Modular Architecture
+The plugin is structured into multiple modules, each responsible for specific functionalities:
+
+    - GUI Module: Contains user interface components such as dialogs, widgets, and tabs for interacting with the plugin.
+    - Main Module: Handles core functionalities like data management, model management, and project handling.
+    - Processing Module: Provides processing algorithms and tools for geological data analysis.
+    - Toolbelt Module: Includes utility functions like logging and preferences management.
+    - Resources Module: Stores static resources such as images, translations, and help files.
+
+    This modular design ensures separation of concerns, making the codebase easier to maintain and extend.
+
+2. Integration with QGIS
+The plugin leverages QGIS's PyQt-based framework for GUI development and its processing framework for data analysis. Key integration points include:
+
+    - Use of QgsCollapsibleGroupBox for organizing UI components.
+    - Implementation of custom processing algorithms using the Processing module.
+    - Utilization of QGIS's vector and raster layers for geological data representation.
+
+3. Dynamic UI Components
+The plugin dynamically generates UI components based on the data provided by the data_manager. For example:
+
+    - Fault adjacency tables are created dynamically based on unique faults retrieved from the data manager.
+    - Stratigraphic units tables are similarly generated, allowing users to interact with geological units.
+
+4. Custom Interactivity
+Interactive elements like QPushButton are used extensively in the UI. These buttons allow users to perform actions such as toggling states or cycling through options (e.g., changing colors to represent different statuses).
+
+5. Extensibility
+The plugin is designed to be extensible, allowing developers to add new features or modify existing ones with minimal impact on the overall architecture. Examples include:
+
+    - Adding new tabs or widgets to the GUI.
+    - Extending the data_manager to support additional geological data types.
+    - Implementing new processing algorithms in the Processing module.
+
+6. Resource Management
+Static resources such as images and translations are stored in the resources module. This ensures that all assets are centralized and easily accessible.
+
+7. Testing
+The plugin includes a tests directory with unit tests for various components. This ensures that changes to the codebase do not introduce regressions.
+
+## Key Components
+### GUI Module
+- Fault Adjacency Tab: Displays a table of faults with interactive buttons for adjacency settings.
+- Stratigraphic Units Tab: Similar to the fault adjacency tab but focused on stratigraphic units.
+- Visualization Widgets: Tools for rendering geological models and features.
+### Main Module
+- Data Manager: Handles loading, saving, and querying geological data.
+- Model Manager: Manages geological models, including their creation and modification.
+### Processing Module
+- Provider: Implements custom processing algorithms for geological data analysis.
+### Toolbelt Module
+- Log Handler: Provides logging utilities for debugging and monitoring.
+- Preferences: Manages user preferences and settings.
+## Future Enhancements
+- Support for additional geological data types.
+- Improved visualization capabilities using advanced rendering libraries.
+- Enhanced interactivity with more intuitive UI components.

loopstructural/__about__.py

@@ -1,8 +1,7 @@
 #! python3
 
-"""
-    Metadata about the package to easily retrieve informations about it.
-    See: https://packaging.python.org/guides/single-sourcing-package-version/
+"""Metadata about the package to easily retrieve informations about it.
+See: https://packaging.python.org/guides/single-sourcing-package-version/
 """
 
 # ############################################################################
@@ -12,7 +11,7 @@
 # standard library
 from configparser import ConfigParser
 from datetime import date
-from pathlib import Path 
+from pathlib import Path
 
 # ############################################################################
 # ########## Globals ###############
@@ -44,6 +43,7 @@ def plugin_metadata_as_dict() -> dict:
 
     Returns:
         dict: dict of dicts.
+
     """
     config = ConfigParser()
     if PLG_METADATA_FILE.is_file():

loopstructural/__init__.py

@@ -20,4 +20,4 @@ def classFactory(iface):
     """
     from .plugin_main import LoopstructuralPlugin
 
-    return LoopstructuralPlugin(iface) 
+    return LoopstructuralPlugin(iface)

loopstructural/gui/dlg_settings.py

@@ -1,8 +1,6 @@
 #! python3
 
-"""
-    Plugin settings form integrated into QGIS 'Options' menu.
-"""
+"""Plugin settings form integrated into QGIS 'Options' menu."""
 
 # standard
 import platform
@@ -84,11 +82,16 @@ def __init__(self, parent):
     def apply(self):
         """Called to permanently apply the settings shown in the options page (e.g. \
         save them to QgsSettings objects). This is usually called when the options \
-        dialog is accepted."""
+        dialog is accepted.
+        """
         settings = self.plg_settings.get_plg_settings()
 
         # misc
         settings.debug_mode = self.opt_debug.isChecked()
+        settings.interpolator_nelements = self.n_elements_spin_box.value()
+        settings.interpolator_npw = self.npw_spin_box.value()
+        settings.interpolator_cpw = self.cpw_spin_box.value()
+        settings.interpolator_regularisation = self.regularisation_spin_box.value()
         settings.version = __version__
 
         # dump new settings into QgsSettings
@@ -107,6 +110,11 @@ def load_settings(self):
         # global
         self.opt_debug.setChecked(settings.debug_mode)
         self.lbl_version_saved_value.setText(settings.version)
+        # self.interpolator_type_combo.setCurrentText(settings.interpolator_type)
+        self.n_elements_spin_box.setValue(settings.interpolator_nelements)
+        self.regularisation_spin_box.setValue(settings.interpolator_regularisation)
+        self.cpw_spin_box.setValue(settings.interpolator_cpw)
+        self.npw_spin_box.setValue(settings.interpolator_npw)
 
     def reset_settings(self):
         """Reset settings to default values (set in preferences.py module)."""