X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_DataModel.cpp;h=157c9ed767b82bc8c474735eb6ffee0572928f1d;hb=b070f5d30325537aa8cf883a55f8d3315115c384;hp=873f394a18c06cc168c662eb21ccc04309e8a938;hpb=21e765709ef191519dc14463ce5ce90c2d62cc04;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_DataModel.cpp b/src/XGUI/XGUI_DataModel.cpp
index 873f394a1..157c9ed76 100644
--- a/src/XGUI/XGUI_DataModel.cpp
+++ b/src/XGUI/XGUI_DataModel.cpp
@@ -14,6 +14,9 @@
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_ResultPart.h>
 #include <ModelAPI_Feature.h>
+#include <ModelAPI_CompositeFeature.h>
+#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_Tools.h>
 
 #include <Config_FeatureMessage.h>
 
@@ -23,8 +26,9 @@
 #include <QIcon>
 #include <QBrush>
 
-#define ACTIVE_COLOR QColor(0,72,140)
-#define PASSIVE_COLOR Qt::black
+#define ACTIVE_COLOR Qt::black
+//#define ACTIVE_COLOR QColor(0,72,140)
+//#define PASSIVE_COLOR Qt::black
 
 /// Returns ResultPart object if the given object is a Part feature
 /// Otherwise returns NULL
@@ -34,7 +38,10 @@ ResultPartPtr getPartResult(ModelAPI_Object* theObj)
   if (aFeature) {
     ResultPtr aRes = aFeature->firstResult();
     if (aRes.get() && (aRes->groupName() == ModelAPI_ResultPart::group())) {
-      return std::dynamic_pointer_cast<ModelAPI_ResultPart>(aRes);
+      ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aRes);
+      // Use only original parts, not a placement results
+      if (aPartRes == aPartRes->original())
+      return aPartRes;
     }
   }
   return ResultPartPtr();
@@ -51,13 +58,16 @@ ModelAPI_Document* getSubDocument(void* theObj)
 
 
 // Constructor *************************************************
-XGUI_DataModel::XGUI_DataModel(QObject* theParent) : QAbstractItemModel(theParent)
+XGUI_DataModel::XGUI_DataModel(QObject* theParent) : ModuleBase_IDocumentDataModel(theParent)
 {
   myXMLReader.readAll();
 
   Events_Loop* aLoop = Events_Loop::loop();
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
+  aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+  aLoop->registerListener(this, Events_Loop::eventByName(EVENT_ORDER_UPDATED));
+  aLoop->registerListener(this, Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED));
 }
 
 //******************************************************
@@ -78,6 +88,10 @@ void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
     std::string aObjType;
     for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
       ObjectPtr aObject = (*aIt);
+      // We do not show objects which not has to be shown in object browser
+      if (!aObject->isInHistory())
+        continue;
+
       aObjType = aObject->groupName();
       DocumentPtr aDoc = aObject->document();
       if (aDoc == aRootDoc) {
@@ -90,14 +104,16 @@ void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
         }
         // Insert new object
         int aRow = aRootDoc->size(aObjType) - 1;
-        if (aObjType == aRootType) {
-          insertRow(aRow + aNbFolders + 1);
-        } else {
-          int aFolderId = myXMLReader.rootFolderId(aObjType);
-          if (aFolderId != -1) {
-            insertRow(aRow, createIndex(aFolderId, 0, -1));
-          }
-        } 
+        if (aRow != -1) {
+          if (aObjType == aRootType) {
+            insertRow(aRow + aNbFolders + 1);
+          } else {
+            int aFolderId = myXMLReader.rootFolderId(aObjType);
+            if (aFolderId != -1) {
+              insertRow(aRow, createIndex(aFolderId, 0, -1));
+            }
+          } 
+        }
       } else {
         // Object created in sub-document
         QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get());
@@ -109,25 +125,28 @@ void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
               // Appears first object in folder which can not be shown empty
               insertRow(myXMLReader.subFolderId(aObjType), aDocRoot);
           }
-          int aRow = aDoc->size(aObjType) - 1;
-          int aNbSubFolders = foldersCount(aDoc.get());
-          if (aObjType == aSubType) {
-            // List of objects under document root
-            insertRow(aRow + aNbSubFolders, aDocRoot);
-          } else {
-            // List of objects under a folder
-            if (aRow != -1) {
-              int aFolderId = myXMLReader.subFolderId(aObjType);
-              if (aFolderId != -1) {
-                insertRow(aRow, createIndex(aFolderId, 0, aDoc.get()));
+          int aRow = aDoc->index(aObject);
+          if (aRow != -1) {
+            int aNbSubFolders = foldersCount(aDoc.get());
+            if (aObjType == aSubType) {
+              // List of objects under document root
+              insertRow(aRow + aNbSubFolders, aDocRoot);
+            } else {
+              // List of objects under a folder
+              if (aRow != -1) {
+                int aFolderId = folderId(aObjType, aDoc.get());
+                if (aFolderId != -1) {
+                  QModelIndex aParentFolder = createIndex(aFolderId, 0, aDoc.get());
+                  insertRow(aRow, aParentFolder);
+                  emit dataChanged(aParentFolder, aParentFolder);
+                }
               }
             }
           }
         } 
 #ifdef _DEBUG
-        else {
+        else
           Events_Error::send("Problem with Data Model definition of sub-document");
-        }
 #endif
       }
     }
@@ -169,26 +188,78 @@ void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
             removeRow(aRow + aNbSubFolders, aDocRoot);
           } else {
             // List of objects under a folder
-            int aFolderId = myXMLReader.subFolderId(aGroup);
+            int aFolderId = folderId(aGroup, aDoc.get());
             if (aFolderId != -1) {
               removeRow(aRow, createIndex(aFolderId, 0, aDoc.get()));
             }
           }
           // Check that some folders could disappear
           QStringList aNotEmptyFolders = listOfShowNotEmptyFolders(false);
+          int aSize = aDoc->size(aGroup);
           foreach (QString aNotEmptyFolder, aNotEmptyFolders) {
-            if ((aNotEmptyFolder.toStdString() == aGroup) && (aDoc->size(aGroup) == 1))
+            if ((aNotEmptyFolder.toStdString() == aGroup) && (aSize == 0))
               // Appears first object in folder which can not be shown empty
               removeRow(myXMLReader.subFolderId(aGroup), aDocRoot);
           }
         } 
 #ifdef _DEBUG
-        else {
+        else
           Events_Error::send("Problem with Data Model definition of sub-document");
-        }
 #endif
       }
     }
+  } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
+    std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
+        std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+    std::set<ObjectPtr> aObjects = aUpdMsg->objects();
+
+    std::set<ObjectPtr>::const_iterator aIt;
+    std::string aObjType;
+    for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+      ObjectPtr aObject = (*aIt);
+      QModelIndex aIndex = objectIndex(aObject);
+      if (aIndex.isValid())
+        emit dataChanged(aIndex, aIndex);
+    }
+  } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_ORDER_UPDATED)) {
+    std::shared_ptr<ModelAPI_OrderUpdatedMessage> aUpdMsg =
+        std::dynamic_pointer_cast<ModelAPI_OrderUpdatedMessage>(theMessage);
+    DocumentPtr aDoc = aUpdMsg->document();
+    std::string aGroup = aUpdMsg->group();
+
+    QModelIndex aParent;
+    int aSartId = 0;
+    if (aDoc == aRootDoc) {
+      // Update a group under root
+      if (aGroup == myXMLReader.rootType()) // Update objects under root
+        aSartId = foldersCount();
+      else // Update objects in folder under root 
+        aParent = createIndex(folderId(aGroup), 0, -1);
+    } else {
+      // Update a sub-document
+      if (aGroup == myXMLReader.subType()) {
+        // Update sub-document root
+        aParent = findDocumentRootIndex(aDoc.get());
+        aSartId = foldersCount(aDoc.get());
+      } else 
+        // update folder in sub-document
+        aParent = createIndex(folderId(aGroup, aDoc.get()), 0, aDoc.get());
+    }
+    int aChildNb = rowCount(aParent);
+    // Rebuild all indexes
+    removeRows(aSartId, aChildNb - aSartId, aParent);
+    insertRows(aSartId, aChildNb - aSartId, aParent);
+  } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) {
+    DocumentPtr aDoc = ModelAPI_Session::get()->activeDocument();
+    if (aDoc != aRootDoc) {
+      QModelIndex aDocRoot = findDocumentRootIndex(aDoc.get());
+      if (aDocRoot.isValid())
+        emit dataChanged(aDocRoot, aDocRoot);
+#ifdef _DEBUG
+      else
+        Events_Error::send("Problem with Data Model definition of sub-document");
+#endif
+    }
   } 
 }
 
@@ -213,18 +284,7 @@ ObjectPtr XGUI_DataModel::object(const QModelIndex& theIndex) const
   if (getSubDocument(aObj)) // the selected index is a folder of sub-document
     return ObjectPtr();
 
-  // We can not create the ObjectPtr directly because the pointer will be deleted 
-  // with deletion of the ObjectPtr because its counter become to 0.
-  DocumentPtr aDoc = aObj->document();
-  std::string aType = aObj->groupName();
-
-  ObjectPtr aObjPtr;
-  for (int i = 0; i < aDoc->size(aType); i++) {
-    aObjPtr = aDoc->object(aType, i);
-    if (aObjPtr.get() == aObj)
-      return aObjPtr;
-  }
-  return ObjectPtr();
+  return aObj->data()->owner();
 }
 
 //******************************************************
@@ -233,9 +293,38 @@ QModelIndex XGUI_DataModel::objectIndex(const ObjectPtr theObject) const
   std::string aType = theObject->groupName();
   DocumentPtr aDoc = theObject->document();
   int aRow = aDoc->index(theObject);
-  if (aRow == -1)
-    return QModelIndex();
-
+  if (aRow == -1) {
+    // it could be a part of complex object
+    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
+    if (aFeature.get()) {
+      CompositeFeaturePtr aCompFea = ModelAPI_Tools::compositeOwner(aFeature);
+      if (aCompFea.get()) {
+        for (int i = 0; i < aCompFea->numberOfSubs(true); i++) {
+          if (aCompFea->subFeature(i, true) == theObject) {
+            aRow = i;
+            break;
+          }
+        }
+      }
+    } else {
+      ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
+      if (aResult.get()) {
+        ResultCompSolidPtr aCompRes = ModelAPI_Tools::compSolidOwner(aResult);
+        if (aCompRes.get()) {
+          for (int i = 0; i < aCompRes->numberOfSubs(true); i++) {
+            if (aCompRes->subResult(i, true) == theObject) {
+              aRow = i;
+              break;
+            }
+          }
+        }
+      }
+    }
+    if (aRow == -1)
+      return QModelIndex();
+    else 
+      return createIndex(aRow, 0, theObject.get());
+  }
   SessionPtr aSession = ModelAPI_Session::get();
   DocumentPtr aRootDoc = aSession->moduleDocument();
   if (aDoc == aRootDoc && myXMLReader.rootType() == aType) { 
@@ -271,50 +360,53 @@ QVariant XGUI_DataModel::data(const QModelIndex& theIndex, int theRole) const
       case Qt::DecorationRole:
         return QIcon(myXMLReader.rootFolderIcon(theIndexRow).c_str());
       case Qt::ForegroundRole:
-        if (aSession->activeDocument() == aRootDoc)
-          return QBrush(ACTIVE_COLOR);
-        else
-          return QBrush(PASSIVE_COLOR);
+        if ((flags(theIndex) & Qt::ItemIsEditable) == 0)
+          return QBrush(Qt::lightGray);
+        return ACTIVE_COLOR;
     }
   } else { // an object or sub-document
-    ModelAPI_Document* aSubDoc = getSubDocument(theIndex.internalPointer());
-
     if (theRole == Qt::ForegroundRole) {
-      bool aIsActive = false;
-      if (aSubDoc)
-        aIsActive = (aSession->activeDocument().get() == aSubDoc);
-      else {
-        ModelAPI_Object* aObj = (ModelAPI_Object*)theIndex.internalPointer();
-        if (aObj->isDisabled())
-          return QBrush(Qt::lightGray);
-        aIsActive = (aSession->activeDocument() == aObj->document());
-      }
-      if (aIsActive)
-        return QBrush(ACTIVE_COLOR);
-      else
-        return QBrush(PASSIVE_COLOR);
+      if ((flags(theIndex) & Qt::ItemIsEditable) == 0)
+        return QBrush(Qt::lightGray);
+      return ACTIVE_COLOR;
     }
 
+    ModelAPI_Document* aSubDoc = getSubDocument(theIndex.internalPointer());
     if (aSubDoc) { // this is a folder of sub document
+      QIntList aMissedIdx = missedFolderIndexes(aSubDoc);
+      int aRow = theIndexRow;
+      while (aMissedIdx.contains(aRow)) 
+        aRow++;
+
       switch (theRole) {
         case Qt::DisplayRole:
-          return QString(myXMLReader.subFolderName(theIndexRow).c_str()) + 
+          return QString(myXMLReader.subFolderName(aRow).c_str()) + 
             QString(" (%1)").arg(rowCount(theIndex));
         case Qt::DecorationRole:
-          return QIcon(myXMLReader.subFolderIcon(theIndexRow).c_str());
+          return QIcon(myXMLReader.subFolderIcon(aRow).c_str());
       }
     } else {
       ModelAPI_Object* aObj = (ModelAPI_Object*)theIndex.internalPointer();
       switch (theRole) {
       case Qt::DisplayRole:
-        if (aObj->groupName() == ModelAPI_ResultParameter::group()) {
-          ModelAPI_ResultParameter* aParam = dynamic_cast<ModelAPI_ResultParameter*>(aObj);
-          AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
-          QString aVal = QString::number(aValueAttribute->value());
-          QString aTitle = QString(aObj->data()->name().c_str());
-          return aTitle + " = " + aVal;
+        {
+          if (aObj->groupName() == ModelAPI_ResultParameter::group()) {
+            ModelAPI_ResultParameter* aParam = dynamic_cast<ModelAPI_ResultParameter*>(aObj);
+            AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+            QString aVal = QString::number(aValueAttribute->value());
+            QString aTitle = QString(aObj->data()->name().c_str());
+            return aTitle + " = " + aVal;
+          }
+          QString aSuffix;
+          if (aObj->groupName() == myXMLReader.subType()) {
+            ResultPartPtr aPartRes = getPartResult(aObj);
+            if (aPartRes.get()) {
+              if (aPartRes->partDoc().get() == NULL)
+                aSuffix = " (Not loaded)";
+            }
+          }
+          return aObj->data()->name().c_str() + aSuffix;
         }
-        return aObj->data()->name().c_str();
       case Qt::DecorationRole:
         return ModuleBase_IconFactory::get()->getIcon(object(theIndex));
       }
@@ -352,27 +444,41 @@ int XGUI_DataModel::rowCount(const QModelIndex& theParent) const
     // this is a folder under root
     int aParentPos = theParent.row();
     std::string aType = myXMLReader.rootFolderType(aParentPos);
-    //qDebug("### %s = %i\n", aType.c_str(), aRootDoc->size(aType));
     return aRootDoc->size(aType);
   } else {
     // It is an object which could have children
     ModelAPI_Document* aDoc = getSubDocument(theParent.internalPointer());
     if (aDoc) { 
       // a folder of sub-document
-      std::string aType = myXMLReader.subFolderType(theParent.row());
+      QIntList aMissedIdx = missedFolderIndexes(aDoc);
+      int aRow = theParent.row();
+      while (aMissedIdx.contains(aRow)) 
+        aRow++;
+      std::string aType = myXMLReader.subFolderType(aRow);
       return aDoc->size(aType);
     } else {
-      // Check for Part feature
       ModelAPI_Object* aObj = (ModelAPI_Object*)theParent.internalPointer();
+      // Check for Part feature
       ResultPartPtr aPartRes = getPartResult(aObj);
       if (aPartRes.get()) {
         DocumentPtr aSubDoc = aPartRes->partDoc();
+        if (!aSubDoc.get())
+          return 0;
+
         int aNbSubFolders = foldersCount(aSubDoc.get());
         int aNbSubItems = 0;
         std::string aSubType = myXMLReader.subType();
         if (!aSubType.empty())
           aNbSubItems = aSubDoc->size(aSubType);
         return aNbSubItems + aNbSubFolders;
+      } else {
+        // Check for composite object
+        ModelAPI_CompositeFeature* aCompFeature = dynamic_cast<ModelAPI_CompositeFeature*>(aObj);
+        if (aCompFeature) 
+          return aCompFeature->numberOfSubs(true);
+        ModelAPI_ResultCompSolid* aCompRes = dynamic_cast<ModelAPI_ResultCompSolid*>(aObj);
+        if (aCompRes) 
+          return aCompRes->numberOfSubs(true);
       }
     }
   }
@@ -392,6 +498,8 @@ QModelIndex XGUI_DataModel::index(int theRow, int theColumn, const QModelIndex &
   DocumentPtr aRootDoc = aSession->moduleDocument();
   int aNbFolders = foldersCount();
 
+  QModelIndex aIndex;
+
   if (!theParent.isValid()) {
     if (theRow < aNbFolders) // Return first level folder index
       return createIndex(theRow, theColumn, -1);
@@ -400,66 +508,75 @@ QModelIndex XGUI_DataModel::index(int theRow, int theColumn, const QModelIndex &
       int aObjId = theRow - aNbFolders;
       if (aObjId < aRootDoc->size(aType)) {
         ObjectPtr aObj = aRootDoc->object(aType, aObjId);
-        QModelIndex aIndex = objectIndex(aObj);
-        if (theColumn != 0)
-          return createIndex(aIndex.row(), theColumn, aIndex.internalPointer());
-        return aIndex;
+        aIndex = objectIndex(aObj);
       }
-      return QModelIndex();
-    }
-  }
-  int aId = theParent.internalId();
-  int aParentPos = theParent.row();
-  if (aId == -1) { // return object index inside of first level of folders
-    std::string aType = myXMLReader.rootFolderType(aParentPos);
-    if (theRow < aRootDoc->size(aType)) {
-      ObjectPtr aObj = aRootDoc->object(aType, theRow);
-      QModelIndex aIndex = objectIndex(aObj);
-      if (theColumn != 0)
-        return createIndex(aIndex.row(), theColumn, aIndex.internalPointer());
-      return aIndex;
     }
   } else {
-    // It is an object which could have children
-    ModelAPI_Document* aDoc = getSubDocument(theParent.internalPointer());
-    if (aDoc) { 
-      // It is a folder of sub-document
-      std::string aType = myXMLReader.subFolderType(aParentPos);
-      if (theRow < aDoc->size(aType)) {
-        ObjectPtr aObj = aDoc->object(aType, theRow);
-        QModelIndex aIndex = objectIndex(aObj);
-        if (theColumn != 0)
-          return createIndex(aIndex.row(), theColumn, aIndex.internalPointer());
-        return aIndex;
+    int aId = theParent.internalId();
+    int aParentPos = theParent.row();
+    if (aId == -1) { // return object index inside of first level of folders
+      std::string aType = myXMLReader.rootFolderType(aParentPos);
+      if (theRow < aRootDoc->size(aType)) {
+        ObjectPtr aObj = aRootDoc->object(aType, theRow);
+        aIndex = objectIndex(aObj);
       }
     } else {
-      ModelAPI_Object* aParentObj = (ModelAPI_Object*)theParent.internalPointer();
-
-      // Check for Part feature
-      ResultPartPtr aPartRes = getPartResult(aParentObj);
-      if (aPartRes.get()) {
-        DocumentPtr aSubDoc = aPartRes->partDoc();
-        int aNbSubFolders = foldersCount(aSubDoc.get());
-        if (theRow < aNbSubFolders) { // Create a Folder of sub-document
-          return createIndex(theRow, theColumn, aSubDoc.get());
+      // It is an object which could have children
+      ModelAPI_Document* aDoc = getSubDocument(theParent.internalPointer());
+      if (aDoc) { 
+        // It is a folder of sub-document
+        int aParentRow = aParentPos;
+        QIntList aMissedIdx = missedFolderIndexes(aDoc);
+        while (aMissedIdx.contains(aParentRow))
+          aParentRow++;
+        std::string aType = myXMLReader.subFolderType(aParentRow);
+        if (theRow < aDoc->size(aType)) {
+          ObjectPtr aObj = aDoc->object(aType, theRow);
+          aIndex = objectIndex(aObj);
+        }
+      } else {
+        ModelAPI_Object* aParentObj = (ModelAPI_Object*)theParent.internalPointer();
+
+        // Check for Part feature
+        ResultPartPtr aPartRes = getPartResult(aParentObj);
+        if (aPartRes.get()) {
+          DocumentPtr aSubDoc = aPartRes->partDoc();
+          int aNbSubFolders = foldersCount(aSubDoc.get());
+          if (theRow < aNbSubFolders) { // Create a Folder of sub-document
+            aIndex = createIndex(theRow, theColumn, aSubDoc.get());
+          } else {
+            // this is an object under sub document root
+            std::string aType = myXMLReader.subType();
+            ObjectPtr aObj = aSubDoc->object(aType, theRow - aNbSubFolders);
+            aIndex = objectIndex(aObj);
+          }
         } else {
-          // this is an object under sub document root
-          std::string aType = myXMLReader.subType();
-          ObjectPtr aObj = aSubDoc->object(aType, theRow - aNbSubFolders);
-          QModelIndex aIndex = objectIndex(aObj);
-          if (theColumn != 0)
-            return createIndex(aIndex.row(), theColumn, aIndex.internalPointer());
-          return aIndex;
+          // Check for composite object
+          ModelAPI_CompositeFeature* aCompFeature = dynamic_cast<ModelAPI_CompositeFeature*>(aParentObj);
+          if (aCompFeature) {
+            aIndex = objectIndex(aCompFeature->subFeature(theRow));
+          } else {
+            ModelAPI_ResultCompSolid* aCompRes = dynamic_cast<ModelAPI_ResultCompSolid*>(aParentObj);
+            if (aCompRes) 
+              aIndex = objectIndex(aCompRes->subResult(theRow));
+          }
         }
       }
     }
   }
-  return QModelIndex();
+  if (theColumn != 0)
+    return createIndex(aIndex.row(), theColumn, aIndex.internalPointer());
+  return aIndex;
 }
 
 //******************************************************
+static QModelIndex MYLastDeleted;
 QModelIndex XGUI_DataModel::parent(const QModelIndex& theIndex) const
 {
+  // To avoid additional request about index which was already deleted
+  if (theIndex == MYLastDeleted)
+    return QModelIndex();
+
   int aId = theIndex.internalId();
   if (aId != -1) { // The object is not a root folder
     ModelAPI_Document* aDoc = getSubDocument(theIndex.internalPointer());
@@ -467,7 +584,29 @@ QModelIndex XGUI_DataModel::parent(const QModelIndex& theIndex) const
       // It is a folder of sub-document
       return findDocumentRootIndex(aDoc);
     }
-    ModelAPI_Object* aObj = (ModelAPI_Object*) theIndex.internalPointer();
+    ObjectPtr aObj = object(theIndex);
+    if (!aObj.get()) {
+      // To avoid additional request about index which was already deleted
+      // If deleted it causes a crash on delete object from Part
+      MYLastDeleted = theIndex;
+      return QModelIndex();
+    }
+    // Check is it object a sub-object of a complex object
+    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+    if (aFeature.get()) {
+      CompositeFeaturePtr aCompFea = ModelAPI_Tools::compositeOwner(aFeature);
+      if (aCompFea.get()) {
+        return objectIndex(aCompFea);
+      }
+    }
+    ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+    if (aResult.get()) {
+      ResultCompSolidPtr aCompRes = ModelAPI_Tools::compSolidOwner(aResult);
+      if (aCompRes.get()) {
+        return objectIndex(aCompRes);
+      }
+    }
+    // Use as ordinary object
     std::string aType = aObj->groupName();
     SessionPtr aSession = ModelAPI_Session::get();
     DocumentPtr aRootDoc = aSession->moduleDocument();
@@ -498,38 +637,7 @@ QModelIndex XGUI_DataModel::parent(const QModelIndex& theIndex) const
 //******************************************************
 bool XGUI_DataModel::hasChildren(const QModelIndex& theParent) const
 {
-  if (!theParent.isValid()) {
-    int aNbFolders = foldersCount();
-    if (aNbFolders > 0)
-      return true;
-    SessionPtr aSession = ModelAPI_Session::get();
-    DocumentPtr aRootDoc = aSession->moduleDocument();
-    return aRootDoc->size(myXMLReader.rootType()) > 0;
-  }
-  if (theParent.internalId() == -1) {
-    std::string aType = myXMLReader.rootFolderType(theParent.row());
-    if (!aType.empty()) {
-      SessionPtr aSession = ModelAPI_Session::get();
-      DocumentPtr aRootDoc = aSession->moduleDocument();
-      return aRootDoc->size(aType) > 0;
-    }
-  } else {
-    ModelAPI_Document* aDoc = getSubDocument(theParent.internalPointer());
-    if (aDoc) { 
-      // a folder of sub-document
-      std::string aType = myXMLReader.subFolderType(theParent.row());
-      return aDoc->size(aType) > 0;
-    } else {
-      // Check that it could be an object with children
-      ModelAPI_Object* aObj = (ModelAPI_Object*)theParent.internalPointer();
-
-      // Check for Part feature
-      ResultPartPtr aPartRes = getPartResult(aObj);
-      if (aPartRes.get())
-        return true;
-    }
-  }
-  return false;
+  return rowCount(theParent) > 0;
 }
 
 //******************************************************
@@ -552,21 +660,69 @@ bool XGUI_DataModel::removeRows(int theRow, int theCount, const QModelIndex& the
 //******************************************************
 Qt::ItemFlags XGUI_DataModel::flags(const QModelIndex& theIndex) const
 {
-  Qt::ItemFlags aFlags = Qt::ItemIsSelectable;
-
+  qint64 aIt = theIndex.internalId();
   ModelAPI_Object* aObj = 0;
-  if (theIndex.internalId() != -1) {
-    if (!getSubDocument(theIndex.internalPointer()))
+  ModelAPI_Document* aDoc = 0;
+  SessionPtr aSession = ModelAPI_Session::get();
+  DocumentPtr aActiveDoc = aSession->activeDocument();
+
+  Qt::ItemFlags aNullFlag;
+  Qt::ItemFlags aDefaultFlag = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+  Qt::ItemFlags aEditingFlag = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
+
+
+  if (aIt == -1) {
+    // Folders under root
+    DocumentPtr aRootDoc = aSession->moduleDocument();
+    if (aRootDoc != aActiveDoc)
+      return aDefaultFlag;
+  } else {
+    aDoc = getSubDocument(theIndex.internalPointer());
+    if (!aDoc)
       aObj = (ModelAPI_Object*) theIndex.internalPointer();
   }
+
   if (aObj) {
-    aFlags |= Qt::ItemIsEditable;
-  
-    if (!aObj->isDisabled())
-      aFlags |= Qt::ItemIsEnabled;
-  } else
-    aFlags |= Qt::ItemIsEnabled;
-  return aFlags;
+    // An object
+    if (aObj->isDisabled()) 
+      return theIndex.column() == 1? Qt::ItemIsSelectable : aNullFlag;
+    
+    bool isCompositeSub = false;
+    // An object which is sub-object of a composite object can not be accessible in column 1
+    if (theIndex.column() == 1) {
+      ObjectPtr aObjPtr = aObj->data()->owner();
+      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObjPtr);
+      if (aFeature.get()) {
+        CompositeFeaturePtr aCompFea = ModelAPI_Tools::compositeOwner(aFeature);
+        if (aCompFea.get()) 
+          isCompositeSub = true;
+      } else {
+        ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObjPtr);
+        if (aResult.get()) {
+          ResultCompSolidPtr aCompRes = ModelAPI_Tools::compSolidOwner(aResult);
+          if (aCompRes.get()) 
+            isCompositeSub = true;
+        }
+      }
+    }
+    if (isCompositeSub)
+      return Qt::ItemIsSelectable;
+
+    if (aObj->document() != aActiveDoc) {
+      // The object could be a root of sub-tree
+      ResultPartPtr aPartRes = getPartResult(aObj);
+      if (aPartRes.get()) {
+        if (aPartRes->partDoc() == aActiveDoc)
+          return aEditingFlag;
+      }
+      return aDefaultFlag;
+    }
+  } else if (aDoc) {
+    // A folder under sub-document
+    if (aActiveDoc.get() != aDoc)
+      return aDefaultFlag;
+  }
+  return aEditingFlag;
 }
 
 //******************************************************
@@ -583,8 +739,9 @@ QModelIndex XGUI_DataModel::findDocumentRootIndex(const ModelAPI_Document* theDo
       aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
       if (aPartRes.get() && (aPartRes->partDoc().get() == theDoc)) {
         int aRow = i;
-        if (myXMLReader.rootType() == ModelAPI_Feature::group())
+        if (myXMLReader.rootType() == ModelAPI_Feature::group()) {
           aRow += foldersCount();
+        }
         return createIndex(aRow, 0, aObj.get());
       }
     }
@@ -645,6 +802,32 @@ int XGUI_DataModel::foldersCount(ModelAPI_Document* theDoc) const
   return aNb;
 }
 
+
+//******************************************************
+QIntList XGUI_DataModel::missedFolderIndexes(ModelAPI_Document* theDoc) const
+{
+  QIntList aList;
+  SessionPtr aSession = ModelAPI_Session::get();
+  DocumentPtr aRootDoc = aSession->moduleDocument();
+  if ((theDoc == 0) || (theDoc == aRootDoc.get())) {
+    for (int i = 0; i < myXMLReader.rootFoldersNumber(); i++) {
+      if (!myXMLReader.rootShowEmpty(i)) {
+        if (aRootDoc->size(myXMLReader.rootFolderType(i)) == 0)
+          aList.append(i);
+      }
+    }
+  } else {
+    for (int i = 0; i < myXMLReader.subFoldersNumber(); i++) {
+      if (!myXMLReader.subShowEmpty(i)) {
+        if (theDoc->size(myXMLReader.subFolderType(i)) == 0)
+          aList.append(i);
+      }
+    }
+  }
+  return aList;
+}
+
+
 //******************************************************
 QStringList XGUI_DataModel::listOfShowNotEmptyFolders(bool fromRoot) const
 {
@@ -678,4 +861,37 @@ QModelIndex XGUI_DataModel::lastHistoryIndex() const
     else 
       return createIndex(foldersCount(aCurDoc.get()) - 1, 1, aCurDoc.get());
   }
-}
\ No newline at end of file
+}
+
+//******************************************************
+int XGUI_DataModel::folderId(std::string theType, ModelAPI_Document* theDoc)
+{
+  SessionPtr aSession = ModelAPI_Session::get();
+  ModelAPI_Document* aDoc = theDoc;
+  if (aDoc == 0)
+    aDoc = aSession->moduleDocument().get();
+
+  bool aUseSubDoc = (aDoc != aSession->moduleDocument().get());
+
+  int aRes = -1;
+  if (aUseSubDoc) {
+    int aId = myXMLReader.subFolderId(theType);
+    aRes = aId;
+    for (int i = 0; i < aId; i++) {
+      if (!myXMLReader.subShowEmpty(i)) {
+        if (aDoc->size(myXMLReader.subFolderType(i)) == 0)
+          aRes--;
+      }
+    }
+  } else {
+    int aId = myXMLReader.rootFolderId(theType);
+    aRes = aId;
+    for (int i = 0; i < aId; i++) {
+      if (!myXMLReader.rootShowEmpty(i)) {
+        if (aDoc->size(myXMLReader.rootFolderType(i)) == 0)
+          aRes--;
+      }
+    }
+  }
+  return aRes;
+}