Skip to content

Commit 393323e

Browse files
committed
fix: add filter in python file
1 parent 27d3d97 commit 393323e

2 files changed

Lines changed: 20 additions & 24 deletions

File tree

loopstructural/gui/interpolation_dialog.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
QgsPointXY,
1515
QgsField,
1616
QgsFields,
17+
QgsMapLayerProxyModel
1718
)
1819
from qgis.PyQt.QtCore import QVariant
1920

@@ -88,8 +89,14 @@ def _initialize_ui(self):
8889
self.grid3DExtentWidget.setMapCanvas(canvas)
8990
except:
9091
pass
91-
92-
# Set field combos to follow layer combos
92+
self.valueLayerCombo.setFilters(QgsMapLayerProxyModel.PointLayer | QgsMapLayerProxyModel.LineLayer)
93+
self.gradientLayerCombo.setFilters(QgsMapLayerProxyModel.PointLayer)
94+
self.pointLayerCombo.setFilters(QgsMapLayerProxyModel.PointLayer)
95+
# Allow empty selection for layer combos
96+
self.valueLayerCombo.setAllowEmptyLayer(True)
97+
self.gradientLayerCombo.setAllowEmptyLayer(True)
98+
self.pointLayerCombo.setAllowEmptyLayer(True)
99+
# Allow empty selection for field combos
93100
self.valueFieldCombo.setLayer(None)
94101
self.strikeFieldCombo.setLayer(None)
95102
self.dipFieldCombo.setLayer(None)
@@ -154,13 +161,14 @@ def _on_build_interpolator(self):
154161
QMessageBox.warning(self, "Invalid Input", "Please select a value field.")
155162
return
156163

157-
if gradient_layer and (not strike_field or not dip_field):
158-
QMessageBox.warning(
159-
self,
160-
"Invalid Input",
161-
"Please select both strike and dip fields for gradient data."
162-
)
163-
return
164+
if gradient_layer:
165+
if not strike_field or not dip_field:
166+
QMessageBox.warning(
167+
self,
168+
"Invalid Input",
169+
"Please select both strike and dip fields for gradient data."
170+
)
171+
return
164172

165173
# Get extent and pixel size
166174
extent = self.extentWidget.outputExtent()

loopstructural/gui/interpolation_dialog.ui

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@
5454
</widget>
5555
</item>
5656
<item row="0" column="1">
57-
<widget class="QgsMapLayerComboBox" name="valueLayerCombo">
58-
<property name="filters">
59-
<set>QgsMapLayerProxyModel::PointLayer|QgsMapLayerProxyModel::LineLayer</set>
60-
</property>
61-
</widget>
57+
<widget class="QgsMapLayerComboBox" name="valueLayerCombo"/>
6258
</item>
6359
<item row="1" column="0">
6460
<widget class="QLabel" name="label_2">
@@ -78,11 +74,7 @@
7874
</widget>
7975
</item>
8076
<item row="2" column="1">
81-
<widget class="QgsMapLayerComboBox" name="gradientLayerCombo">
82-
<property name="filters">
83-
<set>QgsMapLayerProxyModel::PointLayer</set>
84-
</property>
85-
</widget>
77+
<widget class="QgsMapLayerComboBox" name="gradientLayerCombo"/>
8678
</item>
8779
<item row="3" column="0">
8880
<widget class="QLabel" name="label_4">
@@ -384,11 +376,7 @@
384376
</widget>
385377
</item>
386378
<item row="0" column="1">
387-
<widget class="QgsMapLayerComboBox" name="pointLayerCombo">
388-
<property name="filters">
389-
<set>QgsMapLayerProxyModel::PointLayer</set>
390-
</property>
391-
</widget>
379+
<widget class="QgsMapLayerComboBox" name="pointLayerCombo"/>
392380
</item>
393381
</layout>
394382
</widget>

0 commit comments

Comments
 (0)