Skip to content

Commit f40aa17

Browse files
committed
fix: add dem
1 parent a4689d6 commit f40aa17

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

loopstructural/gui/loop_widget.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ def __init__(self, parent=None, *, mapCanvas=None, logger=None, data_manager=Non
1414
tabWidget = QTabWidget(self)
1515
tabWidget.setTabPosition(QTabWidget.South)
1616
mainLayout.addWidget(tabWidget)
17-
modelling_widget = ModellingWidget(
17+
self.modelling_widget = ModellingWidget(
1818
self, mapCanvas=self.mapCanvas, logger=self.logger, data_manager=self.data_manager, model_manager=self.model_manager
1919
)
2020

21-
visualisation_widget = VisualisationWidget(
21+
self.visualisation_widget = VisualisationWidget(
2222
self, mapCanvas=self.mapCanvas, logger=self.logger, model_manager=self.model_manager
2323
)
24-
tabWidget.addTab(modelling_widget, "Modelling")
25-
tabWidget.addTab(visualisation_widget, "Visualisation")
24+
tabWidget.addTab(self.modelling_widget, "Modelling")
25+
tabWidget.addTab(self.visualisation_widget, "Visualisation")
2626

loopstructural/gui/modelling/model_definition/dem.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ def __init__(self, parent=None, data_manager=None):
1515
QgsMapLayerProxyModel.RasterLayer)
1616
self.useDEMCheckBox.stateChanged.connect(self.onUseDEMClicked)
1717
self.elevationQgsDoubleSpinBox.valueChanged.connect(self.onElevationChanged)
18+
self.onElevationChanged()
19+
1820
def onUseDEMClicked(self):
1921
if self.useDEMCheckBox.isChecked():
2022
self.demLayerQgsMapLayerComboBox.setEnabled(True)

loopstructural/gui/modelling/model_definition/dem.ui

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
</widget>
2525
</item>
2626
<item row="0" column="1">
27-
<widget class="QgsMapLayerComboBox" name="demLayerQgsMapLayerComboBox"/>
27+
<widget class="QgsMapLayerComboBox" name="demLayerQgsMapLayerComboBox">
28+
<property name="enabled">
29+
<bool>false</bool>
30+
</property>
31+
</widget>
2832
</item>
2933
<item row="1" column="0">
3034
<widget class="QLabel" name="useDEMLabel">
@@ -36,7 +40,7 @@
3640
<item row="1" column="1">
3741
<widget class="QCheckBox" name="useDEMCheckBox">
3842
<property name="checked">
39-
<bool>true</bool>
43+
<bool>false</bool>
4044
</property>
4145
</widget>
4246
</item>
@@ -50,7 +54,7 @@
5054
<item row="2" column="1">
5155
<widget class="QgsDoubleSpinBox" name="elevationQgsDoubleSpinBox">
5256
<property name="enabled">
53-
<bool>false</bool>
57+
<bool>true</bool>
5458
</property>
5559
<property name="minimum">
5660
<double>-100000000.000000000000000</double>

loopstructural/gui/modelling/model_definition/model_definition_tab.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,18 @@
1010

1111
class ModelDefinitionTab(BaseTab):
1212
def __init__(self, parent=None, data_manager=None):
13-
super().__init__(parent, data_manager, scrollable=True)
14-
# Load the UI file for Tab 1
15-
16-
# Create a QToolBox for collapsible sections
17-
# self.toolBox = QToolBox(self)
18-
# self.add_widget(self.toolBox)
19-
13+
super().__init__(parent, data_manager, scrollable=True)
2014
# Add widgets to the QToolBox
21-
bounding_box = BoundingBoxWidget(self, data_manager)
22-
dem = DEMWidget(self, data_manager)
23-
fault_layers = FaultLayersWidget(self, data_manager)
24-
stratigraphy_layers = StratigraphicLayersWidget(self, data_manager)
15+
self.bounding_box = BoundingBoxWidget(self, data_manager)
16+
self.dem = DEMWidget(self, data_manager)
17+
self.fault_layers = FaultLayersWidget(self, data_manager)
18+
self.stratigraphy_layers = StratigraphicLayersWidget(self, data_manager)
2519

2620
# Set uniform size policy for all widgets
27-
for widget in [bounding_box, fault_layers, stratigraphy_layers]:
21+
for widget in [self.bounding_box, self.fault_layers, self.dem,self.stratigraphy_layers]:
2822
widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
2923

30-
self.add_widget(bounding_box, 'Bounding Box') # , "Bounding Box")
31-
self.add_widget(dem, 'DEM')
32-
self.add_widget(fault_layers, 'Fault Layers') # , "Fault Layers")
33-
self.add_widget(stratigraphy_layers, 'Stratigraphic Layers') # , "Stratigraphic Layers")
24+
self.add_widget(self.bounding_box, 'Bounding Box') # , "Bounding Box")
25+
self.add_widget(self.dem, 'DEM')
26+
self.add_widget(self.fault_layers, 'Fault Layers') # , "Fault Layers")
27+
self.add_widget(self.stratigraphy_layers, 'Stratigraphic Layers') # , "Stratigraphic Layers")

0 commit comments

Comments
 (0)