Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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/**/*') }}
Expand All@@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/package_and_release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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 }}
Expand All@@ -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: |
Expand DownExpand Up@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packager.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
25 changes: 25 additions & 0 deletions docs/usage/interface.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
2 changes: 2 additions & 0 deletions loopstructural/gui/map2loop_tools/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

from .dialogs import (
BasalContactsDialog,
PaintStratigraphicOrderDialog,
SamplerDialog,
SorterDialog,
ThicknessCalculatorDialog,
Expand All@@ -14,6 +15,7 @@

__all__ = [
'BasalContactsDialog',
'PaintStratigraphicOrderDialog',
'SamplerDialog',
'SorterDialog',
'ThicknessCalculatorDialog',
Expand Down
8 changes: 7 additions & 1 deletion loopstructural/gui/map2loop_tools/basal_contacts_widget.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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}")

Expand All@@ -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
37 changes: 37 additions & 0 deletions loopstructural/gui/map2loop_tools/dialogs.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()

Loading