Do not change history in ObjectBrowser if an operation is opened

[modules/shaper.git] / src / XGUI / XGUI_DataModel.cpp

diff --git a/src/XGUI/XGUI_DataModel.cpp b/src/XGUI/XGUI_DataModel.cpp
index bba968407ebef090e0787c263d7b1a35d92cdfb1..344b4bfc3db37a3ae58d7686fc1c2129a6c68472 100644 (file)
--- a/src/XGUI/XGUI_DataModel.cpp
+++ b/src/XGUI/XGUI_DataModel.cpp
@@ -37,7 +37,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();
@@ -54,13 +57,14 @@ 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_DOCUMENT_CHANGED));
 }
 
 //******************************************************
@@ -81,6 +85,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) {
@@ -128,9 +136,8 @@ void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
           }
         } 
 #ifdef _DEBUG
-        else {
+        else
           Events_Error::send("Problem with Data Model definition of sub-document");
-        }
 #endif
       }
     }
@@ -186,12 +193,22 @@ void XGUI_DataModel::processEvent(const std::shared_ptr<Events_Message>& theMess
           }
         } 
 #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_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
+    }
   } 
 }
 
@@ -506,6 +523,7 @@ QModelIndex XGUI_DataModel::parent(const QModelIndex& theIndex) const
     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();
     }
@@ -583,7 +601,7 @@ bool XGUI_DataModel::hasChildren(const QModelIndex& theParent) const
       // Check for Part feature
       ResultPartPtr aPartRes = getPartResult(aObj);
       if (aPartRes.get())
-        return true;
+        return aPartRes->partDoc().get() != NULL;
       else {
         // Check for composite object
         ModelAPI_CompositeFeature* aCompFeature = dynamic_cast<ModelAPI_CompositeFeature*>(aObj);
@@ -626,12 +644,32 @@ Qt::ItemFlags XGUI_DataModel::flags(const QModelIndex& theIndex) const
       aObj = (ModelAPI_Object*) theIndex.internalPointer();
   }
   if (aObj) {
-    aFlags |= Qt::ItemIsEditable;
-  
-    if (!aObj->isDisabled())
-      aFlags |= Qt::ItemIsEnabled;
-  } else
-    aFlags |= Qt::ItemIsEnabled;
+    if (aObj->isDisabled())
+      return Qt::ItemFlags();
+
+    bool isCompositeSub = false;
+    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;
+        }
+      }
+    }
+    // An object which is sub-object of a composite object can not be accessible in column 1
+    if (isCompositeSub)
+      return Qt::ItemFlags();
+  }
+
+  aFlags |= Qt::ItemIsEnabled;
   return aFlags;
 }