[FEM] refactor GeometryElementsSelection, introduce parameter to modify help text for several task panels using GeometryElementsSelection.

This commit is contained in:
UR-0
2021-03-24 12:13:12 +01:00
committed by Bernd Hahnebach
parent 05b0ff2fd1
commit af3643853c
11 changed files with 46 additions and 16 deletions

View File

@@ -231,7 +231,7 @@ class SmallListView(QtGui.QListView):
class GeometryElementsSelection(QtGui.QWidget): class GeometryElementsSelection(QtGui.QWidget):
def __init__(self, ref, eltypes=[], multigeom=True): def __init__(self, ref, eltypes=[], multigeom, showHintEmptyList):
super(GeometryElementsSelection, self).__init__() super(GeometryElementsSelection, self).__init__()
# init ui stuff # init ui stuff
FreeCADGui.Selection.clearSelection() FreeCADGui.Selection.clearSelection()
@@ -240,6 +240,7 @@ class GeometryElementsSelection(QtGui.QWidget):
self.obj_notvisible = [] self.obj_notvisible = []
self.initElemTypes(eltypes) self.initElemTypes(eltypes)
self.allow_multiple_geom_types = multigeom self.allow_multiple_geom_types = multigeom
self.showHintEmptyList = showHintEmptyList
# print(self.allow_multiple_geom_types) # print(self.allow_multiple_geom_types)
self.initUI() self.initUI()
# set references and fill the list widget # set references and fill the list widget
@@ -276,11 +277,20 @@ class GeometryElementsSelection(QtGui.QWidget):
# label # label
self._helpTextLbl = QtGui.QLabel() self._helpTextLbl = QtGui.QLabel()
self._helpTextLbl.setWordWrap(True) self._helpTextLbl.setWordWrap(True)
self._helpTextLbl.setText(self.tr( helpTextPart1 = self.tr('Click on "Add" and select geometric elements to add them to the list.')
'Click on "Add" and select geometric elements to add them to the list. ' helpTextPart2 = self.tr("The following geometry elements are allowed to select: ") + self.sel_elem_text
"If no geometry is added to the list, all remaining ones are used. " helpTextPart3 = self.tr("If no geometry is added to the list, all remaining ones are used.")
"The following geometry elements are allowed to select: " if self.showHintEmptyList is True:
) + self.sel_elem_text) self._helpTextLbl.setText(
helpTextPart1 + "\n" +
helpTextPart2 + "\n" +
helpTextPart3
)
else:
self._helpTextLbl.setText(
helpTextPart1 + "\n" +
helpTextPart2
)
# list # list
self.list_References = QtGui.QListWidget() self.list_References = QtGui.QListWidget()
# radiobutton down the list # radiobutton down the list

View File

@@ -55,7 +55,9 @@ class _TaskPanel:
# geometry selection widget # geometry selection widget
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Face"] ["Face"],
False,
False
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -61,7 +61,9 @@ class _TaskPanel:
# geometry selection widget # geometry selection widget
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Face"] ["Face"],
False,
False
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -232,7 +232,10 @@ class _TaskPanel:
# geometry selection widget # geometry selection widget
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, ["Edge"] obj.References,
["Edge"],
False,
True
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -91,7 +91,9 @@ class _TaskPanel:
# geometry selection widget # geometry selection widget
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Edge"] ["Edge"],
False,
True
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -60,7 +60,9 @@ class _TaskPanel:
# geometry selection widget # geometry selection widget
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Face"] ["Face"],
False,
True
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -61,7 +61,9 @@ class _TaskPanel:
# geometry selection widget # geometry selection widget
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Edge"] ["Edge"],
False,
True
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -192,7 +192,8 @@ class _TaskPanel:
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Solid", "Face", "Edge"], ["Solid", "Face", "Edge"],
False False,
True
) # start with Solid in list! ) # start with Solid in list!
# form made from param and selection widget # form made from param and selection widget

View File

@@ -72,7 +72,9 @@ class _TaskPanel:
# start with Solid in list! # start with Solid in list!
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Solid", "Face", "Edge", "Vertex"] ["Solid", "Face", "Edge", "Vertex"],
True,
False
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -66,7 +66,9 @@ class _TaskPanel:
# start with Solid in list! # start with Solid in list!
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Solid", "Face", "Edge", "Vertex"] ["Solid", "Face", "Edge", "Vertex"],
True,
False
) )
# form made from param and selection widget # form made from param and selection widget

View File

@@ -61,7 +61,9 @@ class _TaskPanel:
# start with Solid in list! # start with Solid in list!
self.selectionWidget = selection_widgets.GeometryElementsSelection( self.selectionWidget = selection_widgets.GeometryElementsSelection(
obj.References, obj.References,
["Solid", "Face", "Edge", "Vertex"] ["Solid", "Face", "Edge", "Vertex"],
True,
False
) )
# form made from param and selection widget # form made from param and selection widget