X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeRefAttr.cpp;h=aeef3085173c60c99503b5766291c677ee2987a4;hb=6dce44a08e0505613a25d6d093f153d69045b1ce;hp=38e989e047ca7f10928df123f79e44117b43d02a;hpb=33b3a43ad2266cb044e4232c902344842adbba7c;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeRefAttr.cpp b/src/Model/Model_AttributeRefAttr.cpp
index 38e989e04..aeef30851 100644
--- a/src/Model/Model_AttributeRefAttr.cpp
+++ b/src/Model/Model_AttributeRefAttr.cpp
@@ -1,16 +1,28 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModelAPI_AttributeRefAttr.cxx
-// Created:     2 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "Model_AttributeRefAttr.h"
 #include "Model_Application.h"
 #include "Model_Data.h"
+#include "Model_Objects.h"
 #include <ModelAPI_Feature.h>
 
-using namespace std;
-
 bool Model_AttributeRefAttr::isObject()
 {
   return myID->Get().Length() == 0;
@@ -20,10 +32,11 @@ void Model_AttributeRefAttr::setAttr(std::shared_ptr<ModelAPI_Attribute> theAttr
 {
   std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(
       theAttr->owner()->data());
-  string anID = aData->id(theAttr);
-  if (myIsInitialized && object() == theAttr->owner() && myID->Get().IsEqual(anID.c_str()))
+  std::string anID = aData->id(theAttr);
+  ObjectPtr anObj = object();
+  if (myIsInitialized && anObj == theAttr->owner() && myID->Get().IsEqual(anID.c_str()))
     return;  // nothing is changed
-  REMOVE_BACK_REF(theAttr->owner());
+  REMOVE_BACK_REF(anObj);
   myRef->Set(aData->label().Father());
   myID->Set(aData->id(theAttr).c_str());
   ADD_BACK_REF(theAttr->owner());
@@ -45,7 +58,7 @@ void Model_AttributeRefAttr::setObject(ObjectPtr theObject)
 {
   // the back reference from the previous object to the attribute should be removed
   ObjectPtr anObject = object();
-  if (theObject && (!myIsInitialized || myID->Get().Length() != 0 || object() != theObject)) {
+  if (theObject.get() && (!myIsInitialized || myID->Get().Length() != 0 || object() != theObject)) {
     REMOVE_BACK_REF(anObject);
 
     std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(
@@ -76,21 +89,35 @@ ObjectPtr Model_AttributeRefAttr::object()
         owner()->document());
     if (aDoc) {
       TDF_Label aRefLab = myRef->Get();
-      return aDoc->object(aRefLab);
+      return aDoc->objects()->object(aRefLab);
     }
   }
   // not initialized
   return ObjectPtr();
 }
 
+bool Model_AttributeRefAttr::isInitialized()
+{
+  if (myRef->Get() == myRef->Label()) { // empty is not initialized: sketch parallelity
+    return false;
+  }
+  return ModelAPI_AttributeRefAttr::isInitialized();
+}
+
 Model_AttributeRefAttr::Model_AttributeRefAttr(TDF_Label& theLabel)
 {
-  myIsInitialized = theLabel.FindAttribute(TDataStd_Comment::GetID(), myID) == Standard_True;
+  myLab = theLabel;
+  reinit();
+}
+
+void Model_AttributeRefAttr::reinit()
+{
+  myIsInitialized = myLab.FindAttribute(TDataStd_Comment::GetID(), myID) == Standard_True;
   if (!myIsInitialized) {
     // create attribute: not initialized by value yet
-    myID = TDataStd_Comment::Set(theLabel, "");
-    myRef = TDF_Reference::Set(theLabel, theLabel);  // not initialized: reference to itself
+    myID = TDataStd_Comment::Set(myLab, "");
+    myRef = TDF_Reference::Set(myLab, myLab);  // not initialized: reference to itself
   } else {
-    theLabel.FindAttribute(TDF_Reference::GetID(), myRef);
+    myLab.FindAttribute(TDF_Reference::GetID(), myRef);
   }
 }