Issue #1764: The result of partition is not stored in a folder

[modules/shaper.git] / src / Model / Model_AttributeReference.cpp

diff --git a/src/Model/Model_AttributeReference.cpp b/src/Model/Model_AttributeReference.cpp
index 8a44eec0e20051292bb7d57617a0f72e9c1e7119..b17b72f87ba72c863cff12990e57451445a20838 100644 (file)
--- a/src/Model/Model_AttributeReference.cpp
+++ b/src/Model/Model_AttributeReference.cpp
@@ -28,7 +28,7 @@ void Model_AttributeReference::setValue(ObjectPtr theObject)
     REMOVE_BACK_REF(aValue);
 
     TDF_Label anObjLab;
-    if (theObject.get() && theObject->data().get() && theObject->data()->isValid()) {
+    if (theObject.get() && theObject->data()->isValid()) {
       std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(
         theObject->data());
       anObjLab = aData->label().Father(); // object label
@@ -36,8 +36,6 @@ void Model_AttributeReference::setValue(ObjectPtr theObject)
     // same document, use reference attribute
     if (anObjLab.IsNull() || owner()->document() == theObject->document()) {
 
-      std::shared_ptr<Model_Document> aDoc =
-        std::dynamic_pointer_cast<Model_Document>(owner()->document());
       if (anObjLab.IsNull()) {
         myRef->Set(myRef->Label());
       } else {
@@ -48,7 +46,9 @@ void Model_AttributeReference::setValue(ObjectPtr theObject)
       myRef->Label().ForgetAttribute(TDataStd_AsciiString::GetID());
     } else { // different document: store the document name (comment) and entry (string): external
       // if these attributes exist, the link is external: keep reference to access the label
-      TDataStd_Comment::Set(myRef->Label(), theObject->document()->id().c_str());
+      std::ostringstream anIdString; // string with document Id
+      anIdString<<theObject->document()->id();
+      TDataStd_Comment::Set(myRef->Label(), anIdString.str().c_str());
       TCollection_AsciiString anEntry;
       TDF_Tool::Entry(anObjLab, anEntry);
       TDataStd_AsciiString::Set(myRef->Label(), anEntry);
@@ -63,23 +63,23 @@ void Model_AttributeReference::setValue(ObjectPtr theObject)
 
 ObjectPtr Model_AttributeReference::value()
 {
-  if (isInitialized()) {
-    Handle(TDataStd_Comment) aDocID;
-    if (myRef->Label().FindAttribute(TDataStd_Comment::GetID(), aDocID)) { // external ref
-      DocumentPtr aRefDoc =
-        ModelAPI_Session::get()->document(TCollection_AsciiString(aDocID->Get()).ToCString());
-      if (aRefDoc) {
-        Handle(TDataStd_AsciiString) anEntry;
-        if (myRef->Label().FindAttribute(TDataStd_AsciiString::GetID(), anEntry)) {
-          std::shared_ptr<Model_Document> aDR = std::dynamic_pointer_cast<Model_Document>(aRefDoc);
-          TDF_Label aRefLab;
-          TDF_Tool::Label(aDR->objects()->featuresLabel().Data(), anEntry->Get().ToCString(), aRefLab);
-          if (!aRefLab.IsNull()) {
-            return aDR->objects()->object(aRefLab);
-          }
+  Handle(TDataStd_Comment) aDocID;
+  if (myRef->Label().FindAttribute(TDataStd_Comment::GetID(), aDocID)) { // external ref
+    int anID = atoi(TCollection_AsciiString(aDocID->Get()).ToCString());
+    DocumentPtr aRefDoc = Model_Application::getApplication()->document(anID);
+    if (aRefDoc.get()) {
+      Handle(TDataStd_AsciiString) anEntry;
+      if (myRef->Label().FindAttribute(TDataStd_AsciiString::GetID(), anEntry)) {
+        std::shared_ptr<Model_Document> aDR = std::dynamic_pointer_cast<Model_Document>(aRefDoc);
+        TDF_Label aRefLab;
+        TDF_Tool::Label(aDR->objects()->featuresLabel().Data(), anEntry->Get().ToCString(), aRefLab);
+        if (!aRefLab.IsNull()) {
+          return aDR->objects()->object(aRefLab);
         }
       }
-    } else { // internal ref
+    }
+  } else { // internal ref
+    if (owner().get()) {
       std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(
           owner()->document());
       if (aDoc) {
@@ -90,13 +90,13 @@ ObjectPtr Model_AttributeReference::value()
       }
     }
   }
-  // not initialized
   return FeaturePtr();
 }
 
 bool Model_AttributeReference::isInitialized()
 {
-  if (myRef->Label() == myRef->Get()) { // empty reference is not initialized
+  if (myRef->Label() == myRef->Get() && !myRef->Label().IsAttribute(TDataStd_Comment::GetID())) {
+    // empty reference is not initialized
     return false;
   }
   return ModelAPI_AttributeReference::isInitialized();
@@ -104,9 +104,15 @@ bool Model_AttributeReference::isInitialized()
 
 Model_AttributeReference::Model_AttributeReference(TDF_Label& theLabel)
 {
-  myIsInitialized = theLabel.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True;
+  myLab = theLabel;
+  reinit();
+}
+
+void Model_AttributeReference::reinit()
+{
+  myIsInitialized = myLab.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True;
   if (!myIsInitialized) {
-    myRef = TDF_Reference::Set(theLabel, theLabel);  // not initialized references to itself
+    myRef = TDF_Reference::Set(myLab, myLab);  // not initialized references to itself
   } else {
     if (owner()) {
       std::shared_ptr<Model_Document> aDoc =
@@ -119,14 +125,10 @@ void Model_AttributeReference::setObject(const std::shared_ptr<ModelAPI_Object>&
 {
   if (owner() != theObject) {
     ModelAPI_AttributeReference::setObject(theObject);
-    std::shared_ptr<Model_Document> aDoc =
-      std::dynamic_pointer_cast<Model_Document>(owner()->document());
+    //std::shared_ptr<Model_Document> aDoc =
+    //  std::dynamic_pointer_cast<Model_Document>(owner()->document());
   }
 }
 
 Model_AttributeReference::~Model_AttributeReference()
-{
-  std::shared_ptr<Model_Document> aDoc =
-    std::dynamic_pointer_cast<Model_Document>(owner()->document());
-  TDF_Label aLab = myRef->Get();
-}
+{}