X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeReference.cpp;h=beb04549cffe4a51c359d83158e386613ddb07e8;hb=ebf59abe16d4ccc81cd1eb506f1f897c06a41ccb;hp=011c8bfbcd4e8e6ebf43bab0572fbfd4ecd0be02;hpb=96912644cf6607688466ac69f1f098fd2fff37b7;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeReference.cpp b/src/Model/Model_AttributeReference.cpp
index 011c8bfbc..beb04549c 100644
--- a/src/Model/Model_AttributeReference.cpp
+++ b/src/Model/Model_AttributeReference.cpp
@@ -20,21 +20,27 @@ using namespace std;
 
 void Model_AttributeReference::setValue(ObjectPtr theObject)
 {
-  if(!theObject)
-    return;
+  // now allow to deselect in this attribute: extrusion from/to
+  //if(!theObject)
+  //  return;
   ObjectPtr aValue = value();
   if (!myIsInitialized || aValue != theObject) {
     REMOVE_BACK_REF(aValue);
 
-    std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(
-      theObject->data());
-    TDF_Label anObjLab = aData->label().Father(); // object label
-
-    if (owner()->document() == theObject->document()) { // same document, use reference attribute
+    TDF_Label anObjLab;
+    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
+    }
+    // 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());
-      myRef->Set(anObjLab);  // references to the object label
+      if (anObjLab.IsNull()) {
+        myRef->Set(myRef->Label());
+      } else {
+        myRef->Set(anObjLab);  // references to the object label
+      }
        // remove external link attributes (if any)
       myRef->Label().ForgetAttribute(TDataStd_Comment::GetID());
       myRef->Label().ForgetAttribute(TDataStd_AsciiString::GetID());
@@ -55,7 +61,7 @@ void Model_AttributeReference::setValue(ObjectPtr theObject)
 
 ObjectPtr Model_AttributeReference::value()
 {
-  if (myIsInitialized) {
+  if (isInitialized()) {
     Handle(TDataStd_Comment) aDocID;
     if (myRef->Label().FindAttribute(TDataStd_Comment::GetID(), aDocID)) { // external ref
       DocumentPtr aRefDoc =
@@ -86,6 +92,15 @@ ObjectPtr Model_AttributeReference::value()
   return FeaturePtr();
 }
 
+bool Model_AttributeReference::isInitialized()
+{
+  if (myRef->Label() == myRef->Get() && !myRef->Label().IsAttribute(TDataStd_Comment::GetID())) {
+    // empty reference is not initialized
+    return false;
+  }
+  return ModelAPI_AttributeReference::isInitialized();
+}
+
 Model_AttributeReference::Model_AttributeReference(TDF_Label& theLabel)
 {
   myIsInitialized = theLabel.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True;