From eb88c9045cc7aea605a7bf1097fb97d7fd672b87 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 21 May 2018 23:37:41 +0200 Subject: [PATCH] FEM: Python geometry selection class, use it for gmsh mesh boundary layer --- .../Fem/Gui/Resources/ui/MeshBoundaryLayer.ui | 59 +----- .../_ViewProviderFemMeshBoundaryLayer.py | 186 +++--------------- 2 files changed, 37 insertions(+), 208 deletions(-) diff --git a/src/Mod/Fem/Gui/Resources/ui/MeshBoundaryLayer.ui b/src/Mod/Fem/Gui/Resources/ui/MeshBoundaryLayer.ui index c32e8a6174..22cf94870f 100644 --- a/src/Mod/Fem/Gui/Resources/ui/MeshBoundaryLayer.ui +++ b/src/Mod/Fem/Gui/Resources/ui/MeshBoundaryLayer.ui @@ -46,18 +46,18 @@ 0 - - - 80 - 20 - - 1.0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 80 + 20 + + 1.000000000000000 @@ -117,53 +117,6 @@ - - - - References - - - - - - Add reference - - - - - - - - - - - - Solid - - - - - - - Face, Edge - - - true - - - - - - - <html><head/><body><p>Selection</p></body></html> - - - - - - - - diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py index cba01e57e3..b268e93a75 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py @@ -34,7 +34,7 @@ False if False else FemGui.__name__ # dummy usage of FemGui for flake8, just re # for the panel from PySide import QtCore -from PySide import QtGui +from . import FemSelectionWidgets class _ViewProviderFemMeshBoundaryLayer: @@ -104,49 +104,50 @@ class _TaskPanelFemMeshBoundaryLayer: def __init__(self, obj): FreeCADGui.Selection.clearSelection() - self.sel_server = None + + # parameter widget self.obj = obj - self.selection_mode_solid = False - self.selection_mode_std_print_message = "Select Faces for 3D, Edges for 2D by single click on them to add them to the list." - self.selection_mode_solid_print_message = "Select Solids by single click on a Face or Edge which belongs to the Solid, to add the Solid to the list." + self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/MeshBoundaryLayer.ui") + QtCore.QObject.connect(self.parameterWidget.bl_number_of_layers, QtCore.SIGNAL("valueChanged(int)"), self.bl_number_of_layers_changed) + QtCore.QObject.connect(self.parameterWidget.bl_min_thickness, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.bl_min_thickness_changed) + QtCore.QObject.connect(self.parameterWidget.bl_growth_rate, QtCore.SIGNAL("valueChanged(double)"), self.bl_growth_rate_changed) # becareful of signal signature for QDoubleSpinbox + self.init_parameter_widget() - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/MeshBoundaryLayer.ui") + # geometry selection widget + self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection(obj.References, ['Solid', 'Face', 'Edge', 'Vertex']) # start with Solid in list! - QtCore.QObject.connect(self.form.bl_number_of_layers, QtCore.SIGNAL("valueChanged(int)"), self.bl_number_of_layers_changed) - QtCore.QObject.connect(self.form.bl_min_thickness, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.bl_min_thickness_changed) - QtCore.QObject.connect(self.form.bl_growth_rate, QtCore.SIGNAL("valueChanged(double)"), self.bl_growth_rate_changed) # becareful of signal signature for QDoubleSpinbox + # form made from param and selection widget + self.form = [self.parameterWidget, self.selectionWidget] - QtCore.QObject.connect(self.form.rb_standard, QtCore.SIGNAL("toggled(bool)"), self.choose_selection_mode_standard) - QtCore.QObject.connect(self.form.rb_solid, QtCore.SIGNAL("toggled(bool)"), self.choose_selection_mode_solid) - QtCore.QObject.connect(self.form.pushButton_Reference, QtCore.SIGNAL("clicked()"), self.add_references) - self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) - self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked) + def accept(self): + self.set_mesh_boundarylayer_props() + self.obj.References = self.selectionWidget.references + FreeCAD.ActiveDocument.recompute() + self.set_back_all() + return True - self.get_mesh_boundarylayer_props() - self.update() + def reject(self): + self.set_back_all() + return True - def get_mesh_boundarylayer_props(self): + def set_back_all(self): + self.selectionWidget.setback_listobj_visibility() + if self.selectionWidget.sel_server: + FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server) + FreeCADGui.ActiveDocument.resetEdit() + + def init_parameter_widget(self): self.bl_min_thickness = self.obj.MinimumThickness self.bl_number_of_layers = self.obj.NumberOfLayers self.bl_growth_rate = self.obj.GrowthRate - - self.references = [] - if self.obj.References: - self.tuplereferences = self.obj.References - self.get_references() + self.parameterWidget.bl_min_thickness.setText(self.bl_min_thickness.UserString) + self.parameterWidget.bl_number_of_layers.setValue(self.bl_number_of_layers) + self.parameterWidget.bl_growth_rate.setValue(self.bl_growth_rate) def set_mesh_boundarylayer_props(self): self.obj.MinimumThickness = self.bl_min_thickness self.obj.NumberOfLayers = self.bl_number_of_layers self.obj.GrowthRate = self.bl_growth_rate - self.obj.References = self.references - - def update(self): - 'fills the widgets with data' - self.form.bl_min_thickness.setText(self.bl_min_thickness.UserString) - self.form.bl_number_of_layers.setValue(self.bl_number_of_layers) - self.form.bl_growth_rate.setValue(self.bl_growth_rate) - self.rebuild_list_References() def bl_min_thickness_changed(self, base_quantity_value): self.bl_min_thickness = base_quantity_value @@ -156,128 +157,3 @@ class _TaskPanelFemMeshBoundaryLayer: def bl_growth_rate_changed(self, value): self.bl_growth_rate = value - - def accept(self): - self.set_mesh_boundarylayer_props() - if self.sel_server: - FreeCADGui.Selection.removeObserver(self.sel_server) - FreeCADGui.ActiveDocument.resetEdit() - FreeCAD.ActiveDocument.recompute() - return True - - def reject(self): - if self.sel_server: - FreeCADGui.Selection.removeObserver(self.sel_server) - FreeCADGui.ActiveDocument.resetEdit() - return True - - ############### identical to FemMeshRegion ############ - - def choose_selection_mode_standard(self, state): - self.selection_mode_solid = not state - if self.sel_server and not self.selection_mode_solid: - print(self.selection_mode_std_print_message) - - def choose_selection_mode_solid(self, state): - self.selection_mode_solid = state - if self.sel_server and self.selection_mode_solid: - print(self.selection_mode_solid_print_message) - - def get_references(self): - for ref in self.tuplereferences: - for elem in ref[1]: - self.references.append((ref[0], elem)) - - def references_list_right_clicked(self, QPos): - self.form.contextMenu = QtGui.QMenu() - menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") - menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") - if not self.references: - menu_item_remove_selected.setDisabled(True) - menu_item_remove_all.setDisabled(True) - self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) - self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) - parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) - self.form.contextMenu.move(parentPosition + QPos) - self.form.contextMenu.show() - - def remove_selected_reference(self): - if not self.references: - return - currentItemName = str(self.form.list_References.currentItem().text()) - currentRow = self.form.list_References.currentRow() - for ref in self.references: - refname_to_compare_listentry = ref[0].Name + ':' + ref[1] - if refname_to_compare_listentry == currentItemName: - self.references.remove(ref) - self.rebuild_list_References(currentRow) - - def remove_all_references(self): - self.references = [] - self.rebuild_list_References() - - def add_references(self): - '''Called if Button add_reference is triggered''' - # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open - # here the addReference button EditTaskPanel has to be triggered to start selection mode - FreeCADGui.Selection.clearSelection() - # start SelectionObserver and parse the function to add the References to the widget - if self.selection_mode_solid: # print message on button click - print_message = self.selection_mode_solid_print_message - else: - print_message = self.selection_mode_std_print_message - from . import FemSelectionObserver - self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) - - def selectionParser(self, selection): - print('selection: ', selection[0].Shape.ShapeType, ' ', selection[0].Name, ' ', selection[1]) - if hasattr(selection[0], "Shape") and selection[1]: - elt = selection[0].Shape.getElement(selection[1]) - if self.selection_mode_solid: - # in solid selection mode use edges and faces for selection of a solid - solid_to_add = None - if elt.ShapeType == 'Edge': - found_edge = False - for i, s in enumerate(selection[0].Shape.Solids): - for e in s.Edges: - if elt.isSame(e): - if not found_edge: - solid_to_add = str(i + 1) - else: - FreeCAD.Console.PrintMessage('Edge belongs to more than one solid\n') - solid_to_add = None - found_edge = True - elif elt.ShapeType == 'Face': - found_face = False - for i, s in enumerate(selection[0].Shape.Solids): - for e in s.Faces: - if elt.isSame(e): - if not found_face: - solid_to_add = str(i + 1) - else: - FreeCAD.Console.PrintMessage('Face belongs to more than one solid\n') - solid_to_add = None - found_edge = True - if solid_to_add: - selection = (selection[0], 'Solid' + solid_to_add) - print('selection element changed to Solid: ', selection[0].Shape.ShapeType, ' ', selection[0].Name, ' ', selection[1]) - else: - return - if selection not in self.references: - self.references.append(selection) - self.rebuild_list_References() - else: - FreeCAD.Console.PrintMessage(selection[0].Name + ' --> ' + selection[1] + ' is in reference list already!\n') - - def rebuild_list_References(self, current_row=0): - self.form.list_References.clear() - items = [] - for ref in self.references: - item_name = ref[0].Name + ':' + ref[1] - items.append(item_name) - for listItemName in sorted(items): - self.form.list_References.addItem(listItemName) - if current_row > self.form.list_References.count() - 1: # first row is 0 - current_row = self.form.list_References.count() - 1 - if self.form.list_References.count() > 0: - self.form.list_References.setCurrentItem(self.form.list_References.item(current_row))