diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py index 7200073cfa..6a1f6ba055 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py @@ -30,75 +30,26 @@ __url__ = "http://www.freecadweb.org" import FreeCAD import FreeCADGui -import FemGui # needed to display the icons in TreeView +from . import ViewProviderFemConstraint # for the panel from PySide import QtCore from . import FemSelectionWidgets -False if FemGui.__name__ else True # flake8, dummy FemGui usage - -class _ViewProviderFemMeshGroup: +class _ViewProviderFemMeshGroup(ViewProviderFemConstraint.ViewProxy): "A View Provider for the FemMeshGroup object" - def __init__(self, vobj): - vobj.Proxy = self def getIcon(self): return ":/icons/fem-femmesh-from-shape.svg" - def attach(self, vobj): - from pivy import coin - self.ViewObject = vobj - self.Object = vobj.Object - self.standard = coin.SoGroup() - vobj.addDisplayMode(self.standard, "Default") - - def getDisplayModes(self, obj): - return ["Default"] - - def getDefaultDisplayMode(self): - return "Default" - - def updateData(self, obj, prop): - return - - def onChanged(self, vobj, prop): - return - def setEdit(self, vobj, mode=0): - # hide all meshes - for o in FreeCAD.ActiveDocument.Objects: - if o.isDerivedFrom("Fem::FemMeshObject"): - o.ViewObject.hide() - # show task panel - taskd = _TaskPanelFemMeshGroup(self.Object) - taskd.obj = vobj.Object - FreeCADGui.Control.showDialog(taskd) - return True - - def unsetEdit(self, vobj, mode=0): - FreeCADGui.Control.closeDialog() - return True - - def doubleClicked(self, vobj): - guidoc = FreeCADGui.getDocument(vobj.Object.Document) - # check if another VP is in edit mode - # https://forum.freecadweb.org/viewtopic.php?t=13077#p104702 - if not guidoc.getInEdit(): - guidoc.setEdit(vobj.Object.Name) - else: - from PySide.QtGui import QMessageBox - message = "Active Task Dialog found! Please close this one before opening a new one!" - QMessageBox.critical(None, "Error in tree view", message) - FreeCAD.Console.PrintError(message + "\n") - return True - - def __getstate__(self): - return None - - def __setstate__(self, state): - return None + ViewProviderFemConstraint.ViewProxy.setEdit( + self, + vobj, + mode, + _TaskPanelFemMeshGroup + ) class _TaskPanelFemMeshGroup: diff --git a/src/Mod/Fem/femobjects/_FemMeshGroup.py b/src/Mod/Fem/femobjects/_FemMeshGroup.py index 7e3fe3012c..cf2954ca9d 100644 --- a/src/Mod/Fem/femobjects/_FemMeshGroup.py +++ b/src/Mod/Fem/femobjects/_FemMeshGroup.py @@ -27,10 +27,16 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD FEM _FemMeshGroup +from . import FemConstraint -class _FemMeshGroup: + +class _FemMeshGroup(FemConstraint.Proxy): "The FemMeshGroup object" + + Type = "Fem::FemMeshGroup" + def __init__(self, obj): + super(_FemMeshGroup, self).__init__(obj) obj.addProperty( "App::PropertyBool", "UseLabel", @@ -43,8 +49,3 @@ class _FemMeshGroup: "MeshGroupShapes", "List of FEM mesh group shapes" ) - obj.Proxy = self - self.Type = "Fem::FemMeshGroup" - - def execute(self, obj): - return