From 7847c6fcacbddba15f304b4c7e042c4675c9cfe3 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 6 Nov 2015 09:16:10 +0100 Subject: [PATCH] FEM: print console message if a task dialog is open already for beamsection and shellthickness --- src/Mod/Fem/_ViewProviderFemBeamSection.py | 7 ++++++- src/Mod/Fem/_ViewProviderFemShellThickness.py | 7 ++++++- src/Mod/Fem/_ViewProviderMechanicalMaterial.py | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Mod/Fem/_ViewProviderFemBeamSection.py b/src/Mod/Fem/_ViewProviderFemBeamSection.py index 742f7185f..02e425136 100644 --- a/src/Mod/Fem/_ViewProviderFemBeamSection.py +++ b/src/Mod/Fem/_ViewProviderFemBeamSection.py @@ -68,7 +68,12 @@ class _ViewProviderFemBeamSection: return def doubleClicked(self, vobj): - self.setEdit(vobj) + doc = FreeCADGui.getDocument(vobj.Object.Document) + if not doc.getInEdit(): + doc.setEdit(vobj.Object.Name) + else: + FreeCAD.Console.PrintError('Active Task Dialog found! Please close this one first!\n') + return True def __getstate__(self): return None diff --git a/src/Mod/Fem/_ViewProviderFemShellThickness.py b/src/Mod/Fem/_ViewProviderFemShellThickness.py index 67b9cc619..1148d0200 100644 --- a/src/Mod/Fem/_ViewProviderFemShellThickness.py +++ b/src/Mod/Fem/_ViewProviderFemShellThickness.py @@ -68,7 +68,12 @@ class _ViewProviderFemShellThickness: return def doubleClicked(self, vobj): - self.setEdit(vobj) + doc = FreeCADGui.getDocument(vobj.Object.Document) + if not doc.getInEdit(): + doc.setEdit(vobj.Object.Name) + else: + FreeCAD.Console.PrintError('Active Task Dialog found! Please close this one first!\n') + return True def __getstate__(self): return None diff --git a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py b/src/Mod/Fem/_ViewProviderMechanicalMaterial.py index f6c8895a0..70dab58a3 100644 --- a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py +++ b/src/Mod/Fem/_ViewProviderMechanicalMaterial.py @@ -65,7 +65,7 @@ class _ViewProviderMechanicalMaterial: if not doc.getInEdit(): doc.setEdit(vobj.Object.Name) else: - FreeCAD.Console.PrintError('There is an active ViewProvider in EditMode! Please close this one!\n') + FreeCAD.Console.PrintError('Active Task Dialog found! Please close this one first!\n') return True def __getstate__(self):