X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Object.cpp;h=dc76a0792dd2d925653ae077e039dc740bce4ec9;hb=4af82842098757e6e7f4f28e2eb744d184bb2b3e;hp=40f1b236ce11d4f836525cc88ab70f079b7cca90;hpb=0fcae5b2e143e67306603d26f0b5e01cbe33d2bb;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Object.cpp b/src/ModelAPI/ModelAPI_Object.cpp
index 40f1b236c..dc76a0792 100644
--- a/src/ModelAPI/ModelAPI_Object.cpp
+++ b/src/ModelAPI/ModelAPI_Object.cpp
@@ -1,41 +1,83 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModelAPI_Object.cpp
 // Created:     19 May 2014
 // Author:      Mikhail PONIKAROV
 
 #include "ModelAPI_Object.h"
+#include "ModelAPI_Document.h"
+#include "ModelAPI_Data.h"
+#include "ModelAPI_Events.h"
+#include <Events_Loop.h>
 
+bool ModelAPI_Object::isInHistory()
+{
+  if (myData->isValid()) {
+    return myData->isInHistory();
+  }
+  return true; // default value
+}
 
-bool ModelAPI_Object::isInHistory() {
-  return true;
+void ModelAPI_Object::setInHistory(
+  const std::shared_ptr<ModelAPI_Object> theObject, const bool theFlag)
+{
+  if (isInHistory() != theFlag) {
+    if (myData->isValid()) {
+      myData->setIsInHistory(theFlag);
+    }
+    myDoc->updateHistory(theObject);
+  }
 }
 
-boost::shared_ptr<ModelAPI_Data> ModelAPI_Object::data() const {
+std::shared_ptr<ModelAPI_Data> ModelAPI_Object::data() const
+{
   return myData;
 }
 
-bool ModelAPI_Object::isSame(const boost::shared_ptr<ModelAPI_Object>& theObject) {
+bool ModelAPI_Object::isSame(const std::shared_ptr<ModelAPI_Object>& theObject)
+{
   return theObject.get() == this;
 }
 
-boost::shared_ptr<ModelAPI_Document> ModelAPI_Object::document() const {
+std::shared_ptr<ModelAPI_Document> ModelAPI_Object::document() const
+{
   return myDoc;
 }
 
-void ModelAPI_Object::attributeChanged() {
+void ModelAPI_Object::attributeChanged(const std::string& theID)
+{
+}
+
+ModelAPI_Object::ModelAPI_Object()
+{
 }
 
-ModelAPI_Object::~ModelAPI_Object() {
+ModelAPI_Object::~ModelAPI_Object()
+{
 }
 
-void ModelAPI_Object::setData(boost::shared_ptr<ModelAPI_Data> theData) {
+void ModelAPI_Object::setData(std::shared_ptr<ModelAPI_Data> theData)
+{
   myData = theData;
 }
 
-void ModelAPI_Object::setDoc(boost::shared_ptr<ModelAPI_Document> theDoc) {
+void ModelAPI_Object::setDoc(std::shared_ptr<ModelAPI_Document> theDoc)
+{
   myDoc = theDoc;
 }
 
-void ModelAPI_Object::erase() {
-  if (myData) myData->erase();
-  setData(DataPtr());
+void ModelAPI_Object::erase()
+{
+  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);
 }