From: mpv <mikhail.ponikarov@opencascade.com>
Date: Fri, 19 Sep 2014 14:09:32 +0000 (+0400)
Subject: Do not show concealed results
X-Git-Tag: V_0.4.4~38^2^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=44340ff3cc86b39ba1f1833f166e6be77bd368c4;p=modules%2Fshaper.git

Do not show concealed results
---

diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index 443d00c10..38625983c 100644
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -129,6 +129,12 @@ class Model_Document : public ModelAPI_Document
   ///! On abort, undo or redo it is not necessary: results in document are updated automatically
   bool executeFeatures() {return myExecuteFeatures;}
 
+  ///! Reutrns true is result was conecaled because of usage it by other object
+  virtual bool isConcealed(const boost::shared_ptr<ModelAPI_Object>& theResult) {
+    return myConcealedResults.find(boost::dynamic_pointer_cast<ModelAPI_Result>(theResult))
+      != myConcealedResults.end();
+  }
+
  protected:
 
   //! Returns (creates if needed) the features label
diff --git a/src/ModelAPI/ModelAPI_Document.h b/src/ModelAPI/ModelAPI_Document.h
index 7f224da3e..6e432ae02 100644
--- a/src/ModelAPI/ModelAPI_Document.h
+++ b/src/ModelAPI/ModelAPI_Document.h
@@ -80,7 +80,10 @@ public:
   virtual boost::shared_ptr<ModelAPI_Feature> feature(
       const boost::shared_ptr<ModelAPI_Result>& theResult) = 0;
 
- protected:
+  ///! Reutrns true is result was conecaled because of usage it by other object
+  virtual bool isConcealed(const boost::shared_ptr<ModelAPI_Object>& theResult) = 0;
+
+protected:
   /// Only for SWIG wrapping it is here
   MODELAPI_EXPORT ModelAPI_Document()
   {
diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index b5fb72d02..8d3568d7a 100644
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -385,7 +385,7 @@ void XGUI_Workshop::onFeatureRedisplayMsg(const boost::shared_ptr<ModelAPI_Objec
   std::set<ObjectPtr>::const_iterator aIt;
   for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
     ObjectPtr aObj = (*aIt);
-    if (!aObj->data() || !aObj->data()->isValid())
+    if (!aObj->data() || !aObj->data()->isValid() || aObj->document()->isConcealed(aObj))
       myDisplayer->erase(aObj, false);
     else {
       if (myDisplayer->isVisible(aObj))  // TODO VSV: Correction sketch drawing
@@ -419,7 +419,8 @@ void XGUI_Workshop::onFeatureCreatedMsg(const boost::shared_ptr<ModelAPI_ObjectU
       // it doesn't stored in the operation mgr and doesn't displayed
     } else if (myOperationMgr->hasOperation()) {
       ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
-      if (aOperation->hasObject(*aIt)) {  // Display only current operation results
+      if (!(*aIt)->document()->isConcealed(*aIt) &&
+          aOperation->hasObject(*aIt)) {  // Display only current operation results
         myDisplayer->display(*aIt, false);
         isDisplayed = true;
       }