Salome HOME
Make sketch features invisible in constructions and fix the nested commit warning
[modules/shaper.git] / src / Model / Model_Document.cpp
index 68ec29401056acbf1f5aa5303ec6d4e9da633f73..4ca962723f80c34bbdcc8d4a444e5fb8e1536756 100644 (file)
@@ -20,6 +20,8 @@
 #include <TDataStd_HLabelArray1.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDF_Reference.hxx>
+#include <TDF_ChildIDIterator.hxx>
+#include <TDF_LabelMapHasher.hxx>
 
 #include <climits>
 #ifndef WIN32
@@ -42,10 +44,8 @@ static const int TAG_HISTORY = 3; // tag of the history sub-tree (python dump)
 static const int TAG_FEATURE_ARGUMENTS = 1; ///< where the arguments are located
 static const int TAG_FEATURE_RESULTS = 2; ///< where the results are located
 
-using namespace std;
-
 /// Returns the file name of this document by the nameof directory and identifuer of a document
-static TCollection_ExtendedString DocFileName(const char* theFileName, const string& theID)
+static TCollection_ExtendedString DocFileName(const char* theFileName, const std::string& theID)
 {
   TCollection_ExtendedString aPath ((const Standard_CString)theFileName);
   aPath += _separator_;
@@ -69,7 +69,7 @@ bool Model_Document::load(const char* theFileName)
   catch (Standard_Failure)
   {
     Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-    Events_Error::send(string("Exception in opening of document: ") + aFail->GetMessageString());
+    Events_Error::send(std::string("Exception in opening of document: ") + aFail->GetMessageString());
     return false;
   }
   bool isError = aStatus != PCDM_RS_OK;
@@ -78,37 +78,41 @@ bool Model_Document::load(const char* theFileName)
     switch (aStatus)
     {
     case PCDM_RS_UnknownDocument: 
-      Events_Error::send(string("Can not open document: PCDM_RS_UnknownDocument")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_UnknownDocument")); break;
     case PCDM_RS_AlreadyRetrieved: 
-      Events_Error::send(string("Can not open document: PCDM_RS_AlreadyRetrieved")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_AlreadyRetrieved")); break;
     case PCDM_RS_AlreadyRetrievedAndModified:
-      Events_Error::send(string("Can not open document: PCDM_RS_AlreadyRetrievedAndModified")); break;
+      Events_Error::send(
+        std::string("Can not open document: PCDM_RS_AlreadyRetrievedAndModified"));
+      break;
     case PCDM_RS_NoDriver:
-      Events_Error::send(string("Can not open document: PCDM_RS_NoDriver")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_NoDriver")); break;
     case PCDM_RS_UnknownFileDriver:
-      Events_Error::send(string("Can not open document: PCDM_RS_UnknownFileDriver")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_UnknownFileDriver")); break;
     case PCDM_RS_OpenError:
-      Events_Error::send(string("Can not open document: PCDM_RS_OpenError")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_OpenError")); break;
     case PCDM_RS_NoVersion:
-      Events_Error::send(string("Can not open document: PCDM_RS_NoVersion")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_NoVersion")); break;
     case PCDM_RS_NoModel:
-      Events_Error::send(string("Can not open document: PCDM_RS_NoModel")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_NoModel")); break;
     case PCDM_RS_NoDocument:
-      Events_Error::send(string("Can not open document: PCDM_RS_NoDocument")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_NoDocument")); break;
     case PCDM_RS_FormatFailure:
-      Events_Error::send(string("Can not open document: PCDM_RS_FormatFailure")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_FormatFailure")); break;
     case PCDM_RS_TypeNotFoundInSchema:
-      Events_Error::send(string("Can not open document: PCDM_RS_TypeNotFoundInSchema")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_TypeNotFoundInSchema")); 
+      break;
     case PCDM_RS_UnrecognizedFileFormat:
-      Events_Error::send(string("Can not open document: PCDM_RS_UnrecognizedFileFormat")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_UnrecognizedFileFormat")); 
+      break;
     case PCDM_RS_MakeFailure:
-      Events_Error::send(string("Can not open document: PCDM_RS_MakeFailure")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_MakeFailure")); break;
     case PCDM_RS_PermissionDenied:
-      Events_Error::send(string("Can not open document: PCDM_RS_PermissionDenied")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_PermissionDenied")); break;
     case PCDM_RS_DriverFailure:
-      Events_Error::send(string("Can not open document: PCDM_RS_DriverFailure")); break;
+      Events_Error::send(std::string("Can not open document: PCDM_RS_DriverFailure")); break;
     default:
-      Events_Error::send(string("Can not open document: unknown error")); break;
+      Events_Error::send(std::string("Can not open document: unknown error")); break;
     }
   }
   if (!isError) {
@@ -136,7 +140,7 @@ bool Model_Document::save(const char* theFileName)
   }
   catch (Standard_Failure) {
     Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-    Events_Error::send(string("Exception in saving of document: ") + aFail->GetMessageString());
+    Events_Error::send(std::string("Exception in saving of document: ") + aFail->GetMessageString());
     return false;
   }
   bool isDone = aStatus == PCDM_SS_OK || aStatus == PCDM_SS_No_Obj;
@@ -145,20 +149,20 @@ bool Model_Document::save(const char* theFileName)
     switch (aStatus)
     {
     case PCDM_SS_DriverFailure:
-      Events_Error::send(string("Can not save document: PCDM_SS_DriverFailure"));
+      Events_Error::send(std::string("Can not save document: PCDM_SS_DriverFailure"));
       break;
     case PCDM_SS_WriteFailure:
-      Events_Error::send(string("Can not save document: PCDM_SS_WriteFailure"));
+      Events_Error::send(std::string("Can not save document: PCDM_SS_WriteFailure"));
       break;
     case PCDM_SS_Failure:
     default:
-      Events_Error::send(string("Can not save document: PCDM_SS_Failure"));
+      Events_Error::send(std::string("Can not save document: PCDM_SS_Failure"));
       break;
     }
   }
   myTransactionsAfterSave = 0;
   if (isDone) { // save also sub-documents if any
-    set<string>::iterator aSubIter = mySubs.begin();
+    std::set<std::string>::iterator aSubIter = mySubs.begin();
     for(; aSubIter != mySubs.end() && isDone; aSubIter++)
       isDone = subDocument(*aSubIter)->save(theFileName);
   }
@@ -173,7 +177,7 @@ void Model_Document::close()
     aPM->setCurrentDocument(aPM->rootDocument());
   }
   // close all subs
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     subDocument(*aSubIter)->close();
   mySubs.clear();
@@ -199,7 +203,7 @@ void Model_Document::startOperation()
     myDoc->NewCommand();
   }
   // new command for all subs
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     subDocument(*aSubIter)->startOperation();
 }
@@ -218,9 +222,17 @@ void Model_Document::compactNested() {
 void Model_Document::finishOperation()
 {
   // just to be sure that everybody knows that changes were performed
+  
+  if (!myDoc->HasOpenCommand() && myNestedNum != -1)
+    boost::static_pointer_cast<Model_PluginManager>(Model_PluginManager::get())->
+      setCheckTransactions(false); // for nested transaction commit
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+  Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
+  if (!myDoc->HasOpenCommand() && myNestedNum != -1)
+    boost::static_pointer_cast<Model_PluginManager>(Model_PluginManager::get())->
+      setCheckTransactions(true); // for nested transaction commit
 
   if (myNestedNum != -1) // this nested transaction is owervritten
     myNestedNum++;
@@ -236,7 +248,7 @@ void Model_Document::finishOperation()
   }
 
   // finish for all subs
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     subDocument(*aSubIter)->finishOperation();
 }
@@ -258,7 +270,7 @@ void Model_Document::abortOperation()
   }
   synchronizeFeatures(true);
   // abort for all subs
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
     for(; aSubIter != mySubs.end(); aSubIter++)
     subDocument(*aSubIter)->abortOperation();
 }
@@ -280,7 +292,7 @@ bool Model_Document::canUndo()
   if (myDoc->GetAvailableUndos() > 0 && myNestedNum != 0 && myTransactionsAfterSave != 0 /* for omitting the first useless transaction */)
     return true;
   // check other subs contains operation that can be undoed
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     if (subDocument(*aSubIter)->canUndo())
       return true;
@@ -295,7 +307,7 @@ void Model_Document::undo()
     myDoc->Undo();
   synchronizeFeatures(true);
   // undo for all subs
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     subDocument(*aSubIter)->undo();
 }
@@ -305,7 +317,7 @@ bool Model_Document::canRedo()
   if (myDoc->GetAvailableRedos() > 0)
     return true;
   // check other subs contains operation that can be redoed
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     if (subDocument(*aSubIter)->canRedo())
       return true;
@@ -320,7 +332,7 @@ void Model_Document::redo()
   myTransactionsAfterSave++;
   synchronizeFeatures(true);
   // redo for all subs
-  set<string>::iterator aSubIter = mySubs.begin();
+  std::set<std::string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
     subDocument(*aSubIter)->redo();
 }
@@ -342,27 +354,27 @@ static void AddToRefArray(TDF_Label& theArrayLab, TDF_Label& theReferenced) {
   }
 }
 
-
-FeaturePtr Model_Document::addFeature(string theID)
+FeaturePtr Model_Document::addFeature(std::string theID)
 {
   TDF_Label anEmptyLab;
   FeaturePtr anEmptyFeature;
   FeaturePtr aFeature = ModelAPI_PluginManager::get()->createFeature(theID);
+  boost::shared_ptr<Model_Document> aDocToAdd = 
+    boost::dynamic_pointer_cast<Model_Document>(aFeature->documentToAdd());
   if (aFeature) {
     TDF_Label aFeatureLab;
     if (!aFeature->isAction()) {// do not add action to the data model
-      TDF_Label aFeaturesLab = groupLabel(FEATURES_GROUP);
+      TDF_Label aFeaturesLab = aDocToAdd->featuresLabel();
       aFeatureLab = aFeaturesLab.NewChild();
-      initData(aFeature, aFeatureLab, TAG_FEATURE_ARGUMENTS);
+      aDocToAdd->initData(aFeature, aFeatureLab, TAG_FEATURE_ARGUMENTS);
       // keep the feature ID to restore document later correctly
       TDataStd_Comment::Set(aFeatureLab, aFeature->getKind().c_str());
-      myObjs[FEATURES_GROUP].push_back(aFeature);
+      aDocToAdd->myObjs.Bind(aFeatureLab, aFeature);
       // store feature in the history of features array
       if (aFeature->isInHistory()) {
         AddToRefArray(aFeaturesLab, aFeatureLab);
       }
     }
-    setUniqueName(aFeature);
     if (!aFeature->isAction()) {// do not add action to the data model
       // event: feature is added
       static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
@@ -372,13 +384,6 @@ FeaturePtr Model_Document::addFeature(string theID)
   return aFeature;
 }
 
-void Model_Document::storeResult(boost::shared_ptr<ModelAPI_Result> theResult,
-  const int theResultIndex)
-{
-  initData(theResult, boost::dynamic_pointer_cast<Model_Data>(theResult->owner()->data())->
-    label().Father().FindChild(TAG_FEATURE_RESULTS), theResultIndex);
-}
-
 /// Appenad to the array of references a new referenced label.
 /// If theIndex is not -1, removes element at thisindex, not theReferenced.
 /// \returns the index of removed element
@@ -414,49 +419,58 @@ void Model_Document::removeFeature(FeaturePtr theFeature)
 {
   boost::shared_ptr<Model_Data> aData = boost::static_pointer_cast<Model_Data>(theFeature->data());
   TDF_Label aFeatureLabel = aData->label().Father();
-  // remove feature from the myObjects list
-  std::vector<ObjectPtr>& aVec = myObjs[FEATURES_GROUP];
-  std::vector<ObjectPtr>::iterator anIter = aVec.begin();
-  while(anIter != aVec.end()) {
-    if (*anIter == theFeature) {
-      anIter = aVec.erase(anIter);
-    } else {
-      anIter++;
-    }
-  }
+  if (myObjs.IsBound(aFeatureLabel)) 
+    myObjs.UnBind(aFeatureLabel);
+  else return; // not found feature => do not remove
+
   // erase all attributes under the label of feature
   aFeatureLabel.ForgetAllAttributes();
   // remove it from the references array
-  RemoveFromRefArray(groupLabel(FEATURES_GROUP), aData->label());
+  RemoveFromRefArray(featuresLabel(), aData->label());
 
   // event: feature is deleted
-  ModelAPI_EventCreator::get()->sendDeleted(theFeature->document(), FEATURES_GROUP);
+  ModelAPI_EventCreator::get()->sendDeleted(theFeature->document(), ModelAPI_Feature::group());
+  // results of this feature must be redisplayed
+  static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+  const std::list<boost::shared_ptr<ModelAPI_Result> >& aResults = theFeature->results();
+  std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
+  for(; aRIter != aResults.cend(); aRIter++) {
+    boost::shared_ptr<ModelAPI_Result> aRes = *aRIter;
+    aRes->setData(boost::shared_ptr<ModelAPI_Data>()); // deleted flag
+    ModelAPI_EventCreator::get()->sendUpdated(aRes, EVENT_DISP);
+    ModelAPI_EventCreator::get()->sendDeleted(theFeature->document(), aRes->groupName());
+  }
 }
 
-/// returns the object group name by the object label
-static string groupName(TDF_Label theObjectLabel) {
-  TDF_Label aGroupLab = theObjectLabel.Father();
-  Handle(TDataStd_Comment) aComment;
-  if (aGroupLab.FindAttribute(TDataStd_Comment::GetID(), aComment))
-    return string(TCollection_AsciiString(aComment->Get()).ToCString());
-  return ""; // not found
+FeaturePtr Model_Document::feature(TDF_Label& theLabel)
+{
+  if (myObjs.IsBound(theLabel))
+    return myObjs.Find(theLabel);
+  return FeaturePtr(); // not found
 }
 
-FeaturePtr Model_Document::feature(TDF_Label& theLabel)
+ObjectPtr Model_Document::object(TDF_Label theLabel)
 {
-  // iterate all features, may be optimized later by keeping labels-map
-  std::vector<ObjectPtr>& aVec = myObjs[FEATURES_GROUP];
-  vector<ObjectPtr>::iterator aFIter = aVec.begin();
-  for(; aFIter != aVec.end(); aFIter++) {
-    boost::shared_ptr<Model_Data> aData = 
-      boost::dynamic_pointer_cast<Model_Data>((*aFIter)->data());
-    if (aData->label().IsEqual(theLabel))
-      return boost::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter);
+  // try feature by label
+  FeaturePtr aFeature = feature(theLabel);
+  if (aFeature)
+    return feature(theLabel);
+  TDF_Label aFeatureLabel = theLabel.Father().Father(); // let's suppose it is result
+  aFeature = feature(aFeatureLabel);
+  if (aFeature) {
+    const std::list<boost::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+    std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.cbegin();
+    for(; aRIter != aResults.cend(); aRIter++) {
+      boost::shared_ptr<Model_Data> aResData = 
+        boost::dynamic_pointer_cast<Model_Data>((*aRIter)->data());
+      if (aResData->label().Father().IsEqual(theLabel))
+        return *aRIter;
+    }
   }
   return FeaturePtr(); // not found
 }
 
-boost::shared_ptr<ModelAPI_Document> Model_Document::subDocument(string theDocID)
+boost::shared_ptr<ModelAPI_Document> Model_Document::subDocument(std::string theDocID)
 {
   // just store sub-document identifier here to manage it later
   if (mySubs.find(theDocID) == mySubs.end())
@@ -464,30 +478,30 @@ boost::shared_ptr<ModelAPI_Document> Model_Document::subDocument(string theDocID
   return Model_Application::getApplication()->getDocument(theDocID);
 }
 
-ObjectPtr Model_Document::object(const string& theGroupID, const int theIndex)
+ObjectPtr Model_Document::object(const std::string& theGroupID, const int theIndex)
 {
-  if (theGroupID == FEATURES_GROUP) {
-    std::map<std::string, std::vector<ObjectPtr> >::iterator aFind = myObjs.find(theGroupID);
-    if (aFind != myObjs.end()) {
-      int aSize = aFind->second.size();
-      if (theIndex >= 0 && theIndex < aSize)
-        return aFind->second[theIndex];
-    }
+  if (theGroupID == ModelAPI_Feature::group()) {
+    Handle(TDataStd_ReferenceArray) aRefs;
+    if (!featuresLabel().FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs))
+      return ObjectPtr();
+    if (aRefs->Lower() > theIndex || aRefs->Upper() < theIndex)
+      return ObjectPtr();
+    TDF_Label aFeatureLabel = aRefs->Value(theIndex);
+    return feature(aFeatureLabel);
   } else {
-    // iterate all features in order to find the needed result
-    std::map<std::string, std::vector<ObjectPtr> >::iterator aFind = myObjs.find(FEATURES_GROUP);
-    if (aFind != myObjs.end()) {
-      vector<ObjectPtr>::iterator aFIter = aFind->second.begin();
-      for(int anIndex = 0; aFIter != aFind->second.end(); aFIter++) {
-        const list<boost::shared_ptr<ModelAPI_Result> >& aResults = 
-          boost::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter)->results();
-        list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
-        for(; aRIter != aResults.cend(); aRIter++) {
-          if ((*aRIter)->isInHistory() && (*aRIter)->group() == theGroupID) {
-            if (anIndex == theIndex)
-              return *aRIter;
-            anIndex++;
-          }
+    // comment must be in any feature: it is kind
+    int anIndex = 0;
+    TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID());
+    for(; aLabIter.More(); aLabIter.Next()) {
+      TDF_Label aFLabel = aLabIter.Value()->Label();
+      FeaturePtr aFeature = feature(aFLabel);
+      const std::list<boost::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+      std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
+      for(; aRIter != aResults.cend(); aRIter++) {
+        if ((*aRIter)->isInHistory() && (*aRIter)->groupName() == theGroupID) {
+          if (anIndex == theIndex)
+            return *aRIter;
+          anIndex++;
         }
       }
     }
@@ -496,27 +510,24 @@ ObjectPtr Model_Document::object(const string& theGroupID, const int theIndex)
   return ObjectPtr();
 }
 
-int Model_Document::size(const string& theGroupID) 
+int Model_Document::size(const std::string& theGroupID) 
 {
   int aResult = 0;
-  if (theGroupID == FEATURES_GROUP) {
-    std::map<std::string, std::vector<ObjectPtr> >::iterator aFind = myObjs.find(theGroupID);
-    if (aFind != myObjs.end()) {
-      aResult = aFind->second.size();
-    }
+  if (theGroupID == ModelAPI_Feature::group()) {
+    Handle(TDataStd_ReferenceArray) aRefs;
+    if (featuresLabel().FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs))
+      return aRefs->Length();
   } else {
-    // iterate all features in order to find the needed result
-    std::map<std::string, std::vector<ObjectPtr> >::iterator aFind = myObjs.find(FEATURES_GROUP);
-    if (aFind != myObjs.end()) {
-      vector<ObjectPtr>::iterator aFIter = aFind->second.begin();
-      for(; aFIter != aFind->second.end(); aFIter++) {
-        const list<boost::shared_ptr<ModelAPI_Result> >& aResults = 
-          boost::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter)->results();
-        list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
-        for(; aRIter != aResults.cend(); aRIter++) {
-          if ((*aRIter)->isInHistory() && (*aRIter)->group() == theGroupID) {
-            aResult++;
-          }
+    // comment must be in any feature: it is kind
+    TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID());
+    for(; aLabIter.More(); aLabIter.Next()) {
+      TDF_Label aFLabel = aLabIter.Value()->Label();
+      FeaturePtr aFeature = feature(aFLabel);
+      const std::list<boost::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+      std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
+      for(; aRIter != aResults.cend(); aRIter++) {
+        if ((*aRIter)->isInHistory() && (*aRIter)->groupName() == theGroupID) {
+          aResult++;
         }
       }
     }
@@ -539,53 +550,50 @@ Model_Document::Model_Document(const std::string theID)
   myDoc->CommitCommand();
 }
 
-TDF_Label Model_Document::groupLabel(const string theGroup)
+TDF_Label Model_Document::featuresLabel()
 {
-  // searching for existing
-  TCollection_ExtendedString aGroup(theGroup.c_str());
-  TDF_ChildIDIterator aGroupIter(myDoc->Main().FindChild(TAG_OBJECTS), TDataStd_Comment::GetID());
-  for(; aGroupIter.More(); aGroupIter.Next()) {
-    Handle(TDataStd_Comment) aName = Handle(TDataStd_Comment)::DownCast(aGroupIter.Value());
-    if (aName->Get() == aGroup)
-      return aGroupIter.Value()->Label();
-  }
-  // create a new
-  TDF_Label aNew = myDoc->Main().FindChild(TAG_OBJECTS).NewChild();
-  TDataStd_Comment::Set(aNew, aGroup);
-  return aNew;
+  return myDoc->Main().FindChild(TAG_OBJECTS);
 }
 
 void Model_Document::setUniqueName(FeaturePtr theFeature)
 {
-  string aName; // result
+  if (!theFeature->data()->name().empty()) return; // not needed, name is already defined
+  std::string aName; // result
   // first count all objects of such kind to start with index = count + 1
-  int a, aNumObjects = 0;
-  int aSize = size(FEATURES_GROUP);
-  for(a = 0; a < aSize; a++) {
-    if (boost::dynamic_pointer_cast<ModelAPI_Feature>(object(FEATURES_GROUP, a))->getKind()
-        == theFeature->getKind())
+  int aNumObjects = 0;
+  NCollection_DataMap<TDF_Label, FeaturePtr>::Iterator aFIter(myObjs);
+  for(; aFIter.More(); aFIter.Next()) {
+    if (aFIter.Value()->getKind() == theFeature->getKind())
       aNumObjects++;
   }
   // generate candidate name
-  stringstream aNameStream;
+  std::stringstream aNameStream;
   aNameStream<<theFeature->getKind()<<"_"<<aNumObjects + 1;
   aName = aNameStream.str();
   // check this is unique, if not, increase index by 1
-  for(a = 0; a < aSize;) {
-    if (boost::dynamic_pointer_cast<ModelAPI_Feature>(object(FEATURES_GROUP, a))
-          ->data()->name() == aName) {
+  for(aFIter.Initialize(myObjs); aFIter.More(); ) {
+    FeaturePtr aFeature = aFIter.Value();
+    bool isSameName = aFeature->isInHistory() && aFeature->data()->name() == aName;
+    if (!isSameName) { // check also results to avoid same results names (actual for Parts)
+      const std::list<boost::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+      std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
+      for(; aRIter != aResults.cend(); aRIter++) {
+        isSameName = (*aRIter)->isInHistory() && (*aRIter)->data()->name() == aName;
+      }
+    }
+    if (isSameName) {
       aNumObjects++;
-      stringstream aNameStream;
+      std::stringstream aNameStream;
       aNameStream<<theFeature->getKind()<<"_"<<aNumObjects + 1;
       aName = aNameStream.str();
       // reinitialize iterator to make sure a new name is unique
-      a = 0;
-    } else a++;
+      aFIter.Initialize(myObjs);
+    } else aFIter.Next();
   }
   theFeature->data()->setName(aName);
 }
 
-void Model_Document::initData(ObjectPtr theObj, TDF_Label& theLab, const int theTag) {
+void Model_Document::initData(ObjectPtr theObj, TDF_Label theLab, const int theTag) {
   boost::shared_ptr<ModelAPI_Document> aThis = 
     Model_Application::getApplication()->getDocument(myID);
   boost::shared_ptr<Model_Data> aData(new Model_Data);
@@ -594,71 +602,69 @@ void Model_Document::initData(ObjectPtr theObj, TDF_Label& theLab, const int the
   theObj->setDoc(aThis);
   theObj->setData(aData);
   FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theObj);
-  if (aFeature) aFeature->initAttributes();
+  if (aFeature) {
+    setUniqueName(aFeature); // must be before "initAttributes" because duplicate part uses name
+    aFeature->initAttributes();
+  }
 }
 
 void Model_Document::synchronizeFeatures(const bool theMarkUpdated)
 {
   boost::shared_ptr<ModelAPI_Document> aThis = 
     Model_Application::getApplication()->getDocument(myID);
-  // update all objects: iterate from the end: as they appeared in the list
-  map<string, vector<ObjectPtr> >::reverse_iterator aGroupIter = myObjs.rbegin();
-  for(; aGroupIter != myObjs.rend(); aGroupIter++) {
-    vector<ObjectPtr>::iterator anObjIter = aGroupIter->second.begin();
-    // and in parallel iterate labels of features
-    const string& aGroupName = aGroupIter->first;
-    TDF_ChildIDIterator aLabIter(groupLabel(aGroupName), TDataStd_Comment::GetID());
-    while(anObjIter != aGroupIter->second.end() || aLabIter.More()) {
-      static const int INFINITE_TAG = INT_MAX; // no label means that it exists somwhere in infinite
-      int aFeatureTag = INFINITE_TAG; 
-      if (anObjIter != aGroupIter->second.end()) { // existing tag for feature
-        boost::shared_ptr<Model_Data> aData = 
-          boost::dynamic_pointer_cast<Model_Data>((*anObjIter)->data());
-        aFeatureTag = aData->label().Tag();
+  // update all objects by checking are they of labels or not
+  std::set<FeaturePtr> aCheckedFeatures;
+  TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID());
+  for(; aLabIter.More(); aLabIter.Next()) {
+    TDF_Label aFeatureLabel = aLabIter.Value()->Label();
+    if (!myObjs.IsBound(aFeatureLabel)) { // a new feature is inserted
+      // create a feature
+      FeaturePtr aNewObj = ModelAPI_PluginManager::get()->createFeature(
+        TCollection_AsciiString(Handle(TDataStd_Comment)::DownCast(aLabIter.Value())->Get())
+        .ToCString());
+      // this must be before "setData" to redo the sketch line correctly
+      myObjs.Bind(aFeatureLabel, aNewObj);
+      aCheckedFeatures.insert(aNewObj);
+      initData(aNewObj, aFeatureLabel, TAG_FEATURE_ARGUMENTS);
+      aNewObj->execute(); // to restore results list
+
+      // event: model is updated
+      static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+      ModelAPI_EventCreator::get()->sendUpdated(aNewObj, anEvent);
+      // feature for this label is added, so go to the next label
+    } else { // nothing is changed, both iterators are incremented
+      aCheckedFeatures.insert(myObjs.Find(aFeatureLabel));
+      if (theMarkUpdated) {
+        static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+        ModelAPI_EventCreator::get()->sendUpdated(myObjs.Find(aFeatureLabel), anEvent);
       }
-      int aDSTag = INFINITE_TAG; 
-      if (aLabIter.More()) { // next label in DS is existing
-        aDSTag = aLabIter.Value()->Label().Tag();
+    }
+  }
+  // check all features are checked: if not => it was removed
+  NCollection_DataMap<TDF_Label, FeaturePtr>::Iterator aFIter(myObjs);
+  while(aFIter.More()) {
+    if (aCheckedFeatures.find(aFIter.Value()) == aCheckedFeatures.end()) {
+      FeaturePtr aFeature = aFIter.Value();
+      TDF_Label aLab = aFIter.Key();
+      aFIter.Next();
+      myObjs.UnBind(aLab);
+      // event: model is updated
+      if (aFeature->isInHistory()) {
+        ModelAPI_EventCreator::get()->sendDeleted(aThis, ModelAPI_Feature::group());
       }
-      if (aDSTag > aFeatureTag) { // feature is removed
-        ObjectPtr anObj = *anObjIter;
-        anObjIter = aGroupIter->second.erase(anObjIter);
-        // event: model is updated
-        if (anObj->isInHistory()) {
-          ModelAPI_EventCreator::get()->sendDeleted(aThis, aGroupName);
-        }
-        ModelAPI_EventCreator::get()->sendDeleted(aThis, aGroupName);
-      } else if (aDSTag < aFeatureTag) { // a new feature is inserted
-        // create a feature
-        TDF_Label aLab = aLabIter.Value()->Label();
-        ObjectPtr aNewObj = ModelAPI_PluginManager::get()->createFeature(
-          TCollection_AsciiString(Handle(TDataStd_Comment)::DownCast(aLabIter.Value())->Get())
-          .ToCString());
-        // this must be before "setData" to redo the sketch line correctly
-        if (anObjIter == aGroupIter->second.end()) {
-          aGroupIter->second.push_back(aNewObj);
-          anObjIter = aGroupIter->second.end();
-        } else {
-          anObjIter++;
-          aGroupIter->second.insert(anObjIter, aNewObj);
-        }
-        initData(aNewObj, aLab, TAG_FEATURE_ARGUMENTS);
-
-        // event: model is updated
-        static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
-        ModelAPI_EventCreator::get()->sendUpdated(aNewObj, anEvent);
-        // feature for this label is added, so go to the next label
-        aLabIter.Next();
-      } else { // nothing is changed, both iterators are incremented
-        if (theMarkUpdated) {
-          static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-          ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, anEvent);
-        }
-        anObjIter++;
-        aLabIter.Next();
+      // results of this feature must be redisplayed (hided)
+      static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+      const std::list<boost::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+      std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
+      for(; aRIter != aResults.cend(); aRIter++) {
+        boost::shared_ptr<ModelAPI_Result> aRes = *aRIter;
+        aRes->setData(boost::shared_ptr<ModelAPI_Data>()); // deleted flag
+        ModelAPI_EventCreator::get()->sendUpdated(aRes, EVENT_DISP);
+        ModelAPI_EventCreator::get()->sendDeleted(aThis, aRes->groupName());
       }
-    }
+    } else aFIter.Next();
   }
+
   // after all updates, sends a message that groups of features were created or updated
   boost::static_pointer_cast<Model_PluginManager>(Model_PluginManager::get())->
     setCheckTransactions(false);
@@ -670,8 +676,84 @@ void Model_Document::synchronizeFeatures(const bool theMarkUpdated)
     setCheckTransactions(true);
 }
 
-boost::shared_ptr<ModelAPI_ResultConstruction> createConstruction()
+void Model_Document::storeResult(boost::shared_ptr<ModelAPI_Data> theFeatureData,
+  boost::shared_ptr<ModelAPI_Result> theResult, const int theResultIndex)
+{
+  boost::shared_ptr<ModelAPI_Document> aThis = 
+    Model_Application::getApplication()->getDocument(myID);
+  theResult->setDoc(aThis);
+  initData(theResult, boost::dynamic_pointer_cast<Model_Data>(theFeatureData)->label().
+    Father().FindChild(TAG_FEATURE_RESULTS).FindChild(theResultIndex + 1), TAG_FEATURE_ARGUMENTS);
+  if (theResult->data()->name().empty()) { // if was not initialized, generate event and set a name
+    theResult->data()->setName(theFeatureData->name());
+  }
+}
+
+boost::shared_ptr<ModelAPI_ResultConstruction> Model_Document::createConstruction(
+  const boost::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex)
 {
-  boost::shared_ptr<ModelAPI_ResultConstruction> aResult(new Model_ResultConstruction());
+  ObjectPtr anOldObject = object(boost::dynamic_pointer_cast<Model_Data>(theFeatureData)->
+    label().Father().FindChild(TAG_FEATURE_RESULTS).FindChild(theIndex + 1));
+  boost::shared_ptr<ModelAPI_ResultConstruction> aResult;
+  if (anOldObject) {
+    aResult = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(anOldObject);
+  }
+  if (!aResult) {
+    aResult = boost::shared_ptr<ModelAPI_ResultConstruction>(new Model_ResultConstruction);
+    storeResult(theFeatureData, aResult);
+  }
+  return aResult;
+}
+
+boost::shared_ptr<ModelAPI_ResultBody> Model_Document::createBody(
+  const boost::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex)
+{
+  ObjectPtr anOldObject = object(boost::dynamic_pointer_cast<Model_Data>(theFeatureData)->
+    label().Father().FindChild(TAG_FEATURE_RESULTS).FindChild(theIndex + 1));
+  boost::shared_ptr<ModelAPI_ResultBody> aResult;
+  if (anOldObject) {
+    aResult = boost::dynamic_pointer_cast<ModelAPI_ResultBody>(anOldObject);
+  }
+  if (!aResult) {
+    aResult = boost::shared_ptr<ModelAPI_ResultBody>(new Model_ResultBody);
+    storeResult(theFeatureData, aResult);
+  }
   return aResult;
 }
+
+boost::shared_ptr<ModelAPI_ResultPart> Model_Document::createPart(
+  const boost::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex)
+{
+  ObjectPtr anOldObject = object(boost::dynamic_pointer_cast<Model_Data>(theFeatureData)->
+    label().Father().FindChild(TAG_FEATURE_RESULTS).FindChild(theIndex + 1));
+  boost::shared_ptr<ModelAPI_ResultPart> aResult;
+  if (anOldObject) {
+    aResult = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(anOldObject);
+  }
+  if (!aResult) {
+    aResult = boost::shared_ptr<ModelAPI_ResultPart>(new Model_ResultPart);
+    storeResult(theFeatureData, aResult);
+  }
+  return aResult;
+}
+
+boost::shared_ptr<ModelAPI_Feature> Model_Document::feature(
+  const boost::shared_ptr<ModelAPI_Result>& theResult)
+{
+  boost::shared_ptr<Model_Data> aData = boost::dynamic_pointer_cast<Model_Data>(theResult->data());
+  if (aData) {
+    TDF_Label aFeatureLab = aData->label().Father().Father().Father();
+    return feature(aFeatureLab);
+  }
+  return FeaturePtr();
+}
+
+Standard_Integer HashCode(const TDF_Label& theLab,const Standard_Integer theUpper)
+{
+  return TDF_LabelMapHasher::HashCode(theLab, theUpper);
+
+}
+Standard_Boolean IsEqual(const TDF_Label& theLab1,const TDF_Label& theLab2)
+{
+  return TDF_LabelMapHasher::IsEqual(theLab1, theLab2);
+}