X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_OperationMgr.cpp;h=a8f68277b5aa2266d32b6cb4f4d6c4b33730a9d8;hb=965adcb3288bda478cdd045d4b2f90c92980d099;hp=9b2902ecba69e614908d88253f97bdf88d7dbb4a;hpb=994d48d0c8a4d2c55576b4041bf6450bf1148c4a;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp
index 9b2902ecb..a8f68277b 100644
--- a/src/XGUI/XGUI_OperationMgr.cpp
+++ b/src/XGUI/XGUI_OperationMgr.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:        XGUI_OperationMgr.h
 // Created:     20 Apr 2014
 // Author:      Natalia ERMOLAEVA
@@ -5,18 +7,14 @@
 #include "XGUI_OperationMgr.h"
 
 #include "ModuleBase_Operation.h"
-#include <ModelAPI_Validator.h>
-#include <ModelAPI_FeatureValidator.h>
 
 #include <QMessageBox>
 #include <QApplication>
 #include <QKeyEvent>
 
 XGUI_OperationMgr::XGUI_OperationMgr(QObject* theParent)
-    : QObject(theParent)
+    : QObject(theParent), myIsValidationLock(false)
 {
-  // listen to Escape signal to stop the current operation
-  qApp->installEventFilter(this);
 }
 
 XGUI_OperationMgr::~XGUI_OperationMgr()
@@ -28,87 +26,132 @@ ModuleBase_Operation* XGUI_OperationMgr::currentOperation() const
   return myOperations.count() > 0 ? myOperations.last() : 0;
 }
 
-bool XGUI_OperationMgr::hasOperation() const
+bool XGUI_OperationMgr::isCurrentOperation(ModuleBase_Operation* theOperation)
 {
-  return (myOperations.count() > 0) && (myOperations.last() != NULL);
+  if(!hasOperation())
+    return false;
+  return currentOperation() == theOperation;
 }
 
-int XGUI_OperationMgr::operationsCount() const
+bool XGUI_OperationMgr::hasOperation() const
 {
-  return myOperations.count();
+  return !myOperations.isEmpty() && (myOperations.last() != NULL);
 }
 
-bool XGUI_OperationMgr::startOperation(ModuleBase_Operation* theOperation)
+bool XGUI_OperationMgr::hasOperation(const QString& theId) const
 {
-  if (!canStartOperation(theOperation))
-    return false;
+  foreach(ModuleBase_Operation* aOp, myOperations) {
+    if (aOp->id() == theId)
+      return true;
+  }
+  return false;
+}
 
-  myOperations.append(theOperation);
+ModuleBase_Operation* XGUI_OperationMgr::findOperation(const QString& theId) const
+{
+  foreach(ModuleBase_Operation* aOp, myOperations) {
+    if (aOp->id() == theId)
+      return aOp;
+  }
+  return 0;
+}
 
-  connect(theOperation, SIGNAL(stopped()), this, SLOT(onOperationStopped()));
-  connect(theOperation, SIGNAL(started()), this, SIGNAL(operationStarted()));
-  connect(theOperation, SIGNAL(resumed()), this, SIGNAL(operationResumed()));
-  connect(theOperation, SIGNAL(activateNextWidget(ModuleBase_ModelWidget*)), this,
-          SIGNAL(activateNextWidget(ModuleBase_ModelWidget*)));
 
-  theOperation->start();
-  validateCurrentOperation();
-  return true;
+int XGUI_OperationMgr::operationsCount() const
+{
+  return myOperations.count();
 }
 
-bool XGUI_OperationMgr::abortOperation()
+QStringList XGUI_OperationMgr::operationList() const
 {
-  ModuleBase_Operation* aCurrentOp = currentOperation();
-  if (!aCurrentOp || !canStopOperation())
-    return false;
+  QStringList result;
+  foreach(ModuleBase_Operation* eachOperation, myOperations) {
+    FeaturePtr aFeature = eachOperation->feature();
+    if(aFeature) {
+      result << QString::fromStdString(aFeature->getKind());
+    }
+  }
+  return result;
+}
 
-  aCurrentOp->abort();
-  return true;
+ModuleBase_Operation* XGUI_OperationMgr::previousOperation(ModuleBase_Operation* theOperation) const
+{
+  int idx = myOperations.lastIndexOf(theOperation);
+  if(idx == -1 || idx == 0) {
+    return NULL;
+  }
+  return myOperations.at(idx - 1);
 }
 
-QStringList XGUI_OperationMgr::operationList()
+bool XGUI_OperationMgr::eventFilter(QObject *theObject, QEvent *theEvent)
 {
-  QStringList result;
-  foreach(ModuleBase_Operation* eachOperation, myOperations)
-  {
-    result << eachOperation->id();
+  if (theEvent->type() == QEvent::KeyRelease) {
+    QKeyEvent* aKeyEvent = dynamic_cast<QKeyEvent*>(theEvent);
+    if(aKeyEvent) {
+      return onKeyReleased(aKeyEvent);
+    }
   }
-  return result;
+  return QObject::eventFilter(theObject, theEvent);
 }
 
-void XGUI_OperationMgr::validateOperation(ModuleBase_Operation* theOperation)
+bool XGUI_OperationMgr::startOperation(ModuleBase_Operation* theOperation)
 {
-  //Get operation Id and feature to validate
-  QString anOperationId = theOperation->id();
-  FeaturePtr aFeature = theOperation->feature();
-  //Get validators for the Id
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
+  if (hasOperation())
+    currentOperation()->postpone();
+  myOperations.append(theOperation);
+
+  connect(theOperation, SIGNAL(started()), SLOT(onOperationStarted()));
+  connect(theOperation, SIGNAL(aborted()), SLOT(onOperationAborted()));
+  connect(theOperation, SIGNAL(committed()), SLOT(onOperationCommitted()));
+  connect(theOperation, SIGNAL(stopped()), SLOT(onOperationStopped()));
+  connect(theOperation, SIGNAL(resumed()), SLOT(onOperationResumed()));
+  connect(theOperation, SIGNAL(activatedByPreselection()),
+          SIGNAL(operationActivatedByPreselection()));
+
+  theOperation->start();
+  onValidateOperation();
+  return true;
+}
 
-  bool isValid = aFactory->validate(aFeature);
-  emit operationValidated(isValid);
+bool XGUI_OperationMgr::abortAllOperations()
+{
+  if(!hasOperation()) {
+    return true;
+  } else if (operationsCount() == 1) {
+    onAbortOperation();
+    return true;
+  }
+  QString aMessage = tr("All active operations will be aborted.");
+  int anAnswer = QMessageBox::question(qApp->activeWindow(),
+                                       tr("Abort operation"),
+                                       aMessage,
+                                       QMessageBox::Ok | QMessageBox::Cancel,
+                                       QMessageBox::Cancel);
+  bool result = anAnswer == QMessageBox::Ok;
+  while(result && hasOperation()) {
+    currentOperation()->abort();
+  }
+  return result;
 }
 
-void XGUI_OperationMgr::validateCurrentOperation()
+void XGUI_OperationMgr::onValidateOperation()
 {
   if (!hasOperation())
     return;
   ModuleBase_Operation* anOperation = currentOperation();
-  validateOperation(currentOperation());
+  if(anOperation && (!myIsValidationLock)) {
+    bool isValid = anOperation->isValid();
+    emit operationValidated(isValid);
+  }
 }
 
-bool XGUI_OperationMgr::eventFilter(QObject *theObject, QEvent *theEvent)
+bool XGUI_OperationMgr::commitOperation()
 {
-  if (theEvent->type() == QEvent::KeyRelease) {
-    QKeyEvent* aKeyEvent = (QKeyEvent*) theEvent;
-    if (aKeyEvent && aKeyEvent->key() == Qt::Key_Escape) {
-      // TODO: this is Escape button processing when the property panel has empty content,
-      // but the operation should be stopped by the Enter has been clicked
-      onKeyReleased(aKeyEvent);
-      return true;
-    }
+  if (hasOperation() && currentOperation()->isValid()) {
+    onCommitOperation();
+    return true;
   }
-  return QObject::eventFilter(theObject, theEvent);
+  return false;
 }
 
 void XGUI_OperationMgr::resumeOperation(ModuleBase_Operation* theOperation)
@@ -116,68 +159,78 @@ void XGUI_OperationMgr::resumeOperation(ModuleBase_Operation* theOperation)
   theOperation->resume();
 }
 
-bool XGUI_OperationMgr::canStartOperation(ModuleBase_Operation* theOperation)
+bool XGUI_OperationMgr::canStartOperation(QString theId)
 {
   bool aCanStart = true;
   ModuleBase_Operation* aCurrentOp = currentOperation();
   if (aCurrentOp) {
-    if (!theOperation->isGranted()) {
-      if (!aCurrentOp->isValid(theOperation)) {
-        if (canStopOperation()) {
-          aCurrentOp->abort();
-        } else {
-          aCanStart = false;
-        }
+    if (!aCurrentOp->isGranted(theId)) {
+      if (canAbortOperation()) {
+        aCurrentOp->abort();
+      } else {
+        aCanStart = false;
       }
     }
   }
   return aCanStart;
 }
 
-bool XGUI_OperationMgr::canStopOperation()
-{
-  ModuleBase_Operation* anOperation = currentOperation();
-  if (anOperation) {
-    if (anOperation->isModified()) {
-      int anAnswer = QMessageBox::question(
-          qApp->activeWindow(), tr("Operation launch"),
-          tr("Previous operation is not finished, abort it?"),
-          QMessageBox::Abort | QMessageBox::Cancel,
-          QMessageBox::Cancel);
-      return anAnswer == QMessageBox::Abort;
-    }
-  }
-  return true;
-}
 
 void XGUI_OperationMgr::onCommitOperation()
 {
   ModuleBase_Operation* anOperation = currentOperation();
-  anOperation->onWidgetActivated(NULL);
   if (anOperation)
     anOperation->commit();
 }
 
 void XGUI_OperationMgr::onAbortOperation()
 {
-  ModuleBase_Operation* anOperation = currentOperation();
-  if (anOperation && canAbortOperation())
-    anOperation->abort();
+  if (hasOperation() && canAbortOperation()) {
+    currentOperation()->abort();
+  }
 }
 
 bool XGUI_OperationMgr::canAbortOperation()
 {
   ModuleBase_Operation* anOperation = currentOperation();
+  if(operationsCount() > 1) //in case of nested (sketch) operation no confirmation needed
+    return true;
   if (anOperation && anOperation->isModified()) {
-    int anAnswer = QMessageBox::question(
-        qApp->activeWindow(), tr("Cancel operation"),
-        tr("Operation %1 will be cancelled. Continue?").arg(anOperation->id()), QMessageBox::Yes,
-        QMessageBox::No);
-    return anAnswer == QMessageBox::Yes;
+    QString aMessage = tr("%1 operation will be aborted.").arg(anOperation->id());
+    int anAnswer = QMessageBox::question(qApp->activeWindow(),
+                                         tr("Abort operation"),
+                                         aMessage,
+                                         QMessageBox::Ok | QMessageBox::Cancel,
+                                         QMessageBox::Cancel);
+    return anAnswer == QMessageBox::Ok;
   }
   return true;
 }
 
+void XGUI_OperationMgr::onOperationStarted()
+{
+  ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
+  emit operationStarted(aSenderOperation);
+}
+
+void XGUI_OperationMgr::onOperationAborted()
+{
+  ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
+  emit operationAborted(aSenderOperation);
+}
+
+void XGUI_OperationMgr::onOperationCommitted()
+{
+  ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
+  emit operationCommitted(aSenderOperation);
+}
+
+void XGUI_OperationMgr::onOperationResumed()
+{
+  ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
+  emit operationResumed(aSenderOperation);
+}
+
 void XGUI_OperationMgr::onOperationStopped()
 {
   ModuleBase_Operation* aSenderOperation = dynamic_cast<ModuleBase_Operation*>(sender());
@@ -203,20 +256,29 @@ void XGUI_OperationMgr::onOperationStopped()
   }
   if (aResultOp) {
     resumeOperation(aResultOp);
-    validateCurrentOperation();
+    onValidateOperation();
   }
 }
 
-void XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent)
+bool XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent)
 {
+  // Let the manager decide what to do with the given key combination.
   ModuleBase_Operation* anOperation = currentOperation();
-  if (anOperation)
-    anOperation->keyReleased(theEvent->key());
+  bool isAccepted = true;
+  switch (theEvent->key()) {
+    case Qt::Key_Return:
+    case Qt::Key_Enter: {
+      emit keyEnterReleased();
+      commitOperation();
+    }
+      break;
+    default:
+      isAccepted = false;
+      break;
+  }
+  //if(anOperation) {
+  //  anOperation->keyReleased(theEvent->key());
+  //}
+  return isAccepted;
 }
 
-void XGUI_OperationMgr::onWidgetActivated(ModuleBase_ModelWidget* theWidget)
-{
-  ModuleBase_Operation* anOperation = currentOperation();
-  if (anOperation)
-    anOperation->onWidgetActivated(theWidget);
-}