From 4ccfaea2bc8cbc122b3d9b7c9d51c5dbfd89e100 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sat, 7 Mar 2020 14:27:20 +0100 Subject: [PATCH] FEM: Python gui objects, use methods from base object --- ...viderFemConstraintElectrostaticPotential.py | 18 ++++++------------ .../_ViewProviderFemConstraintFlowVelocity.py | 18 ++++++------------ ...ProviderFemConstraintInitialFlowVelocity.py | 18 ++++++------------ 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py index b7dc49c124..1fae33bed3 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py @@ -42,18 +42,12 @@ from femtools import membertools class ViewProxy(ViewProviderFemConstraint.ViewProxy): 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 - task = _TaskPanel(vobj.Object) - FreeCADGui.Control.showDialog(task) - return True - - def unsetEdit(self, vobj, mode=0): - FreeCADGui.Control.closeDialog() - return True + ViewProviderFemConstraint.ViewProxy.setEdit( + self, + vobj, + mode, + _TaskPanel + ) class _TaskPanel(object): diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py index d46ce3c565..12db410ef6 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py @@ -42,18 +42,12 @@ from femtools import membertools class ViewProxy(ViewProviderFemConstraint.ViewProxy): 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 - task = _TaskPanel(vobj.Object) - FreeCADGui.Control.showDialog(task) - return True - - def unsetEdit(self, vobj, mode=0): - FreeCADGui.Control.closeDialog() - return True + ViewProviderFemConstraint.ViewProxy.setEdit( + self, + vobj, + mode, + _TaskPanel + ) class _TaskPanel(object): diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py index 4bbb3f637b..19f4f65b59 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py @@ -41,18 +41,12 @@ from femtools import membertools class ViewProxy(ViewProviderFemConstraint.ViewProxy): 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 - task = _TaskPanel(vobj.Object) - FreeCADGui.Control.showDialog(task) - return True - - def unsetEdit(self, vobj, mode=0): - FreeCADGui.Control.closeDialog() - return True + ViewProviderFemConstraint.ViewProxy.setEdit( + self, + vobj, + mode, + _TaskPanel + ) class _TaskPanel(object):