X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_Data.cpp;h=75c9732427a00276a7014e35ac74630fd246e0a9;hb=b5eaf6f6971771b1e39f55ba5fc484e2f150ffb8;hp=4546128eb5625815766cddcb2e1d22f60a302f07;hpb=298e667eb49d3d1441664d76c1ab4f5fdc80645e;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 4546128eb..75c973242 100644
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -8,26 +8,36 @@
 #include <Model_AttributeDocRef.h>
 #include <Model_AttributeInteger.h>
 #include <Model_AttributeDouble.h>
+#include <Model_AttributeDoubleArray.h>
 #include <Model_AttributeReference.h>
 #include <Model_AttributeRefAttr.h>
 #include <Model_AttributeRefList.h>
+#include <Model_AttributeRefAttrList.h>
 #include <Model_AttributeBoolean.h>
 #include <Model_AttributeString.h>
 #include <Model_AttributeSelection.h>
 #include <Model_AttributeSelectionList.h>
 #include <Model_AttributeIntArray.h>
 #include <Model_Events.h>
+#include <Model_Expression.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Result.h>
+#include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_Tools.h>
+#include <Model_Validator.h>
+
+#include <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Point2D.h>
 
 #include <GeomData_Point.h>
 #include <GeomData_Point2D.h>
 #include <GeomData_Dir.h>
 #include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 
 #include <TDataStd_Name.hxx>
 #include <TDataStd_AsciiString.hxx>
@@ -35,6 +45,7 @@
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_RelocationTable.hxx>
+#include <TColStd_HArray1OfByte.hxx>
 
 #include <string>
 
@@ -46,11 +57,13 @@
 static const int kFlagInHistory = 0;
 //                             1 - is displayed or not
 static const int kFlagDisplayed = 1;
+//                             2 - is deleted (for results) or not
+static const int kFlagDeleted = 2;
 
 // invalid data
 const static std::shared_ptr<ModelAPI_Data> kInvalid(new Model_Data());
 
-Model_Data::Model_Data() : mySendAttributeUpdated(true)
+Model_Data::Model_Data() : mySendAttributeUpdated(true), myWasChangedButBlocked(false)
 {
 }
 
@@ -60,9 +73,19 @@ void Model_Data::setLabel(TDF_Label theLab)
   // set or get the default flags
   if (!myLab.FindAttribute(TDataStd_BooleanArray::GetID(), myFlags)) {
     // set default values if not found
-    myFlags = TDataStd_BooleanArray::Set(myLab, 0, 1);
+    myFlags = TDataStd_BooleanArray::Set(myLab, 0, 2);
     myFlags->SetValue(kFlagInHistory, Standard_True); // is in history by default is true
     myFlags->SetValue(kFlagDisplayed, Standard_True); // is displayed by default is true
+    myFlags->SetValue(kFlagDeleted, Standard_False); // is deleted by default is false
+  } else if (myFlags->Length() != 3) { // for old formats support
+    Standard_Boolean aFlag0 = myFlags->Upper() >= 0 ? myFlags->Value(0) : Standard_True;
+    Standard_Boolean aFlag1 = myFlags->Upper() >= 1 ? myFlags->Value(1) : Standard_True;
+    Standard_Boolean aFlag2 = myFlags->Upper() >= 2 ? myFlags->Value(2) : Standard_True;
+    Handle(TColStd_HArray1OfByte) aNewArray = new TColStd_HArray1OfByte(0, 2);
+    myFlags->SetInternalArray(aNewArray);
+    myFlags->SetValue(0, aFlag0); 
+    myFlags->SetValue(1, aFlag1); 
+    myFlags->SetValue(2, aFlag2); 
   }
 }
 
@@ -77,6 +100,7 @@ std::string Model_Data::name()
 void Model_Data::setName(const std::string& theName)
 {
   bool isModified = false;
+  std::string anOldName = name();
   Handle(TDataStd_Name) aName;
   if (!myLab.FindAttribute(TDataStd_Name::GetID(), aName)) {
     TDataStd_Name::Set(myLab, theName.c_str());
@@ -86,12 +110,18 @@ void Model_Data::setName(const std::string& theName)
     if (isModified)
       aName->Set(theName.c_str());
   }
+  if (mySendAttributeUpdated && isModified)
+    ModelAPI_ObjectRenamedMessage::send(myObject, anOldName, theName, this);
+  if (isModified && myObject && myObject->document()) {
+    std::dynamic_pointer_cast<Model_Document>(myObject->document())->
+      changeNamingName(anOldName, theName);
+  }
 }
 
 AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType)
 {
   AttributePtr aResult;
-  TDF_Label anAttrLab = myLab.FindChild(myAttrs.size() + 1);
+  TDF_Label anAttrLab = myLab.FindChild(int(myAttrs.size()) + 1);
   ModelAPI_Attribute* anAttr = 0;
   if (theAttrType == ModelAPI_AttributeDocRef::typeId()) {
     anAttr = new Model_AttributeDocRef(anAttrLab);
@@ -113,16 +143,36 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin
     anAttr = new Model_AttributeRefAttr(anAttrLab);
   } else if (theAttrType == ModelAPI_AttributeRefList::typeId()) {
     anAttr = new Model_AttributeRefList(anAttrLab);
+  } else if (theAttrType == ModelAPI_AttributeRefAttrList::typeId()) {
+    anAttr = new Model_AttributeRefAttrList(anAttrLab);
   } else if (theAttrType == ModelAPI_AttributeIntArray::typeId()) {
     anAttr = new Model_AttributeIntArray(anAttrLab);
-  } 
-  // create also GeomData attributes here because only here the OCAF strucure is known
+  } else if (theAttrType == ModelAPI_AttributeDoubleArray::typeId()) {
+    anAttr = new Model_AttributeDoubleArray(anAttrLab);
+  }
+  // create also GeomData attributes here because only here the OCAF structure is known
   else if (theAttrType == GeomData_Point::typeId()) {
-    anAttr = new GeomData_Point(anAttrLab);
+    GeomData_Point* anAttribute = new GeomData_Point();
+    bool anAllInitialized = true;
+    for (int aComponent = 0; aComponent < GeomData_Point::NUM_COMPONENTS; ++aComponent) {
+      TDF_Label anExpressionLab = anAttrLab.FindChild(aComponent + 1);
+      anAttribute->myExpression[aComponent].reset(new Model_ExpressionDouble(anExpressionLab));
+      anAllInitialized = anAllInitialized && anAttribute->myExpression[aComponent]->isInitialized();
+    }
+    anAttribute->myIsInitialized = anAllInitialized;
+    anAttr = anAttribute;
   } else if (theAttrType == GeomData_Dir::typeId()) {
     anAttr = new GeomData_Dir(anAttrLab);
   } else if (theAttrType == GeomData_Point2D::typeId()) {
-    anAttr = new GeomData_Point2D(anAttrLab);
+    GeomData_Point2D* anAttribute = new GeomData_Point2D();
+    bool anAllInitialized = true;
+    for (int aComponent = 0; aComponent < GeomData_Point2D::NUM_COMPONENTS; ++aComponent) {
+      TDF_Label anExpressionLab = anAttrLab.FindChild(aComponent + 1);
+      anAttribute->myExpression[aComponent].reset(new Model_ExpressionDouble(anExpressionLab));
+      anAllInitialized = anAllInitialized && anAttribute->myExpression[aComponent]->isInitialized();
+    }
+    anAttribute->myIsInitialized = anAllInitialized;
+    anAttr = anAttribute;
   }
   if (anAttr) {
     aResult = std::shared_ptr<ModelAPI_Attribute>(anAttr);
@@ -130,12 +180,12 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin
     anAttr->setObject(myObject);
     anAttr->setID(theID);
   } else {
-    Events_Error::send("Can not create unknown type of attribute " + theAttrType);
+    Events_InfoMessage("Model_Data", "Can not create unknown type of attribute %1").arg(theAttrType).send();
   }
   return aResult;
 }
 
-// macro for gthe generic returning of the attribute by the ID
+// macro for the generic returning of the attribute by the ID
 #define GET_ATTRIBUTE_BY_ID(ATTR_TYPE, METHOD_NAME) \
   std::shared_ptr<ATTR_TYPE> Model_Data::METHOD_NAME(const std::string& theID) { \
     std::shared_ptr<ATTR_TYPE> aRes; \
@@ -157,7 +207,9 @@ GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeSelection, selection);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeSelectionList, selectionList);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefAttr, refattr);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefList, reflist);
+GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefAttrList, refattrlist);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeIntArray, intArray);
+GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeDoubleArray, realArray);
 
 std::shared_ptr<ModelAPI_Attribute> Model_Data::attribute(const std::string& theID)
 {
@@ -223,23 +275,64 @@ void Model_Data::sendAttributeUpdated(ModelAPI_Attribute* theAttr)
 {
   theAttr->setInitialized();
   if (theAttr->isArgument()) {
-    static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-    ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
-    if (mySendAttributeUpdated && myObject) {
-      myObject->attributeChanged(theAttr->id());
+    if (mySendAttributeUpdated) {
+      if (myObject) {
+        myObject->attributeChanged(theAttr->id());
+        static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+        ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
+      }
+    } else {
+      // to avoid too many duplications do not add the same like the last
+      if (myWasChangedButBlocked.empty() || *(myWasChangedButBlocked.rbegin()) != theAttr)
+        myWasChangedButBlocked.push_back(theAttr);
     }
   }
 }
 
-void Model_Data::blockSendAttributeUpdated(const bool theBlock)
-{
-  mySendAttributeUpdated = !theBlock;
+void Model_Data::blockSendAttributeUpdated(const bool theBlock, const bool theSendMessage)
+{
+  if (mySendAttributeUpdated == theBlock) {
+    mySendAttributeUpdated = !theBlock;
+    if (mySendAttributeUpdated && !myWasChangedButBlocked.empty()) { // so, now it is ok to send the update signal
+      if (theSendMessage) {
+        // make a copy to avoid iteration on modified list (may be cleared by attribute changed call)
+        std::list<ModelAPI_Attribute*> aWasChangedButBlocked = myWasChangedButBlocked;
+        myWasChangedButBlocked.clear();
+        std::list<ModelAPI_Attribute*>::iterator aChangedIter = aWasChangedButBlocked.begin();
+        for(; aChangedIter != aWasChangedButBlocked.end(); aChangedIter++) {
+          myObject->attributeChanged((*aChangedIter)->id());
+        }
+        static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+        ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
+      } else {
+        myWasChangedButBlocked.clear();
+      }
+    }
+  }
 }
 
 void Model_Data::erase()
 {
-  if (!myLab.IsNull())
+  if (!myLab.IsNull()) {
+    if (myLab.HasAttribute()) {
+      // remove in order to clear back references in other objects
+      std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefs;
+      referencesToObjects(aRefs);
+      std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator anAttrIter = aRefs.begin();
+      for(; anAttrIter != aRefs.end(); anAttrIter++) {
+        std::list<ObjectPtr>::iterator aReferenced = anAttrIter->second.begin();
+        for(; aReferenced != anAttrIter->second.end(); aReferenced++) {
+          if (aReferenced->get() && (*aReferenced)->data()->isValid()) {
+            std::shared_ptr<Model_Data> aData = 
+              std::dynamic_pointer_cast<Model_Data>((*aReferenced)->data());
+            aData->removeBackReference(myAttrs[anAttrIter->first]);
+          }
+        }
+      }
+    }
+    myAttrs.clear();
     myLab.ForgetAllAttributes();
+  }
 }
 
 // indexes in the state array
@@ -263,7 +356,9 @@ static Handle(TDataStd_IntegerArray) stateArray(TDF_Label& theLab)
 void Model_Data::execState(const ModelAPI_ExecState theState)
 {
   if (theState != ModelAPI_StateNothing) {
-    stateArray(myLab)->SetValue(STATE_INDEX_STATE, (int)theState);
+    if (stateArray(myLab)->Value(STATE_INDEX_STATE) != (int)theState) {
+      stateArray(myLab)->SetValue(STATE_INDEX_STATE, (int)theState);
+    }
   }
 }
 
@@ -286,11 +381,16 @@ void Model_Data::setError(const std::string& theError, bool theSend)
 {
   execState(ModelAPI_StateExecFailed);
   if (theSend) {
-    Events_Error::send(theError);
+    Events_InfoMessage("Model_Data", theError).send();
   }
   TDataStd_AsciiString::Set(myLab, theError.c_str());
 }
 
+void Model_Data::eraseErrorString()
+{
+  myLab.ForgetAttribute(TDataStd_AsciiString::GetID());
+}
+
 std::string Model_Data::error() const
 {
   Handle(TDataStd_AsciiString) anErrorAttr;
@@ -317,40 +417,128 @@ void Model_Data::eraseBackReferences()
 void Model_Data::removeBackReference(FeaturePtr theFeature, std::string theAttrID)
 {
   AttributePtr anAttribute = theFeature->data()->attribute(theAttrID);
-  if (myRefsToMe.find(anAttribute) == myRefsToMe.end())
+  removeBackReference(anAttribute);
+}
+
+void Model_Data::removeBackReference(AttributePtr theAttr)
+{
+  if (myRefsToMe.find(theAttr) == myRefsToMe.end())
     return;
 
-  myRefsToMe.erase(anAttribute);
+  myRefsToMe.erase(theAttr);
+
+  // remove concealment immideately: on deselection it must be posible to reselect in GUI the same
+  FeaturePtr aFeatureOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttr->owner());
+  if (aFeatureOwner.get() &&
+    ModelAPI_Session::get()->validators()->isConcealed(aFeatureOwner->getKind(), theAttr->id())) {
+    updateConcealmentFlag();
+  }
 }
 
 void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID, 
    const bool theApplyConcealment)
 {
-  // do not add the same attribute twice
+  // it is possible to add the same attribute twice: may be last time the owner was not Stable...
   AttributePtr anAttribute = theFeature->data()->attribute(theAttrID);
-  if (myRefsToMe.find(anAttribute) != myRefsToMe.end())
-    return;
+  if (myRefsToMe.find(anAttribute) == myRefsToMe.end())
+    myRefsToMe.insert(theFeature->data()->attribute(theAttrID));
 
-  myRefsToMe.insert(theFeature->data()->attribute(theAttrID));
-  if (theApplyConcealment && 
+  if (theApplyConcealment &&  theFeature->isStable() && 
       ModelAPI_Session::get()->validators()->isConcealed(theFeature->getKind(), theAttrID)) {
     std::shared_ptr<ModelAPI_Result> aRes = 
       std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
     // the second condition is for history upper than concealment causer, so the feature result may
     // be displayed and previewed; also for avoiding of quick show/hide on history
     // moving deep down
-    if (aRes && !theFeature->isDisabled()) {
+    if (aRes && !theFeature->isDisabled() && 
+        !ModelAPI_Session::get()->validators()->isUnconcealed(aRes, theFeature)) {
       aRes->setIsConcealed(true);
     }
   }
 }
 
+void Model_Data::updateConcealmentFlag()
+{
+  std::set<AttributePtr>::iterator aRefsIter = myRefsToMe.begin();
+  for(; aRefsIter != myRefsToMe.end(); aRefsIter++) {
+    if (aRefsIter->get()) {
+      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefsIter)->owner());
+      if (aFeature.get() && !aFeature->isDisabled() && aFeature->isStable()) {
+        if (ModelAPI_Session::get()->validators()->isConcealed(
+              aFeature->getKind(), (*aRefsIter)->id())) {
+          std::shared_ptr<ModelAPI_Result> aRes = 
+            std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
+          if (aRes.get()) {
+            if (!ModelAPI_Session::get()->validators()->isUnconcealed(aRes, aFeature)) {
+              aRes->setIsConcealed(true); // set concealed
+              return;
+            }
+          }
+        }
+      }
+    }
+  }
+  std::shared_ptr<ModelAPI_Result> aRes = 
+    std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
+  if (aRes.get()) {
+    aRes->setIsConcealed(false);
+  }
+}
+
+std::set<std::string> set_union(const std::set<std::string>& theLeft, 
+                                const std::set<std::string>& theRight)
+{
+  std::set<std::string> aResult;
+  aResult.insert(theLeft.begin(), theLeft.end());
+  aResult.insert(theRight.begin(), theRight.end());
+  return aResult;
+}
+
+std::set<std::string> usedParameters(const AttributePointPtr& theAttribute)
+{
+  std::set<std::string> anUsedParameters;
+  for (int aComponent = 0; aComponent < 3; ++aComponent)
+    anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+  return anUsedParameters;
+}
+
+std::set<std::string> usedParameters(const AttributePoint2DPtr& theAttribute)
+{
+  std::set<std::string> anUsedParameters;
+  for (int aComponent = 0; aComponent < 2; ++aComponent)
+    anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+  return anUsedParameters;
+}
+
+std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters)
+{
+  std::list<ResultParameterPtr> aResult;
+  std::set<std::string>::const_iterator aParamIt = theParameters.cbegin();
+  for (; aParamIt != theParameters.cend(); ++aParamIt) {
+    const std::string& aName = *aParamIt;
+    double aValue;
+    ResultParameterPtr aParam;
+    // theSearcher is not needed here: in expressions of features the parameters history is not needed
+    if (ModelAPI_Tools::findVariable(FeaturePtr(), aName, aValue, aParam))
+      aResult.push_back(aParam);
+  }
+  return aResult;
+}
+
 void Model_Data::referencesToObjects(
   std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs)
 {
+  static Model_ValidatorsFactory* aValidators = 
+    static_cast<Model_ValidatorsFactory*>(ModelAPI_Session::get()->validators());
+  FeaturePtr aMyFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(myObject);
+
   std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator anAttr = myAttrs.begin();
-  std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory menagement
+  std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory management
   for(; anAttr != myAttrs.end(); anAttr++) {
+    // skip not-case attributes, that really may refer to anything not-used (issue 671)
+    if (aMyFeature.get() && !aValidators->isCase(aMyFeature, anAttr->second->id()))
+      continue;
+
     std::string aType = anAttr->second->attributeType();
     if (aType == ModelAPI_AttributeReference::typeId()) { // reference to object
       std::shared_ptr<ModelAPI_AttributeReference> aRef = std::dynamic_pointer_cast<
@@ -359,7 +547,13 @@ void Model_Data::referencesToObjects(
     } else if (aType == ModelAPI_AttributeRefAttr::typeId()) { // reference to attribute or object
       std::shared_ptr<ModelAPI_AttributeRefAttr> aRef = std::dynamic_pointer_cast<
           ModelAPI_AttributeRefAttr>(anAttr->second);
-      aReferenced.push_back(aRef->isObject() ? aRef->object() : aRef->attr()->owner());
+      if (aRef->isObject()) {
+        aReferenced.push_back(aRef->object());
+      } else {
+        AttributePtr anAttr = aRef->attr();
+        if (anAttr.get())
+          aReferenced.push_back(anAttr->owner());
+      }
     } else if (aType == ModelAPI_AttributeRefList::typeId()) { // list of references
       aReferenced = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(anAttr->second)->list();
     } else if (aType == ModelAPI_AttributeSelection::typeId()) { // selection attribute
@@ -372,6 +566,39 @@ void Model_Data::referencesToObjects(
       for(int a = aRef->size() - 1; a >= 0; a--) {
         aReferenced.push_back(aRef->value(a)->context());
       }
+    } else if (aType == ModelAPI_AttributeRefAttrList::typeId()) {
+      std::shared_ptr<ModelAPI_AttributeRefAttrList> aRefAttr = std::dynamic_pointer_cast<
+          ModelAPI_AttributeRefAttrList>(anAttr->second);
+      std::list<std::pair<ObjectPtr, AttributePtr> > aRefs = aRefAttr->list();
+      std::list<std::pair<ObjectPtr, AttributePtr> >::const_iterator anIt = aRefs.begin(),
+                                                                     aLast = aRefs.end();
+      for (; anIt != aLast; anIt++) {
+        aReferenced.push_back(anIt->first);
+      }
+    } else if (aType == ModelAPI_AttributeInteger::typeId()) { // integer attribute
+      AttributeIntegerPtr anAttribute =
+          std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(anAttr->second);
+      std::set<std::string> anUsedParameters = anAttribute->usedParameters();
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == ModelAPI_AttributeDouble::typeId()) { // double attribute
+      AttributeDoublePtr anAttribute =
+          std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(anAttr->second);
+      std::set<std::string> anUsedParameters = anAttribute->usedParameters();
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == GeomDataAPI_Point::typeId()) { // point attribute
+      AttributePointPtr anAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point>(anAttr->second);
+      std::set<std::string> anUsedParameters = usedParameters(anAttribute);
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == GeomDataAPI_Point2D::typeId()) { // point attribute
+      AttributePoint2DPtr anAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->second);
+      std::set<std::string> anUsedParameters = usedParameters(anAttribute);
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else
       continue; // nothing to do, not reference
 
@@ -406,13 +633,10 @@ void Model_Data::copyTo(std::shared_ptr<ModelAPI_Data> theTarget)
 {
   TDF_Label aTargetRoot = std::dynamic_pointer_cast<Model_Data>(theTarget)->label();
   copyAttrs(myLab, aTargetRoot);
-  // make initialized the initialized attributes
-  std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator aMyIter = myAttrs.begin();
-  for(; aMyIter != myAttrs.end(); aMyIter++) {
-    if (aMyIter->second->isInitialized()) {
-      theTarget->attribute(aMyIter->first)->setInitialized();
-    }
-  }
+  // reinitialize Model_Attributes by TDF_Attributes set
+  std::shared_ptr<Model_Data> aTData = std::dynamic_pointer_cast<Model_Data>(theTarget);
+  aTData->myAttrs.clear();
+  theTarget->owner()->initAttributes(); // reinit feature attributes
 }
 
 bool Model_Data::isInHistory()
@@ -425,6 +649,16 @@ void Model_Data::setIsInHistory(const bool theFlag)
   return myFlags->SetValue(kFlagInHistory, theFlag);
 }
 
+bool Model_Data::isDeleted()
+{
+  return myFlags->Value(kFlagDeleted) == Standard_True;
+}
+
+void Model_Data::setIsDeleted(const bool theFlag)
+{
+  return myFlags->SetValue(kFlagDeleted, theFlag);
+}
+
 bool Model_Data::isDisplayed()
 {
   if (!myObject.get() || !myObject->document().get() || // object is in valid
@@ -459,3 +693,8 @@ std::shared_ptr<ModelAPI_Data> Model_Data::invalidData()
 {
   return kInvalid;
 }
+
+std::shared_ptr<ModelAPI_Object> Model_Data::owner()
+{
+  return myObject;
+}