diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 8470a8b3b8..03720a161d 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -270,7 +270,6 @@ SET(FemGuiScripts_SRCS femguiobjects/_ViewProviderFemMeshResult.py femguiobjects/_ViewProviderFemResultMechanical.py femguiobjects/_ViewProviderFemSolverCalculix.py - femguiobjects/FemSelectionObserver.py femguiobjects/FemSelectionWidgets.py femguiobjects/ViewProviderFemConstraint.py ) diff --git a/src/Mod/Fem/femguiobjects/FemSelectionObserver.py b/src/Mod/Fem/femguiobjects/FemSelectionObserver.py deleted file mode 100644 index cbe2310c23..0000000000 --- a/src/Mod/Fem/femguiobjects/FemSelectionObserver.py +++ /dev/null @@ -1,47 +0,0 @@ -# *************************************************************************** -# * * -# * Copyright (c) 2015 - Bernd Hahnebach * -# * * -# * 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__ = "Selection Observer" -__author__ = "Bernd Hahnebach" -__url__ = "http://www.freecadweb.org" - -## \addtogroup FEM -# @{ - -import FreeCAD -import FreeCADGui - - -class FemSelectionObserver: - '''FemSelectionObserver''' - def __init__(self, parseSelectionFunction, print_message=''): - self.parseSelectionFunction = parseSelectionFunction - FreeCADGui.Selection.addObserver(self) - FreeCAD.Console.PrintMessage(print_message + "!\n") - - def addSelection(self, docName, objName, sub, pos): - selected_object = FreeCAD.getDocument(docName).getObject(objName) # get the obj objName - self.added_obj = (selected_object, sub) - # on double click on a vertex of a solid sub is None and obj is the solid - self.parseSelectionFunction(self.added_obj) - -## @} diff --git a/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py b/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py index c9365841c2..930f476e39 100644 --- a/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py +++ b/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py @@ -399,8 +399,7 @@ class GeometryElementsSelection(QtGui.QWidget): if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - from . import FemSelectionObserver - self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) + self.sel_server = FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): print('selection: ', selection[0].Shape.ShapeType, ' ', selection[0].Name, ' ', selection[1]) @@ -448,3 +447,17 @@ class GeometryElementsSelection(QtGui.QWidget): FreeCAD.Console.PrintMessage(selection[0].Name + ' --> ' + selection[1] + ' is in reference list already!\n') else: FreeCAD.Console.PrintMessage(ele_ShapeType + ' not allowed to add to the list!\n') + + +class FemSelectionObserver: + '''selection observer especially for the needs of geometry reference selection of FEM''' + def __init__(self, parseSelectionFunction, print_message=''): + self.parseSelectionFunction = parseSelectionFunction + FreeCADGui.Selection.addObserver(self) + FreeCAD.Console.PrintMessage(print_message + "!\n") + + def addSelection(self, docName, objName, sub, pos): + selected_object = FreeCAD.getDocument(docName).getObject(objName) # get the obj objName + self.added_obj = (selected_object, sub) + # on double click on a vertex of a solid sub is None and obj is the solid + self.parseSelectionFunction(self.added_obj)