Skip to content

Commit cdb8c22

Browse files
committed
Fem: Use disambiguation for solids in equation task panel
1 parent 4941203 commit cdb8c22

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/Mod/Fem/femsolver/elmer/equations/equation.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,16 @@ class _TaskPanel:
7676

7777
def __init__(self, obj):
7878
self._obj = obj
79-
self._refWidget = selection_widgets.SolidSelector()
80-
self._refWidget.setReferences(obj.References)
79+
self._selectionWidget = selection_widgets.GeometryElementsSelection(
80+
obj.References, ["Solid", "Face"], False, True
81+
)
82+
# start in solid selection mode
83+
self._selectionWidget.rb_solid.setChecked(True)
8184
propWidget = obj.ViewObject.Proxy.getTaskWidget(obj.ViewObject)
8285
if propWidget is None:
83-
self.form = self._refWidget
86+
self.form = self._selectionWidget
8487
else:
85-
self.form = [self.refWidget, propWidget]
88+
self.form = [self._selectionWidget, propWidget]
8689
analysis = obj.getParentGroup()
8790
self._mesh = membertools.get_single_member(analysis, "Fem::FemMeshObject")
8891
self._part = self._mesh.Shape if self._mesh is not None else None
@@ -97,12 +100,14 @@ def open(self):
97100
self._part.ViewObject.show()
98101

99102
def reject(self):
103+
self._selectionWidget.finish_selection()
100104
self._recomputeAndRestore()
101105
return True
102106

103107
def accept(self):
104-
if self._obj.References != self._refWidget.references():
105-
self._obj.References = self._refWidget.references()
108+
if self._obj.References != self._selectionWidget.references:
109+
self._obj.References = self._selectionWidget.references
110+
self._selectionWidget.finish_selection()
106111
self._recomputeAndRestore()
107112
return True
108113

0 commit comments

Comments
 (0)