Improve ModelAPI_ValidatorsFactory interface + Introduce validate(attribute) method.

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

diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp
index c04cb9c6ce955df93c6fc6368efd18cbbf548779..4cf7f3b851ec29a9ef405a7f7b137fa040c5aa1d 100644 (file)
--- a/src/XGUI/XGUI_OperationMgr.cpp
+++ b/src/XGUI/XGUI_OperationMgr.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
-// File:        XGUI_OperationMgr.h
+// File:        XGUI_OperationMgr.cpp
 // Created:     20 Apr 2014
 // Author:      Natalia ERMOLAEVA
 
@@ -10,6 +10,9 @@
 #include "ModuleBase_IWorkshop.h"
 #include "ModuleBase_IModule.h"
 
+#include "ModelAPI_CompositeFeature.h"
+#include "ModelAPI_Session.h"
+
 #include <QMessageBox>
 #include <QApplication>
 #include <QKeyEvent>
@@ -141,12 +144,20 @@ bool XGUI_OperationMgr::abortAllOperations()
 
 bool XGUI_OperationMgr::commitAllOperations()
 {
+  bool isCompositeCommitted = false;
   while (hasOperation()) {
+    ModuleBase_Operation* anOperation = currentOperation();
     if (isApplyEnabled()) {
       onCommitOperation();
     } else {
-      currentOperation()->abort();
+      anOperation->abort();
     }
+    FeaturePtr aFeature = anOperation->feature();
+    CompositeFeaturePtr aComposite = 
+        std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aFeature);
+    isCompositeCommitted = aComposite.get();
+    if (isCompositeCommitted)
+      break;
   }
   return true;
 }
@@ -179,6 +190,24 @@ bool XGUI_OperationMgr::isApplyEnabled() const
   return myIsApplyEnabled;
 }
 
+bool XGUI_OperationMgr::isParentOperationValid() const
+{
+  bool isValid = false;
+  // the enable state of the parent operation of the nested one is defined by the rules that
+  // firstly there are nested operations and secondly the parent operation is valid
+  ModuleBase_Operation* aPrevOp = 0;
+  Operations::const_iterator anIt = myOperations.end();
+  if (anIt != myOperations.begin()) { // there are items in the operations list
+    --anIt;
+    aPrevOp = *anIt; // the last top operation, the operation which is started
+    if (anIt != myOperations.begin()) { // find the operation where the started operation is nested
+      --anIt;
+      aPrevOp = *anIt;
+    }
+  }
+  return aPrevOp && aPrevOp->isValid();
+}
+
 bool XGUI_OperationMgr::canStopOperation()
 {
   ModuleBase_Operation* anOperation = currentOperation();
@@ -248,20 +277,12 @@ void XGUI_OperationMgr::onOperationStarted()
 {
   ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
   
-  // the enable state of the parent operation of the nested one is defined by the rules that
-  // firstly there are nested operations and secondly the parent operation is valid
-  ModuleBase_Operation* aPrevOp;
-  Operations::const_iterator anIt = myOperations.end();
-  if (anIt != myOperations.begin()) { // there are items in the operations list
-    --anIt;
-    aPrevOp = *anIt; // the last top operation, the operation which is started
-    if (anIt != myOperations.begin()) { // find the operation where the started operation is nested
-      --anIt;
-      aPrevOp = *anIt;
-    }
-  }
-  bool isNestedOk = (myOperations.count() >= 1) && aPrevOp->isValid();
-  emit nestedStateChanged(isNestedOk);
+  bool aParentValid = isParentOperationValid();
+  // in order to apply is enabled only if there are modifications in the model
+  // e.g. sketch can be applyed only if at least one nested element modification is finished
+  bool aCanUndo = ModelAPI_Session::get()->canUndo();
+  emit nestedStateChanged(aParentValid && aCanUndo);
+
   emit operationStarted(aSenderOperation);
 }
 
@@ -274,7 +295,10 @@ void XGUI_OperationMgr::onOperationAborted()
 void XGUI_OperationMgr::onOperationCommitted()
 {
   ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
-  emit nestedStateChanged(myOperations.count() >= 1);
+  // in order to apply is enabled only if there are modifications in the model
+  // e.g. sketch can be applyed only if at least one nested element create is finished
+  bool aCanUndo = ModelAPI_Session::get()->canUndo();
+  emit nestedStateChanged(myOperations.count() >= 1 && aCanUndo);
   emit operationCommitted(aSenderOperation);
 }
 
@@ -309,7 +333,7 @@ void XGUI_OperationMgr::onOperationStopped()
   }
   if (aResultOp) {
     bool isModified = aCurrentOperation->isModified();
-    aResultOp->setIsModified(isModified);
+    aResultOp->setIsModified(aResultOp->isModified() || isModified);
     resumeOperation(aResultOp);
     onValidateOperation();
   }