Sources formated according to the codeing standards

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

diff --git a/src/Model/Model_AttributeReference.cpp b/src/Model/Model_AttributeReference.cpp
index 9cfd4a91c3ef72ee3df11bdd76f6deadcb5e650f..dfb54c5f10331298e535624aba6457cb10ee2cf9 100644 (file)
--- a/src/Model/Model_AttributeReference.cpp
+++ b/src/Model/Model_AttributeReference.cpp
@@ -13,24 +13,18 @@ using namespace std;
 void Model_AttributeReference::setValue(ObjectPtr theObject)
 {
   if (!myIsInitialized || value() != theObject) {
-    boost::shared_ptr<Model_Data> aData = 
-      boost::dynamic_pointer_cast<Model_Data>(theObject->data());
-    if (myRef.IsNull()) {
-      boost::shared_ptr<Model_Data> aMyData = 
-        boost::dynamic_pointer_cast<Model_Data>(owner()->data());
-      myRef = TDF_Reference::Set(aMyData->label(), aData->label());
-    } else {
-      myRef->Set(aData->label());
-    }
+    boost::shared_ptr<Model_Data> aData = boost::dynamic_pointer_cast<Model_Data>(
+        theObject->data());
+    myRef->Set(aData->label().Father());  // references to the feature label
     owner()->data()->sendAttributeUpdated(this);
   }
 }
 
 ObjectPtr Model_AttributeReference::value()
 {
-  if (!myRef.IsNull()) {
-    boost::shared_ptr<Model_Document> aDoc = 
-      boost::dynamic_pointer_cast<Model_Document>(owner()->document());
+  if (myIsInitialized) {
+    boost::shared_ptr<Model_Document> aDoc = boost::dynamic_pointer_cast<Model_Document>(
+        owner()->document());
     if (aDoc) {
       TDF_Label aRefLab = myRef->Get();
       return aDoc->object(aRefLab);
@@ -42,6 +36,7 @@ ObjectPtr Model_AttributeReference::value()
 
 Model_AttributeReference::Model_AttributeReference(TDF_Label& theLabel)
 {
-  // not initialized by value yet: attribute is not set to the label!
   myIsInitialized = theLabel.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True;
+  if (!myIsInitialized)
+    myRef = TDF_Reference::Set(theLabel, theLabel);  // not initialized references to itself
 }