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 number Diff line number Diff 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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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 Down Expand 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 Down Expand 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 Down Expand 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