From 8dc2eec23b1565b33beee56baa40a20b1d56de4b Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 3 Jun 2020 23:48:52 +0200 Subject: [PATCH] FEM: move task panel in separate module, element geometry 2D --- src/Mod/Fem/CMakeLists.txt | 1 + .../femtaskpanels/task_element_geometry2D.py | 92 +++++++++++++++++++ .../view_element_geometry2D.py | 64 +------------ 3 files changed, 95 insertions(+), 62 deletions(-) create mode 100644 src/Mod/Fem/femtaskpanels/task_element_geometry2D.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 51d7257933..6e6cfdce57 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -354,6 +354,7 @@ SET(FemGuiTaskPanels_SRCS femtaskpanels/task_constraint_tie.py femtaskpanels/task_element_fluid1D.py femtaskpanels/task_element_geometry1D.py + femtaskpanels/task_element_geometry2D.py femtaskpanels/task_mesh_gmsh.py femtaskpanels/task_result_mechanical.py femtaskpanels/task_solver_ccxtools.py diff --git a/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py b/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py new file mode 100644 index 0000000000..a90697271f --- /dev/null +++ b/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py @@ -0,0 +1,92 @@ +# *************************************************************************** +# * Copyright (c) 2015 Bernd Hahnebach * +# * * +# * This file is part of the FreeCAD CAx development system. * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +__title__ = "FreeCAD FEM element geometry 2D task panel for the document object" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package task_element_geometry2D +# \ingroup FEM +# \brief task panel for element geometry 2D object + +from PySide import QtCore + +import FreeCAD +import FreeCADGui + +from femguiutils import selection_widgets + + +class _TaskPanel: + """ + The TaskPanel for editing References property of ElementGeometry2D objects + """ + + def __init__(self, obj): + + self.obj = obj + + # parameter widget + self.parameterWidget = FreeCADGui.PySideUic.loadUi( + FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementGeometry2D.ui" + ) + QtCore.QObject.connect( + self.parameterWidget.if_thickness, + QtCore.SIGNAL("valueChanged(Base::Quantity)"), + self.thickness_changed + ) + self.init_parameter_widget() + + # geometry selection widget + self.selectionWidget = selection_widgets.GeometryElementsSelection( + obj.References, + ["Face"] + ) + + # form made from param and selection widget + self.form = [self.parameterWidget, self.selectionWidget] + + def accept(self): + self.obj.Thickness = self.thickness + self.obj.References = self.selectionWidget.references + self.recompute_and_set_back_all() + return True + + def reject(self): + self.recompute_and_set_back_all() + return True + + def recompute_and_set_back_all(self): + doc = FreeCADGui.getDocument(self.obj.Document) + doc.Document.recompute() + self.selectionWidget.setback_listobj_visibility() + if self.selectionWidget.sel_server: + FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server) + doc.resetEdit() + + def init_parameter_widget(self): + self.thickness = self.obj.Thickness + self.parameterWidget.if_thickness.setText(self.thickness.UserString) + + def thickness_changed(self, base_quantity_value): + self.thickness = base_quantity_value diff --git a/src/Mod/Fem/femviewprovider/view_element_geometry2D.py b/src/Mod/Fem/femviewprovider/view_element_geometry2D.py index ad2f366761..96ef424f34 100644 --- a/src/Mod/Fem/femviewprovider/view_element_geometry2D.py +++ b/src/Mod/Fem/femviewprovider/view_element_geometry2D.py @@ -29,12 +29,7 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief view provider for element geometry 2D object -from PySide import QtCore - -import FreeCAD -import FreeCADGui - -from femguiutils import selection_widgets +from femtaskpanels import task_element_geometry2D from . import view_base_femconstraint @@ -48,60 +43,5 @@ class VPElementGeometry2D(view_base_femconstraint.VPBaseFemConstraint): self, vobj, mode, - _TaskPanel + task_element_geometry2D._TaskPanel ) - - -class _TaskPanel: - """ - The TaskPanel for editing References property of ElementGeometry2D objects - """ - - def __init__(self, obj): - - self.obj = obj - - # parameter widget - self.parameterWidget = FreeCADGui.PySideUic.loadUi( - FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementGeometry2D.ui" - ) - QtCore.QObject.connect( - self.parameterWidget.if_thickness, - QtCore.SIGNAL("valueChanged(Base::Quantity)"), - self.thickness_changed - ) - self.init_parameter_widget() - - # geometry selection widget - self.selectionWidget = selection_widgets.GeometryElementsSelection( - obj.References, - ["Face"] - ) - - # form made from param and selection widget - self.form = [self.parameterWidget, self.selectionWidget] - - def accept(self): - self.obj.Thickness = self.thickness - self.obj.References = self.selectionWidget.references - self.recompute_and_set_back_all() - return True - - def reject(self): - self.recompute_and_set_back_all() - return True - - def recompute_and_set_back_all(self): - doc = FreeCADGui.getDocument(self.obj.Document) - doc.Document.recompute() - self.selectionWidget.setback_listobj_visibility() - if self.selectionWidget.sel_server: - FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server) - doc.resetEdit() - - def init_parameter_widget(self): - self.thickness = self.obj.Thickness - self.parameterWidget.if_thickness.setText(self.thickness.UserString) - - def thickness_changed(self, base_quantity_value): - self.thickness = base_quantity_value