kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: selection observer, move class into selection widgets module

Browse Source
This commit is contained in:
Bernd Hahnebach
2018-05-22 23:08:18 +02:00
committed by wmayer
parent ede0373671
commit 22d9339d34
3 changed files with 15 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Fem/CMakeLists.txt
View File

@@ -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
)

47
src/Mod/Fem/femguiobjects/FemSelectionObserver.py
View File

@@ -1,47 +0,0 @@
# ***************************************************************************
# * *
# * Copyright (c) 2015 - Bernd Hahnebach <bernd@bimstatik.org> *
# * *
# * 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)
## @}

17
src/Mod/Fem/femguiobjects/FemSelectionWidgets.py
View File

@@ -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)