fixes #3164: Elements of an analysis including the mesh and constrain…

…ts should be hidden when hiding the analysis (Space)
FreeCAD · Oct 6, 2017 · c7886b3 · c7886b3
1 parent d898ecc
commit c7886b3
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 9 deletions.
diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include "ViewProviderAnalysis.h"
+#include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/Control.h>
@@ -74,9 +75,32 @@ bool ViewProviderFemAnalysis::doubleClicked(void)
 
 std::vector<App::DocumentObject*> ViewProviderFemAnalysis::claimChildren(void)const
 {
-    std::vector<App::DocumentObject*> temp(static_cast<Fem::FemAnalysis*>(getObject())->Member.getValues());
+    return static_cast<Fem::FemAnalysis*>(getObject())->Member.getValues();
+}
+
+std::vector<std::string> ViewProviderFemAnalysis::getDisplayModes(void) const
+{
+    return { "Analysis" };
+}
+
+void ViewProviderFemAnalysis::hide(void)
+{
+    Gui::ViewProviderDocumentObject::hide();
+    std::vector<App::DocumentObject*> temp(static_cast<Fem::FemAnalysis*>
+        (getObject())->Member.getValues());
+    for (auto it : temp) {
+        Gui::Application::Instance->hideViewProvider(it);
+    }
+}
 
-    return temp;
+void ViewProviderFemAnalysis::show(void)
+{
+    Gui::ViewProviderDocumentObject::show();
+    std::vector<App::DocumentObject*> temp(static_cast<Fem::FemAnalysis*>
+        (getObject())->Member.getValues());
+    for (auto it : temp) {
+        Gui::Application::Instance->showViewProvider(it);
+    }
 }
 
 void ViewProviderFemAnalysis::setupContextMenu(QMenu* menu, QObject* , const char* )

diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
@@ -51,9 +51,16 @@ class FemGuiExport ViewProviderFemAnalysis : public Gui::ViewProviderDocumentObj
     void setupContextMenu(QMenu*, QObject*, const char*);
 
     virtual bool onDelete(const std::vector<std::string> &);
-
+    /// A list of all possible display modes
+    virtual std::vector<std::string> getDisplayModes(void) const;
     // shows solid in the tree
-    virtual bool isShow(void) const{return true;}
+    virtual bool isShow(void) const {
+        return Visibility.getValue();
+    }
+    /// Hide the object in the view
+    virtual void hide(void);
+    /// Show the object in the view
+    virtual void show(void);
 
     /** @name Drag and drop */
     //@{

diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.cpp b/src/Mod/Fem/Gui/ViewProviderSolver.cpp
@@ -46,15 +46,19 @@ PROPERTY_SOURCE(FemGui::ViewProviderSolver, Gui::ViewProviderDocumentObject)
 
 ViewProviderSolver::ViewProviderSolver()
 {
-  sPixmap = "fem-solver";
-
+    sPixmap = "fem-solver";
 }
 
 ViewProviderSolver::~ViewProviderSolver()
 {
 
 }
 
+std::vector<std::string> ViewProviderSolver::getDisplayModes(void) const
+{
+    return { "Solver" };
+}
+
 
 
 // Python feature -----------------------------------------------------------------------

diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h
@@ -52,9 +52,11 @@ class FemGuiExport ViewProviderSolver : public Gui::ViewProviderDocumentObject
     ~ViewProviderSolver();
 
     // shows solid in the tree
-    virtual bool isShow(void) const{return true;}
-protected:
-
+    virtual bool isShow(void) const {
+        return Visibility.getValue();
+    }
+    /// A list of all possible display modes
+    virtual std::vector<std::string> getDisplayModes(void) const;
 };
 
 typedef Gui::ViewProviderPythonFeatureT<ViewProviderSolver> ViewProviderSolverPython;

diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py
@@ -34,6 +34,8 @@
 def makeAnalysis(doc, name="Analysis"):
     '''makeAnalysis(name): makes a Fem Analysis object'''
     obj = doc.addObject("Fem::FemAnalysisPython", name)
+    if FreeCAD.GuiUp:
+        obj.ViewObject.Proxy=0
     return obj