diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 6e6cfdce57..204712ae1e 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -355,6 +355,7 @@ SET(FemGuiTaskPanels_SRCS femtaskpanels/task_element_fluid1D.py femtaskpanels/task_element_geometry1D.py femtaskpanels/task_element_geometry2D.py + femtaskpanels/task_element_rotation1D.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_rotation1D.py b/src/Mod/Fem/femtaskpanels/task_element_rotation1D.py new file mode 100644 index 0000000000..611cca14ff --- /dev/null +++ b/src/Mod/Fem/femtaskpanels/task_element_rotation1D.py @@ -0,0 +1,88 @@ +# *************************************************************************** +# * Copyright (c) 2017 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 rotation 1D task panel for the document object" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package task_element_rotation1D +# \ingroup FEM +# \brief task panel for element rotation 1D object + +from PySide import QtCore + +import FreeCAD +import FreeCADGui + +from femguiutils import selection_widgets + + +class _TaskPanel: + """ + The TaskPanel for editing References property of ElementRotation1D objects + """ + + def __init__(self, obj): + + self.obj = obj + + # parameter widget + self.parameterWidget = FreeCADGui.PySideUic.loadUi( + FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementRotation1D.ui" + ) + QtCore.QObject.connect( + self.parameterWidget.if_rotation, + QtCore.SIGNAL("valueChanged(Base::Quantity)"), + self.rotation_changed + ) + self.rotation = self.obj.Rotation + self.parameterWidget.if_rotation.setText(self.rotation.UserString) + + # geometry selection widget + self.selectionWidget = selection_widgets.GeometryElementsSelection( + obj.References, + ["Edge"] + ) + + # form made from param and selection widget + self.form = [self.parameterWidget, self.selectionWidget] + + def accept(self): + self.obj.Rotation = self.rotation + 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 rotation_changed(self, base_quantity_value): + self.rotation = base_quantity_value diff --git a/src/Mod/Fem/femviewprovider/view_element_rotation1D.py b/src/Mod/Fem/femviewprovider/view_element_rotation1D.py index b685d2279d..c3cc5a3b32 100644 --- a/src/Mod/Fem/femviewprovider/view_element_rotation1D.py +++ b/src/Mod/Fem/femviewprovider/view_element_rotation1D.py @@ -29,12 +29,7 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief view provider for element rotation 1D object -from PySide import QtCore - -import FreeCAD -import FreeCADGui - -from femguiutils import selection_widgets +# from femtaskpanels import task_element_rotation1D from . import view_base_femconstraint @@ -43,6 +38,7 @@ class VPElementRotation1D(view_base_femconstraint.VPBaseFemConstraint): A View Provider for the ElementRotation1D object """ + pass """ # do not activate the task panel, since rotation with reference shapes is not yet supported def setEdit(self, vobj, mode=0): @@ -50,57 +46,6 @@ class VPElementRotation1D(view_base_femconstraint.VPBaseFemConstraint): self, vobj, mode, - _TaskPanel + task_element_rotation1D._TaskPanel ) """ - - -class _TaskPanel: - """ - The TaskPanel for editing References property of ElementRotation1D objects - """ - - def __init__(self, obj): - - self.obj = obj - - # parameter widget - self.parameterWidget = FreeCADGui.PySideUic.loadUi( - FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementRotation1D.ui" - ) - QtCore.QObject.connect( - self.parameterWidget.if_rotation, - QtCore.SIGNAL("valueChanged(Base::Quantity)"), - self.rotation_changed - ) - self.rotation = self.obj.Rotation - self.parameterWidget.if_rotation.setText(self.rotation.UserString) - - # geometry selection widget - self.selectionWidget = selection_widgets.GeometryElementsSelection( - obj.References, - ["Edge"] - ) - - # form made from param and selection widget - self.form = [self.parameterWidget, self.selectionWidget] - - def accept(self): - self.obj.Rotation = self.rotation - 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 rotation_changed(self, base_quantity_value): - self.rotation = base_quantity_value