X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDocRef.cpp;h=2284226c262cb09819572a5c52e370623f5a7950;hb=acfb7413a39dd03b70cd8d2847264e083eac2a25;hp=83615e30ec458bd63417ebc210e95a03b4558ee4;hpb=712dfdf42f58bb738a0db2c051a405391151972f;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeDocRef.cpp b/src/Model/Model_AttributeDocRef.cpp index 83615e30e..2284226c2 100644 --- a/src/Model/Model_AttributeDocRef.cpp +++ b/src/Model/Model_AttributeDocRef.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: ModelAPI_AttributeDocRef.cxx // Created: 2 Apr 2014 // Author: Mikhail PONIKAROV @@ -9,8 +11,9 @@ using namespace std; -void Model_AttributeDocRef::setValue(boost::shared_ptr theDoc) +void Model_AttributeDocRef::setValue(std::shared_ptr theDoc) { + myDoc = theDoc; TCollection_ExtendedString aNewID(theDoc->id().c_str()); if (!myIsInitialized || myComment->Get() != aNewID) { myComment->Set(TCollection_ExtendedString(theDoc->id().c_str())); @@ -18,13 +21,9 @@ void Model_AttributeDocRef::setValue(boost::shared_ptr theDoc } } -boost::shared_ptr Model_AttributeDocRef::value() +std::shared_ptr Model_AttributeDocRef::value() { - if (myComment->Get().Length()) - return Model_Application::getApplication()->getDocument( - TCollection_AsciiString(myComment->Get()).ToCString()); - // not initialized - return boost::shared_ptr(); + return myDoc; } Model_AttributeDocRef::Model_AttributeDocRef(TDF_Label& theLabel) @@ -33,7 +32,7 @@ Model_AttributeDocRef::Model_AttributeDocRef(TDF_Label& theLabel) 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 + } 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)) {