From b62192fa63ce15a25f11f3092e290dcd9ad92d54 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 3 Jun 2020 23:48:46 +0200 Subject: [PATCH] FEM: move task panel in separate module, constraint tie --- src/Mod/Fem/CMakeLists.txt | 1 + .../Fem/femtaskpanels/task_constraint_tie.py | 116 ++++++++++++++++++ .../femviewprovider/view_constraint_tie.py | 88 +------------ 3 files changed, 119 insertions(+), 86 deletions(-) create mode 100644 src/Mod/Fem/femtaskpanels/task_constraint_tie.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 68f248a29e..44e56e589d 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -351,6 +351,7 @@ SET(FemGuiTaskPanels_SRCS femtaskpanels/__init__.py femtaskpanels/task_constraint_electrostaticpotential.py femtaskpanels/task_constraint_flowvelocity.py + femtaskpanels/task_constraint_tie.py femtaskpanels/task_mesh_gmsh.py femtaskpanels/task_result_mechanical.py femtaskpanels/task_solver_ccxtools.py diff --git a/src/Mod/Fem/femtaskpanels/task_constraint_tie.py b/src/Mod/Fem/femtaskpanels/task_constraint_tie.py new file mode 100644 index 0000000000..19355999ed --- /dev/null +++ b/src/Mod/Fem/femtaskpanels/task_constraint_tie.py @@ -0,0 +1,116 @@ +# *************************************************************************** +# * Copyright (c) 2020 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 constraint tie task panel for the document object" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package task_constraint_tie +# \ingroup FEM +# \brief task panel for constraint tie object + +from PySide import QtCore +from PySide import QtGui + +import FreeCAD +import FreeCADGui + +from femguiutils import selection_widgets + + +class _TaskPanel: + """ + The TaskPanel for editing References property of FemConstraintTie objects + """ + + def __init__(self, obj): + + self.obj = obj + + # parameter widget + self.parameterWidget = FreeCADGui.PySideUic.loadUi( + FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ConstraintTie.ui" + ) + QtCore.QObject.connect( + self.parameterWidget.if_tolerance, + QtCore.SIGNAL("valueChanged(Base::Quantity)"), + self.tolerance_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): + # check values + items = len(self.selectionWidget.references) + FreeCAD.Console.PrintMessage( + "Task panel: found references: {}\n{}\n" + .format(items, self.selectionWidget.references) + ) + + if items != 2: + msgBox = QtGui.QMessageBox() + msgBox.setIcon(QtGui.QMessageBox.Question) + msgBox.setText( + "Constraint Tie requires exactly two faces\n\nfound references: {}" + .format(items) + ) + msgBox.setWindowTitle("FreeCAD FEM Constraint Tie") + retryButton = msgBox.addButton(QtGui.QMessageBox.Retry) + ignoreButton = msgBox.addButton(QtGui.QMessageBox.Ignore) + msgBox.exec_() + + if msgBox.clickedButton() == retryButton: + return False + elif msgBox.clickedButton() == ignoreButton: + pass + self.obj.Tolerance = self.tolerance + 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.tolerance = self.obj.Tolerance + self.parameterWidget.if_tolerance.setText(self.tolerance.UserString) + + def tolerance_changed(self, base_quantity_value): + self.tolerance = base_quantity_value diff --git a/src/Mod/Fem/femviewprovider/view_constraint_tie.py b/src/Mod/Fem/femviewprovider/view_constraint_tie.py index 38fcd97874..ac0ec1fcf9 100644 --- a/src/Mod/Fem/femviewprovider/view_constraint_tie.py +++ b/src/Mod/Fem/femviewprovider/view_constraint_tie.py @@ -29,13 +29,7 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief view provider for constraint tie object -from PySide import QtCore -from PySide import QtGui - -import FreeCAD -import FreeCADGui - -from femguiutils import selection_widgets +from femtaskpanels import task_constraint_tie from . import view_base_femconstraint @@ -49,83 +43,5 @@ class VPConstraintTie(view_base_femconstraint.VPBaseFemConstraint): self, vobj, mode, - _TaskPanel + task_constraint_tie._TaskPanel ) - - -class _TaskPanel: - """ - The TaskPanel for editing References property of FemConstraintTie objects - """ - - def __init__(self, obj): - - self.obj = obj - - # parameter widget - self.parameterWidget = FreeCADGui.PySideUic.loadUi( - FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ConstraintTie.ui" - ) - QtCore.QObject.connect( - self.parameterWidget.if_tolerance, - QtCore.SIGNAL("valueChanged(Base::Quantity)"), - self.tolerance_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): - # check values - items = len(self.selectionWidget.references) - FreeCAD.Console.PrintMessage( - "Task panel: found references: {}\n{}\n" - .format(items, self.selectionWidget.references) - ) - - if items != 2: - msgBox = QtGui.QMessageBox() - msgBox.setIcon(QtGui.QMessageBox.Question) - msgBox.setText( - "Constraint Tie requires exactly two faces\n\nfound references: {}" - .format(items) - ) - msgBox.setWindowTitle("FreeCAD FEM Constraint Tie") - retryButton = msgBox.addButton(QtGui.QMessageBox.Retry) - ignoreButton = msgBox.addButton(QtGui.QMessageBox.Ignore) - msgBox.exec_() - - if msgBox.clickedButton() == retryButton: - return False - elif msgBox.clickedButton() == ignoreButton: - pass - self.obj.Tolerance = self.tolerance - 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.tolerance = self.obj.Tolerance - self.parameterWidget.if_tolerance.setText(self.tolerance.UserString) - - def tolerance_changed(self, base_quantity_value): - self.tolerance = base_quantity_value