X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDocRef.cpp;h=2284226c262cb09819572a5c52e370623f5a7950;hb=acfb7413a39dd03b70cd8d2847264e083eac2a25;hp=07712d0b6a568a12559ac8bd058abfd3680f3c4a;hpb=de0f49686ec6655ddc5816c8fa5383964662aec4;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDocRef.cpp b/src/Model/Model_AttributeDocRef.cpp
index 07712d0b6..2284226c2 100644
--- a/src/Model/Model_AttributeDocRef.cpp
+++ b/src/Model/Model_AttributeDocRef.cpp
@@ -1,31 +1,42 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModelAPI_AttributeDocRef.cxx
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
 #include "Model_AttributeDocRef.h"
 #include "Model_Application.h"
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Data.h>
 
 using namespace std;
 
 void Model_AttributeDocRef::setValue(std::shared_ptr<ModelAPI_Document> theDoc)
 {
-  myComment->Set(TCollection_ExtendedString(theDoc->id().c_str()));
+  myDoc = theDoc;
+  TCollection_ExtendedString aNewID(theDoc->id().c_str());
+  if (!myIsInitialized || myComment->Get() != aNewID) {
+    myComment->Set(TCollection_ExtendedString(theDoc->id().c_str()));
+    owner()->data()->sendAttributeUpdated(this);
+  }
 }
 
 std::shared_ptr<ModelAPI_Document> Model_AttributeDocRef::value()
 {
-  if (myComment->Get().Length())
-    return Model_Application::getApplication()->getDocument(
-      TCollection_AsciiString(myComment->Get()).ToCString());
-  // not initialized
-  return std::shared_ptr<ModelAPI_Document>();
+  return myDoc;
 }
 
 Model_AttributeDocRef::Model_AttributeDocRef(TDF_Label& theLabel)
 {
-  // check the attribute could be already presented in this doc (after load document)
-  if (!theLabel.FindAttribute(TDataStd_Comment::GetID(), myComment)) {
+  myIsInitialized = theLabel.FindAttribute(TDataStd_Comment::GetID(), myComment) == Standard_True;
+  if (!myIsInitialized) {
     // create attribute: not initialized by value yet, just empty string
     myComment = TDataStd_Comment::Set(theLabel, "");
+  } else {  // document was already referenced: try to set it as loaded by demand
+    Handle(Model_Application) anApp = Model_Application::getApplication();
+    string anID(TCollection_AsciiString(myComment->Get()).ToCString());
+    if (!anApp->hasDocument(anID)) {
+      anApp->setLoadByDemand(anID);
+    }
   }
 }