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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down
, '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
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,14 @@ def initialize_model(self):
# Run update_model in a background thread to avoid blocking the UI.
if not self.model_manager:
return
if self.data_manager is not None:
if not self.data_manager.is_bounding_box_set():
QMessageBox.critical(
self,
"Bounding box required",
"Please set the bounding box before initializing the model.",
)
return

# create progress dialog (indeterminate)
progress = QProgressDialog("Updating geological model...", "Cancel", 0, 0, self)
Expand Down
62 changes: 56 additions & 6 deletions loopstructural/gui/modelling/model_definition/bounding_box.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ def __init__(self, parent=None, data_manager=None):
self.useCurrentViewExtentButton.clicked.connect(self.useCurrentViewExtent)
self.selectFromCurrentLayerButton.clicked.connect(self.selectFromCurrentLayer)
self.data_manager.set_bounding_box_update_callback(self.set_bounding_box)
self._update_bounding_box_styles()

def set_bounding_box(self, bounding_box):
"""Populate UI controls with values from a BoundingBox object.
Expand All@@ -31,12 +32,37 @@ def set_bounding_box(self, bounding_box):
bounding_box : object
BoundingBox-like object with `origin` and `maximum` sequences of length 3.
"""
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
# Block spinbox signals to avoid emitting valueChanged while setting values
spinboxes = (
self.originXSpinBox,
self.maxXSpinBox,
self.originYSpinBox,
self.maxYSpinBox,
self.originZSpinBox,
self.maxZSpinBox,
)
for sb in spinboxes:
try:
sb.blockSignals(True)
except Exception:
pass

try:
self.originXSpinBox.setValue(bounding_box.origin[0])
self.maxXSpinBox.setValue(bounding_box.maximum[0])
self.originYSpinBox.setValue(bounding_box.origin[1])
self.maxYSpinBox.setValue(bounding_box.maximum[1])
self.originZSpinBox.setValue(bounding_box.origin[2])
self.maxZSpinBox.setValue(bounding_box.maximum[2])
finally:
# Ensure signals are unblocked even if setting values raises
for sb in spinboxes:
try:
sb.blockSignals(False)
except Exception:
pass

self._update_bounding_box_styles()

def useCurrentViewExtent(self):
"""Set bounding box values from the current map canvas view extent."""
Expand DownExpand Up@@ -70,3 +96,27 @@ def selectFromCurrentLayer(self):

def onChangeExtent(self, value):
self.data_manager.set_bounding_box(**value)
try:
self._update_bounding_box_styles()
except Exception:
pass

def _update_bounding_box_styles(self):
"""Highlight spin boxes if bounding box has not been set."""
if not hasattr(self, 'data_manager'):
return
try:
is_set = self.data_manager.is_bounding_box_set()
except Exception:
is_set = False
red_style = "border: 1px solid red;"
clear_style = ""
for sb in (
self.originXSpinBox,
self.originYSpinBox,
self.originZSpinBox,
self.maxXSpinBox,
self.maxYSpinBox,
self.maxZSpinBox,
):
sb.setStyleSheet(clear_style if is_set else red_style)
18 changes: 14 additions & 4 deletions loopstructural/main/data_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ def __init__(self, *, project=None, mapCanvas=None, logger=None):
default_bounding_box['zmax'],
],
)
self._bounding_box_set = False

self._basal_contacts = None
self._fault_traces = None
Expand DownExpand Up@@ -99,7 +100,9 @@ def set_model_manager(self, model_manager):
self._model_manager.set_fault_topology(self._fault_topology)
self._model_manager.update_bounding_box(self._bounding_box)

def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
def set_bounding_box(
self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, *, mark_set=True
):
"""Set the bounding box for the model."""
origin = self._bounding_box.origin
maximum = self._bounding_box.maximum
Expand All@@ -118,8 +121,8 @@ def set_bounding_box(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None
maximum[2] = zmax
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
self._bounding_box.origin = origin
self._bounding_box.maximum = maximum
if mark_set:
self._bounding_box_set = True
self._model_manager.update_bounding_box(self._bounding_box)
if self.bounding_box_callback:
self.bounding_box_callback(self._bounding_box)
Expand All@@ -128,6 +131,10 @@ def set_bounding_box_update_callback(self, callback):
self.bounding_box_callback = callback
self.bounding_box_callback(self._bounding_box)

def is_bounding_box_set(self):
"""Return True if the bounding box has been explicitly set by the user."""
return bool(self._bounding_box_set)

def set_fault_trace_layer_callback(self, callback):
"""Set the callback for when the fault trace layer is updated."""
self.fault_traces_callback = callback
Expand DownExpand Up@@ -457,6 +464,7 @@ def to_dict(self):

return {
'bounding_box': self._bounding_box.to_dict(),
'bounding_box_set': self._bounding_box_set,
'basal_contacts': basal_contacts,
'fault_traces': fault_traces,
'structural_orientations': structural_orientations,
Expand All@@ -478,6 +486,7 @@ def from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
Expand DownExpand Up@@ -512,9 +521,10 @@ def update_from_dict(self, data):
ymax=data['bounding_box']['maximum'][1],
zmin=data['bounding_box']['origin'][2],
zmax=data['bounding_box']['maximum'][2],
mark_set=data.get('bounding_box_set', True),
)
else:
self.set_bounding_box(**default_bounding_box)
self.set_bounding_box(**default_bounding_box, mark_set=False)
if 'dem_layer' in data and data['dem_layer'] is not None:
dem_layer = QgsProject.instance().mapLayersByName(data['dem_layer'])
if dem_layer:
Expand Down