X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PartDataModel.cpp;h=c7f1b81a2e26fc70fc5a2a001ef5b915295b6e98;hb=d29ed3f3f7c0e119d2917b2d4120aa7b473220f4;hp=ff0f8aad8af53b726dc0f37bec961e3692659e87;hpb=6005e5387e0c1de7c7dbb87a6a780d107bb88848;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_PartDataModel.cpp b/src/XGUI/XGUI_PartDataModel.cpp
index ff0f8aad8..c7f1b81a2 100644
--- a/src/XGUI/XGUI_PartDataModel.cpp
+++ b/src/XGUI/XGUI_PartDataModel.cpp
@@ -1,83 +1,99 @@
 #include "XGUI_PartDataModel.h"
 #include "XGUI_Workshop.h"
 
-#include <ModelAPI_PluginManager.h>
+#include <ModelAPI_Session.h>
 #include <ModelAPI_Document.h>
 #include <ModelAPI_Feature.h>
+#include <ModelAPI_Result.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_Object.h>
+#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultParameters.h>
+#include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultGroup.h>
 
 #include <QIcon>
 #include <QBrush>
 
-
-//FeaturePtr featureObj(const FeaturePtr& theFeature)
+//ObjectPtr featureObj(const ObjectPtr& theFeature)
 //{
-//  ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(theFeature);
+//  ObjectPtr aObject = std::dynamic_pointer_cast<ModelAPI_Object>(theFeature);
 //  if (aObject)
 //    return aObject->featureRef();
 //  return theFeature;
 //}
 
-
-XGUI_TopDataModel::XGUI_TopDataModel(const DocumentPtr& theDocument, QObject* theParent)
-  : XGUI_FeaturesModel(theDocument, theParent)
+XGUI_TopDataModel::XGUI_TopDataModel(QObject* theParent)
+    : XGUI_FeaturesModel(theParent)
 {
 }
-  
+
 XGUI_TopDataModel::~XGUI_TopDataModel()
 {
 }
 
-
 QVariant XGUI_TopDataModel::data(const QModelIndex& theIndex, int theRole) const
 {
   switch (theRole) {
-  case Qt::DisplayRole:
-    // return a name
-    switch (theIndex.internalId()) {
-    case ParamsFolder:
-      return tr("Parameters") + QString(" (%1)").arg(rowCount(theIndex));
-    case ParamObject:
-      {
-        FeaturePtr aFeature = myDocument->feature(PARAMETERS_GROUP, theIndex.row(), true);
-        if (aFeature)
-          return aFeature->data()->getName().c_str();
-      } 
-    case ConstructFolder:
-        return tr("Constructions") + QString(" (%1)").arg(rowCount(theIndex));
-    case ConstructObject:
-      {
-        FeaturePtr aFeature = myDocument->feature(CONSTRUCTIONS_GROUP, theIndex.row(), true);
-        if (aFeature)
-          return aFeature->data()->getName().c_str();
+    case Qt::DisplayRole:
+      // return a name
+      switch (theIndex.internalId()) {
+        case ParamsFolder:
+          return tr("Parameters") + QString(" (%1)").arg(rowCount(theIndex));
+        case ParamObject: {
+          DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+          ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultParameters::group(), theIndex.row());
+          if (aObject)
+            return aObject->data()->name().c_str();
+        }
+          break;
+        case ConstructFolder:
+          return tr("Constructions") + QString(" (%1)").arg(rowCount(theIndex));
+        case ConstructObject: {
+          DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+          ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultConstruction::group(),
+                                               theIndex.row());
+          if (aObject)
+            return aObject->data()->name().c_str();
+        }
+          break;
+        //case GroupsFolder:
+        //  return tr("Groups") + QString(" (%1)").arg(rowCount(theIndex));
+        //case GroupObject: {
+        //  DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+        //  ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultGroup::group(),
+        //                                       theIndex.row());
+        //  if (aObject)
+        //    return aObject->data()->name().c_str();
+        //}
+        //  break;
       }
-    }
-    break;
+      break;
 
-  case Qt::DecorationRole:
-    // return an Icon
-    switch (theIndex.internalId()) {
-    case ParamsFolder:
-      return QIcon(":pictures/params_folder.png");
-    case ConstructFolder:
-      return QIcon(":pictures/constr_folder.png");
-    case ConstructObject:
+    case Qt::DecorationRole:
       {
-        FeaturePtr aFeature = myDocument->feature(CONSTRUCTIONS_GROUP, theIndex.row(), true);
-        if (aFeature)
-          return QIcon(XGUI_Workshop::featureIcon(aFeature->getKind()));
+      // return an Icon
+      switch (theIndex.internalId()) {
+        case ParamsFolder:
+          return QIcon(":pictures/params_folder.png");
+        case ConstructFolder:
+          return QIcon(":pictures/constr_folder.png");
+        case ConstructObject:
+          return QIcon(":pictures/constr_object.png");
+        //case GroupsFolder:
+        //  return QIcon(":pictures/constr_folder.png");
+        }
       }
-    }
-    break;
-
-  case Qt::ToolTipRole:
-    // return Tooltip
-    break;
-  case Qt::ForegroundRole:
-    return QBrush(myItemsColor);
-    break;
+      break;
+
+    case Qt::ToolTipRole:
+      // return Tooltip
+      break;
+    case Qt::ForegroundRole:
+      return QBrush(myItemsColor);
+      break;
   }
   return QVariant();
 }
@@ -89,14 +105,18 @@ QVariant XGUI_TopDataModel::headerData(int section, Qt::Orientation orientation,
 
 int XGUI_TopDataModel::rowCount(const QModelIndex& theParent) const
 {
-  if (!theParent.isValid()) 
-    return 2;
+  if (!theParent.isValid())
+    return 2;  // In case of groups using it has to be +1
 
+  DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
   if (theParent.internalId() == ParamsFolder)
-    return myDocument->size(PARAMETERS_GROUP);
+    return aRootDoc->size(ModelAPI_ResultParameters::group());
 
   if (theParent.internalId() == ConstructFolder)
-    return myDocument->size(CONSTRUCTIONS_GROUP);
+    return aRootDoc->size(ModelAPI_ResultConstruction::group());
+
+  //if (theParent.internalId() == GroupsFolder)
+  //  return aRootDoc->size(ModelAPI_ResultGroup::group());
 
   return 0;
 }
@@ -110,10 +130,12 @@ QModelIndex XGUI_TopDataModel::index(int theRow, int theColumn, const QModelInde
 {
   if (!theParent.isValid()) {
     switch (theRow) {
-    case 0:
-      return createIndex(theRow, theColumn, (qint32) ParamsFolder);
-    case 1:
-      return createIndex(theRow, theColumn, (qint32) ConstructFolder);
+      case 0:
+        return createIndex(theRow, theColumn, (qint32) ParamsFolder);
+      case 1:
+        return createIndex(theRow, theColumn, (qint32) ConstructFolder);
+      //case 2:
+      //  return createIndex(theRow, theColumn, (qint32) GroupsFolder);
     }
   } else {
     if (theParent.internalId() == ParamsFolder)
@@ -121,21 +143,27 @@ QModelIndex XGUI_TopDataModel::index(int theRow, int theColumn, const QModelInde
 
     if (theParent.internalId() == ConstructFolder)
       return createIndex(theRow, theColumn, (qint32) ConstructObject);
+
+    //if (theParent.internalId() == GroupsFolder)
+    //  return createIndex(theRow, theColumn, (qint32) GroupObject);
   }
   return QModelIndex();
 }
 
 QModelIndex XGUI_TopDataModel::parent(const QModelIndex& theIndex) const
 {
-  int aId = (int)theIndex.internalId();
+  int aId = (int) theIndex.internalId();
   switch (aId) {
-  case ParamsFolder:
-  case ConstructFolder:
-    return QModelIndex();
-  case ParamObject:
-    return createIndex(0, 0, (qint32) ParamsFolder);
-  case ConstructObject:
-    return createIndex(1, 0, (qint32) ConstructFolder);
+    case ParamsFolder:
+    case ConstructFolder:
+    //case GroupsFolder:
+      return QModelIndex();
+    case ParamObject:
+      return createIndex(0, 0, (qint32) ParamsFolder);
+    case ConstructObject:
+      return createIndex(1, 0, (qint32) ConstructFolder);
+    //case GroupObject:
+    //  return createIndex(2, 0, (qint32) GroupsFolder);
   }
   return QModelIndex();
 }
@@ -145,51 +173,78 @@ bool XGUI_TopDataModel::hasChildren(const QModelIndex& theParent) const
   return rowCount(theParent) > 0;
 }
 
-FeaturePtr XGUI_TopDataModel::feature(const QModelIndex& theIndex) const
+ObjectPtr XGUI_TopDataModel::object(const QModelIndex& theIndex) const
 {
   switch (theIndex.internalId()) {
-  case ParamsFolder:
-  case ConstructFolder:
-    return FeaturePtr();
-  case ParamObject:
-    return myDocument->feature(PARAMETERS_GROUP, theIndex.row(), true);
-  case ConstructObject:
-    return myDocument->feature(CONSTRUCTIONS_GROUP, theIndex.row(), true);
+    case ParamsFolder:
+    case ConstructFolder:
+      return ObjectPtr();
+    case ParamObject: {
+      DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+      return aRootDoc->object(ModelAPI_ResultParameters::group(), theIndex.row());
+    }
+    case ConstructObject: {
+      DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+      return aRootDoc->object(ModelAPI_ResultConstruction::group(), theIndex.row());
+    }
+    //case GroupObject: {
+    //  DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+    //  return aRootDoc->object(ModelAPI_ResultGroup::group(), theIndex.row());
+    //}
   }
-  return FeaturePtr();
+  return ObjectPtr();
 }
 
-
-QModelIndex XGUI_TopDataModel::findParent(const FeaturePtr& theFeature) const
+QModelIndex XGUI_TopDataModel::findParent(const ObjectPtr& theObject) const
 {
-  QString aGroup(theFeature->getGroup().c_str());
-
-  if (theFeature->getGroup().compare(PARAMETERS_GROUP) == 0)
-    return createIndex(0, 0, (qint32) ParamsFolder);
-  if (theFeature->getGroup().compare(CONSTRUCTIONS_GROUP) == 0)
-    return createIndex(1, 0, (qint32) ConstructFolder);
-  return QModelIndex();
+  return findGroup(theObject->groupName().c_str());
 }
 
 QModelIndex XGUI_TopDataModel::findGroup(const std::string& theGroup) const
 {
-  if (theGroup.compare(PARAMETERS_GROUP) == 0)
+  if (theGroup == ModelAPI_ResultParameters::group())
     return createIndex(0, 0, (qint32) ParamsFolder);
-  if (theGroup.compare(CONSTRUCTIONS_GROUP) == 0)
+  if (theGroup == ModelAPI_ResultConstruction::group())
     return createIndex(1, 0, (qint32) ConstructFolder);
+  //if (theGroup == ModelAPI_ResultGroup::group())
+  //  return createIndex(2, 0, (qint32) ConstructFolder);
   return QModelIndex();
 }
 
+QModelIndex XGUI_TopDataModel::objectIndex(const ObjectPtr& theObject) const
+{
+  QModelIndex aIndex;
+  if (theObject) {
+    DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+    std::string aGroup = theObject->groupName();
+    int aNb = aRootDoc->size(aGroup);
+    int aRow = -1;
+    for (int i = 0; i < aNb; i++) {
+      if (aRootDoc->object(aGroup, i) == theObject) {
+        aRow = i;
+        break;
+      }
+    }
+    if (aRow != -1) {
+      if (aGroup == ModelAPI_ResultParameters::group())
+        return createIndex(aRow, 0, (qint32) ParamObject);
+      if (aGroup == ModelAPI_ResultConstruction::group())
+        return createIndex(aRow, 0, (qint32) ConstructObject);
+      //if (aGroup == ModelAPI_ResultGroup::group())
+      //  return createIndex(aRow, 0, (qint32) GroupObject);
+    }
+  }
+  return aIndex;
+}
 
 //******************************************************************
 //******************************************************************
 //******************************************************************
-XGUI_PartDataModel::XGUI_PartDataModel(const DocumentPtr& theDocument, QObject* theParent)
-  : XGUI_PartModel(theDocument, theParent)
+XGUI_PartDataModel::XGUI_PartDataModel(QObject* theParent)
+    : XGUI_PartModel(theParent)
 {
 }
 
-
 XGUI_PartDataModel::~XGUI_PartDataModel()
 {
 }
@@ -197,71 +252,92 @@ XGUI_PartDataModel::~XGUI_PartDataModel()
 QVariant XGUI_PartDataModel::data(const QModelIndex& theIndex, int theRole) const
 {
   switch (theRole) {
-  case Qt::DisplayRole:
-    // return a name
-    switch (theIndex.internalId()) {
-    case MyRoot:
-      {
-        FeaturePtr aFeature = myDocument->feature(PARTS_GROUP, myId, true);
-        if (aFeature)
-          return aFeature->data()->getName().c_str();
-      }
-    case ParamsFolder:
-      return tr("Parameters") + QString(" (%1)").arg(rowCount(theIndex));
-    case ConstructFolder:
-      return tr("Constructions") + QString(" (%1)").arg(rowCount(theIndex));
-    case BodiesFolder:
-      return tr("Bodies") + QString(" (%1)").arg(rowCount(theIndex));
-    case ParamObject:
-      {
-        FeaturePtr aFeature = featureDocument()->feature(PARAMETERS_GROUP, theIndex.row(), true);
-        if (aFeature)
-          return aFeature->data()->getName().c_str();
+    case Qt::DisplayRole:
+      // return a name
+      switch (theIndex.internalId()) {
+        case MyRoot: {
+          DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+          ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), myId);
+          if (aObject)
+            return std::dynamic_pointer_cast<ModelAPI_Object>(aObject)->data()->name().c_str();
+        }
+        case ParamsFolder:
+          return tr("Parameters") + QString(" (%1)").arg(rowCount(theIndex));
+        case ConstructFolder:
+          return tr("Constructions") + QString(" (%1)").arg(rowCount(theIndex));
+        case BodiesFolder:
+          return tr("Bodies") + QString(" (%1)").arg(rowCount(theIndex));
+        case GroupsFolder:
+          return tr("Groups") + QString(" (%1)").arg(rowCount(theIndex));
+        case ParamObject: {
+          ObjectPtr aObject = partDocument()->object(ModelAPI_ResultParameters::group(),
+                                                     theIndex.row());
+          if (aObject)
+            return std::dynamic_pointer_cast<ModelAPI_Object>(aObject)->data()->name().c_str();
+        }
+          break;
+        case ConstructObject: {
+          ObjectPtr aObject = partDocument()->object(ModelAPI_ResultConstruction::group(),
+                                                     theIndex.row());
+          if (aObject)
+            return std::dynamic_pointer_cast<ModelAPI_Object>(aObject)->data()->name().c_str();
+        }
+          break;
+        case BodiesObject: {
+          ObjectPtr aObject = partDocument()->object(ModelAPI_ResultBody::group(), theIndex.row());
+          if (aObject)
+            return aObject->data()->name().c_str();
+        }
+          break;
+        case GroupObject: {
+          ObjectPtr aObject = partDocument()->object(ModelAPI_ResultGroup::group(), theIndex.row());
+          if (aObject)
+            return aObject->data()->name().c_str();
+        }
+        case HistoryObject: {
+          ObjectPtr aObject = partDocument()->object(ModelAPI_Feature::group(), theIndex.row() - 4);
+          if (aObject)
+            return aObject->data()->name().c_str();
+        }
       }
-    case ConstructObject:
-      {
-        FeaturePtr aFeature = featureDocument()->feature(CONSTRUCTIONS_GROUP, theIndex.row(), true);
-        if (aFeature)
-          return aFeature->data()->getName().c_str();
+      break;
+    case Qt::DecorationRole:
+      // return an Icon
+      switch (theIndex.internalId()) {
+        case MyRoot:
+          return QIcon(":pictures/part_ico.png");
+        case ParamsFolder:
+          return QIcon(":pictures/params_folder.png");
+        case ConstructFolder:
+        case BodiesFolder:
+          return QIcon(":pictures/constr_folder.png");
+        case GroupsFolder:
+          return QIcon(":pictures/constr_folder.png");
+        case ConstructObject:
+        case GroupObject:
+        case BodiesObject: {
+          std::string aGroup = theIndex.internalId() == ConstructObject ?
+            ModelAPI_ResultConstruction::group() : ModelAPI_ResultBody::group();
+          ObjectPtr anObject = partDocument()->object(aGroup, theIndex.row());
+          if (anObject && anObject->data() && anObject->data()->mustBeUpdated()) {
+            return QIcon(":pictures/constr_object_modified.png");
+          }
+          return QIcon(":pictures/constr_object.png");
+        }
+        case HistoryObject: {
+          ObjectPtr aObject = partDocument()->object(ModelAPI_Feature::group(), theIndex.row() - 4);
+          FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
+          if (aFeature)
+            return QIcon(XGUI_Workshop::featureIcon(aFeature->getKind()));
+        }
       }
-    case HistoryObject:
-      {
-        FeaturePtr aFeature = featureDocument()->feature(FEATURES_GROUP, theIndex.row() - 3, true);
-        if (aFeature)
-          return aFeature->data()->getName().c_str();
-      }
-    }
-    break;
-  case Qt::DecorationRole:
-    // return an Icon
-    switch (theIndex.internalId()) {
-    case MyRoot:
-      return QIcon(":pictures/part_ico.png");
-    case ParamsFolder:
-      return QIcon(":pictures/params_folder.png");
-    case ConstructFolder:
-    case BodiesFolder:
-      return QIcon(":pictures/constr_folder.png");
-    case ConstructObject:
-      {
-        FeaturePtr aFeature = featureDocument()->feature(CONSTRUCTIONS_GROUP, theIndex.row(), true);
-        if (aFeature)
-          return QIcon(XGUI_Workshop::featureIcon(aFeature->getKind()));
-      }
-    case HistoryObject:
-      {
-        FeaturePtr aFeature = featureDocument()->feature(FEATURES_GROUP, theIndex.row() - 3, true);
-        if (aFeature)
-          return QIcon(XGUI_Workshop::featureIcon(aFeature->getKind()));
-      }
-    }
-   break;
-  case Qt::ToolTipRole:
-    // return Tooltip
-    break;
-  case Qt::ForegroundRole:
-    return QBrush(myItemsColor);
-    break;
+      break;
+    case Qt::ToolTipRole:
+      // return Tooltip
+      break;
+    case Qt::ForegroundRole:
+      return QBrush(myItemsColor);
+      break;
   }
   return QVariant();
 }
@@ -273,20 +349,30 @@ QVariant XGUI_PartDataModel::headerData(int section, Qt::Orientation orientation
 
 int XGUI_PartDataModel::rowCount(const QModelIndex& parent) const
 {
-  if (!parent.isValid()) 
-    if (myDocument->feature(PARTS_GROUP, myId, true))
+  if (!parent.isValid()) {
+    DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+    if (aRootDoc->object(ModelAPI_ResultPart::group(), myId))
       return 1;
-    else 
+    else
       return 0;
+  }
   switch (parent.internalId()) {
-  case MyRoot:
-    return 3 + featureDocument()->size(FEATURES_GROUP);
-  case ParamsFolder:
-    return featureDocument()->size(PARAMETERS_GROUP);
-  case ConstructFolder:
-    return featureDocument()->size(CONSTRUCTIONS_GROUP);
-  case BodiesFolder:
-    return 0;
+    case MyRoot:
+      {
+        DocumentPtr aDoc = partDocument();
+        if (aDoc)
+          return 4 + aDoc->size(ModelAPI_Feature::group());
+        else 
+          return 0;
+      }
+    case ParamsFolder:
+      return partDocument()->size(ModelAPI_ResultParameters::group());
+    case ConstructFolder:
+      return partDocument()->size(ModelAPI_ResultConstruction::group());
+    case BodiesFolder:
+      return partDocument()->size(ModelAPI_ResultBody::group());
+    case GroupsFolder:
+      return partDocument()->size(ModelAPI_ResultGroup::group());
   }
   return 0;
 }
@@ -301,25 +387,29 @@ QModelIndex XGUI_PartDataModel::index(int theRow, int theColumn, const QModelInd
   if (!theParent.isValid())
     return createIndex(theRow, 0, (qint32) MyRoot);
 
-  int aId = (int)theParent.internalId();
+  int aId = (int) theParent.internalId();
   switch (aId) {
-  case MyRoot:
-    switch (theRow) {
-    case 0:
-      return createIndex(0, 0, (qint32) ParamsFolder);
-    case 1:
-      return createIndex(1, 0, (qint32) ConstructFolder);
-    case 2:
-      return createIndex(2, 0, (qint32) BodiesFolder);
-    default:
-      return createIndex(theRow, theColumn, (qint32) HistoryObject);
-    }
-  case ParamsFolder:
-    return createIndex(theRow, 0, (qint32) ParamObject);
-  case ConstructFolder:
-    return createIndex(theRow, 0, (qint32) ConstructObject);
-  case BodiesFolder:
-    return createIndex(theRow, 0, (qint32) BodieswObject);
+    case MyRoot:
+      switch (theRow) {
+        case 0:
+          return createIndex(theRow, 0, (qint32) ParamsFolder);
+        case 1:
+          return createIndex(theRow, 0, (qint32) ConstructFolder);
+        case 2:
+          return createIndex(theRow, 0, (qint32) BodiesFolder);
+        case 3:
+          return createIndex(theRow, 0, (qint32) GroupsFolder);
+        default:
+          return createIndex(theRow, theColumn, (qint32) HistoryObject);
+      }
+    case ParamsFolder:
+      return createIndex(theRow, 0, (qint32) ParamObject);
+    case ConstructFolder:
+      return createIndex(theRow, 0, (qint32) ConstructObject);
+    case BodiesFolder:
+      return createIndex(theRow, 0, (qint32) BodiesObject);
+    case GroupsFolder:
+      return createIndex(theRow, 0, (qint32) GroupObject);
   }
   return QModelIndex();
 }
@@ -327,17 +417,23 @@ QModelIndex XGUI_PartDataModel::index(int theRow, int theColumn, const QModelInd
 QModelIndex XGUI_PartDataModel::parent(const QModelIndex& theIndex) const
 {
   switch (theIndex.internalId()) {
-  case MyRoot:
-    return QModelIndex();
-  case ParamsFolder:
-  case ConstructFolder:
-  case BodiesFolder:
-  case HistoryObject:
-    return createIndex(0, 0, (qint32) MyRoot);
-  case ParamObject:
-    return createIndex(0, 0, (qint32) ParamsFolder);
-  case ConstructObject:
-    return createIndex(1, 0, (qint32) ConstructFolder);
+    case MyRoot:
+      return QModelIndex();
+    case ParamsFolder:
+    case ConstructFolder:
+    case BodiesFolder:
+    case GroupsFolder:
+    case HistoryObject:
+      return createIndex(0, 0, (qint32) MyRoot);
+
+    case ParamObject:
+      return createIndex(0, 0, (qint32) ParamsFolder);
+    case ConstructObject:
+      return createIndex(1, 0, (qint32) ConstructFolder);
+    case BodiesObject:
+      return createIndex(2, 0, (qint32) BodiesFolder);
+    case GroupObject:
+      return createIndex(3, 0, (qint32) GroupsFolder);
   }
   return QModelIndex();
 }
@@ -347,59 +443,102 @@ bool XGUI_PartDataModel::hasChildren(const QModelIndex& theParent) const
   return rowCount(theParent) > 0;
 }
 
-
-DocumentPtr XGUI_PartDataModel::featureDocument() const
+DocumentPtr XGUI_PartDataModel::partDocument() const
 {
-  FeaturePtr aFeature = myDocument->feature(PARTS_GROUP, myId, true);
-  return aFeature->data()->docRef("PartDocument")->value();
+  DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+  ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), myId);
+  ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
+  if (aPart)
+    return aPart->partDoc();
+  return DocumentPtr(); // null if not found
 }
- 
-FeaturePtr XGUI_PartDataModel::feature(const QModelIndex& theIndex) const
+
+ObjectPtr XGUI_PartDataModel::object(const QModelIndex& theIndex) const
 {
   switch (theIndex.internalId()) {
-  case MyRoot:
-    if (theIndex.row() < 3) {
-      return myDocument->feature(PARTS_GROUP, myId, true);
-    } else 
-      return featureDocument()->feature(FEATURES_GROUP, theIndex.row() - 3, true);
-  case ParamsFolder:
-  case ConstructFolder:
-    return FeaturePtr();
-  case ParamObject:
-    return featureDocument()->feature(PARAMETERS_GROUP, theIndex.row(), true);
-  case ConstructObject:
-    return featureDocument()->feature(CONSTRUCTIONS_GROUP, theIndex.row(), true);
+    case MyRoot: {
+      DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+      return aRootDoc->object(ModelAPI_ResultPart::group(), myId);
+    }
+    case ParamsFolder:
+    case ConstructFolder:
+    case BodiesFolder:
+    case GroupsFolder:
+      return ObjectPtr();
+
+    case ParamObject:
+      return partDocument()->object(ModelAPI_ResultParameters::group(), theIndex.row());
+    case ConstructObject:
+      return partDocument()->object(ModelAPI_ResultConstruction::group(), theIndex.row());
+    case BodiesObject:
+      return partDocument()->object(ModelAPI_ResultBody::group(), theIndex.row());
+    case GroupObject:
+      return partDocument()->object(ModelAPI_ResultGroup::group(), theIndex.row());
+    case HistoryObject:
+      return partDocument()->object(ModelAPI_Feature::group(), theIndex.row() - 4);
   }
-  return FeaturePtr();
+  return ObjectPtr();
 }
 
 bool XGUI_PartDataModel::hasDocument(const DocumentPtr& theDoc) const
 {
-  return (featureDocument() == theDoc);
+  return (partDocument() == theDoc);
 }
 
-
-QModelIndex XGUI_PartDataModel::findParent(const FeaturePtr& theFeature) const
+QModelIndex XGUI_PartDataModel::findParent(const ObjectPtr& theObject) const
 {
-  QString aGroup(theFeature->getGroup().c_str());
-
-  if (theFeature->getGroup().compare(PARAMETERS_GROUP) == 0)
-    return createIndex(0, 0, (qint32) ParamsFolder);
-  if (theFeature->getGroup().compare(CONSTRUCTIONS_GROUP) == 0)
-    return createIndex(1, 0, (qint32) ConstructFolder);
-  return QModelIndex();
+  return findGroup(theObject->groupName().c_str());
 }
 
 QModelIndex XGUI_PartDataModel::findGroup(const std::string& theGroup) const
 {
-  if (theGroup.compare(PARAMETERS_GROUP) == 0)
+  if (theGroup.compare(ModelAPI_ResultParameters::group()) == 0)
     return createIndex(0, 0, (qint32) ParamsFolder);
-  if (theGroup.compare(CONSTRUCTIONS_GROUP) == 0)
+  if (theGroup.compare(ModelAPI_ResultConstruction::group()) == 0)
     return createIndex(1, 0, (qint32) ConstructFolder);
+  if (theGroup.compare(ModelAPI_ResultBody::group()) == 0)
+    return createIndex(2, 0, (qint32) BodiesFolder);
+  if (theGroup.compare(ModelAPI_ResultGroup::group()) == 0)
+    return createIndex(3, 0, (qint32) GroupsFolder);
   return QModelIndex();
 }
 
-FeaturePtr XGUI_PartDataModel::part() const
+ResultPartPtr XGUI_PartDataModel::part() const
 {
-  return myDocument->feature(PARTS_GROUP, myId, true);
-}
\ No newline at end of file
+  DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+  ObjectPtr aObj = aRootDoc->object(ModelAPI_ResultPart::group(), myId);
+  return std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+}
+
+QModelIndex XGUI_PartDataModel::objectIndex(const ObjectPtr& theObject) const
+{
+  QModelIndex aIndex;
+  if (theObject) {
+    if (part() == theObject)
+      return aIndex;
+
+    std::string aGroup = theObject->groupName();
+    DocumentPtr aDoc = theObject->document();
+    int aNb = aDoc->size(aGroup);
+    int aRow = -1;
+    for (int i = 0; i < aNb; i++) {
+      if (aDoc->object(aGroup, i) == theObject) {
+        aRow = i;
+        break;
+      }
+    }
+    if (aRow == -1)
+      return aIndex;
+    if (aGroup == ModelAPI_ResultParameters::group())
+      return createIndex(aRow, 0, (qint32) ParamObject);
+    else if (aGroup == ModelAPI_ResultConstruction::group())
+      return createIndex(aRow, 0, (qint32) ConstructObject);
+    else if (aGroup == ModelAPI_ResultBody::group())
+      return createIndex(aRow, 0, (qint32) BodiesObject);
+    else if (aGroup == ModelAPI_ResultGroup::group())
+      return createIndex(aRow, 0, (qint32) GroupObject);
+    else
+      return createIndex(aRow + 4, 0, (qint32) HistoryObject);
+  }
+  return aIndex;
+}