X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Object.cpp;h=b3f2671c92592aa359da6a0ebd1c4d756742f803;hb=54af887c1203416f38576cbdbcde6e539142a079;hp=573b2d12fa83a7abf599b3b48e23ec5e35a83643;hpb=ca1d32b5d900a39c50749271b5dec53ed59c82af;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Object.cpp b/src/ModelAPI/ModelAPI_Object.cpp
index 573b2d12f..b3f2671c9 100644
--- a/src/ModelAPI/ModelAPI_Object.cpp
+++ b/src/ModelAPI/ModelAPI_Object.cpp
@@ -6,18 +6,26 @@
 
 #include "ModelAPI_Object.h"
 #include "ModelAPI_Document.h"
+#include "ModelAPI_Data.h"
+#include "ModelAPI_Events.h"
+#include <Events_Loop.h>
 
 bool ModelAPI_Object::isInHistory()
 {
-  return myInHistory;
+  if (myData->isValid()) {
+    return myData->isInHistory();
+  }
+  return true; // default value
 }
 
 void ModelAPI_Object::setInHistory(
   const std::shared_ptr<ModelAPI_Object> theObject, const bool theFlag)
 {
-  if (myInHistory != theFlag) {
-    myInHistory = theFlag;
-    myDoc->addToHistory(theObject);
+  if (isInHistory() != theFlag) {
+    if (myData->isValid()) {
+      myData->setIsInHistory(theFlag);
+    }
+    myDoc->updateHistory(theObject);
   }
 }
 
@@ -40,7 +48,7 @@ void ModelAPI_Object::attributeChanged(const std::string& theID)
 {
 }
 
-ModelAPI_Object::ModelAPI_Object() : myInHistory(true)
+ModelAPI_Object::ModelAPI_Object()
 {
 }
 
@@ -60,6 +68,17 @@ void ModelAPI_Object::setDoc(std::shared_ptr<ModelAPI_Document> theDoc)
 
 void ModelAPI_Object::erase()
 {
-  if (myData) myData->erase();
-  setData(DataPtr());
+  if (myData->isValid() && myData != myData->invalidPtr())
+    myData->erase();
+  setData(myData->invalidPtr());
+}
+
+bool ModelAPI_Object::isDisplayed()
+{
+  return myData->isDisplayed();
+}
+
+void ModelAPI_Object::setDisplayed(const bool theDisplay)
+{
+  myData->setDisplayed(theDisplay);
 }