X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_OperationMgr.cpp;h=e169adcd5e32bcd00778fb3548f69577f0181804;hb=1b93f1881c5fec599aa79707f93c84dd9c287bc0;hp=1845110e88bb55870d26c4c8e70ff06fe7f2b6d7;hpb=e9187ec48b7a5a84b13852b96c432e072b2a182c;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp index 1845110e8..e169adcd5 100644 --- a/src/XGUI/XGUI_OperationMgr.cpp +++ b/src/XGUI/XGUI_OperationMgr.cpp @@ -5,10 +5,18 @@ // Author: Natalia ERMOLAEVA #include "XGUI_OperationMgr.h" +#include "XGUI_ModuleConnector.h" +#include "XGUI_Workshop.h" +#include "XGUI_ErrorMgr.h" +#include +#include #include "ModuleBase_Operation.h" #include "ModuleBase_IWorkshop.h" #include "ModuleBase_IModule.h" +#include +#include "ModuleBase_OperationDescription.h" +#include "ModuleBase_OperationFeature.h" #include "ModelAPI_CompositeFeature.h" #include "ModelAPI_Session.h" @@ -19,8 +27,7 @@ XGUI_OperationMgr::XGUI_OperationMgr(QObject* theParent, ModuleBase_IWorkshop* theWorkshop) -: QObject(theParent), myIsValidationLock(false), myIsApplyEnabled(false), - myWorkshop(theWorkshop) +: QObject(theParent), myIsApplyEnabled(false), myWorkshop(theWorkshop) { } @@ -73,9 +80,12 @@ QStringList XGUI_OperationMgr::operationList() const { QStringList result; foreach(ModuleBase_Operation* eachOperation, myOperations) { - FeaturePtr aFeature = eachOperation->feature(); - if(aFeature) { - result << QString::fromStdString(aFeature->getKind()); + ModuleBase_OperationFeature* aFOperation = dynamic_cast(eachOperation); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + if(aFeature) { + result << QString::fromStdString(aFeature->getKind()); + } } } return result; @@ -107,14 +117,21 @@ bool XGUI_OperationMgr::startOperation(ModuleBase_Operation* theOperation) currentOperation()->postpone(); myOperations.append(theOperation); + connect(theOperation, SIGNAL(beforeStarted()), SLOT(onBeforeOperationStarted())); + connect(theOperation, SIGNAL(beforeAborted()), SLOT(onBeforeOperationAborted())); + connect(theOperation, SIGNAL(beforeCommitted()), SLOT(onBeforeOperationCommitted())); + 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(triggered(bool)), SLOT(onOperationTriggered(bool))); - connect(theOperation, SIGNAL(activatedByPreselection()), - SIGNAL(operationActivatedByPreselection())); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (theOperation); + if (aFOperation) + connect(aFOperation, SIGNAL(activatedByPreselection()), + SIGNAL(operationActivatedByPreselection())); theOperation->start(); onValidateOperation(); @@ -128,8 +145,9 @@ bool XGUI_OperationMgr::abortAllOperations() return aResult; if (operationsCount() == 1) { - if (canStopOperation()) { - abortOperation(currentOperation()); + ModuleBase_Operation* aCurrentOperation = currentOperation(); + if (canStopOperation(aCurrentOperation)) { + abortOperation(aCurrentOperation); } else aResult = false; @@ -157,12 +175,16 @@ bool XGUI_OperationMgr::commitAllOperations() } else { abortOperation(anOperation); } - FeaturePtr aFeature = anOperation->feature(); - CompositeFeaturePtr aComposite = - std::dynamic_pointer_cast(aFeature); - isCompositeCommitted = aComposite.get(); - if (isCompositeCommitted) - break; + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (anOperation); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + CompositeFeaturePtr aComposite = + std::dynamic_pointer_cast(aFeature); + isCompositeCommitted = aComposite.get(); + if (isCompositeCommitted) + break; + } } return true; } @@ -171,26 +193,41 @@ void XGUI_OperationMgr::onValidateOperation() { if (!hasOperation()) return; - ModuleBase_Operation* anOperation = currentOperation(); - if(anOperation) { - bool aCanCommit = myWorkshop->module()->canCommitOperation(); - setApplyEnabled(!myIsValidationLock && aCanCommit && anOperation->isValid()); - } -} - -void XGUI_OperationMgr::setLockValidating(bool toLock) -{ - myIsValidationLock = toLock; - onValidateOperation(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (currentOperation()); + if(aFOperation && aFOperation->feature().get()) + setApplyEnabled(myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty()); } void XGUI_OperationMgr::setApplyEnabled(const bool theEnabled) { myIsApplyEnabled = theEnabled; - emit validationStateChanged(theEnabled); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (currentOperation()); + if (aFOperation) { + workshop()->errorMgr()->updateActions(aFOperation->feature()); + } + //emit validationStateChanged(theEnabled); +} - bool aParentValid = isParentOperationValid(); - emit nestedStateChanged(aParentValid); +void XGUI_OperationMgr::updateApplyOfOperations(ModuleBase_Operation* theOperation) +{ + XGUI_ErrorMgr* anErrorMgr = workshop()->errorMgr(); + if (theOperation) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (aFOperation) + anErrorMgr->updateAcceptAllAction(aFOperation->feature()); + //emit nestedStateChanged(theOperation->getDescription()->operationId().toStdString(), + // theOperation->isValid()); + } + else { + foreach(ModuleBase_Operation* anOperation, myOperations) { + if (anOperation) + updateApplyOfOperations(anOperation); + //emit nestedStateChanged(anOperation->getDescription()->operationId().toStdString(), + // anOperation->isValid()); + } + } } bool XGUI_OperationMgr::isApplyEnabled() const @@ -216,13 +253,13 @@ bool XGUI_OperationMgr::isParentOperationValid() const return aPrevOp && aPrevOp->isValid(); } -bool XGUI_OperationMgr::canStopOperation() +bool XGUI_OperationMgr::canStopOperation(ModuleBase_Operation* theOperation) { - ModuleBase_Operation* anOperation = currentOperation(); - if(operationsCount() > 1) //in case of nested (sketch) operation no confirmation needed + //in case of nested (sketch) operation no confirmation needed + if (isGrantedOperation(theOperation->id())) return true; - if (anOperation && anOperation->isModified()) { - QString aMessage = tr("%1 operation will be aborted.").arg(anOperation->id()); + if (theOperation && theOperation->isModified()) { + QString aMessage = tr("%1 operation will be aborted.").arg(theOperation->id()); int anAnswer = QMessageBox::question(qApp->activeWindow(), tr("Abort operation"), aMessage, @@ -247,14 +284,54 @@ void XGUI_OperationMgr::resumeOperation(ModuleBase_Operation* theOperation) theOperation->resume(); } -bool XGUI_OperationMgr::canStartOperation(QString theId) +bool XGUI_OperationMgr::isGrantedOperation(const QString& theId) +{ + bool isGranted = false; + + QListIterator anIt(myOperations); + anIt.toBack(); + ModuleBase_Operation* aPreviousOperation = 0; + while (anIt.hasPrevious()) { + ModuleBase_Operation* anOp = anIt.previous(); + if (anOp) + isGranted = anOp->isGranted(theId); + } + return isGranted; +} + +void XGUI_OperationMgr::setCurrentFeature(const FeaturePtr& theFeature) +{ + SessionPtr aMgr = ModelAPI_Session::get(); + DocumentPtr aDoc = aMgr->activeDocument(); + bool aIsOp = aMgr->isOperation(); + if (!aIsOp) + aMgr->startOperation(); + aDoc->setCurrentFeature(theFeature, false); + if (!aIsOp) + aMgr->finishOperation(); +} + +bool XGUI_OperationMgr::canStartOperation(const QString& theId) { bool aCanStart = true; ModuleBase_Operation* aCurrentOp = currentOperation(); if (aCurrentOp) { - if (!aCurrentOp->isGranted(theId)) { - if (canStopOperation()) { - if (myIsApplyEnabled) + bool aGranted = aCurrentOp->isGranted(theId); + // the started operation is granted for the current one, + // e.g. current - Sketch, started - Line + if (aGranted) { + aCanStart = true; + } + else { + if (!isGrantedOperation(theId)) { + // the operation is not granted in the current list of operations + // e.g. Edit Parameter when Sketch, Line in Sketch is active. + aCanStart = abortAllOperations(); + } + else if (canStopOperation(aCurrentOp)) { + // the started operation is granted in the parrent operation, + // e.g. current - Line in Sketch, started Circle + if (myIsApplyEnabled && aCurrentOp->isModified()) aCurrentOp->commit(); else abortOperation(aCurrentOp); @@ -293,25 +370,84 @@ void XGUI_OperationMgr::onCommitOperation() void XGUI_OperationMgr::onAbortOperation() { - if (hasOperation() && canStopOperation()) { - abortOperation(currentOperation()); + ModuleBase_Operation* aCurrentOperation = currentOperation(); + if (aCurrentOperation && canStopOperation(aCurrentOperation)) { + abortOperation(aCurrentOperation); + } +} + +void XGUI_OperationMgr::onBeforeOperationStarted() +{ + ModuleBase_Operation* aCurrentOperation = dynamic_cast(sender()); + if (!aCurrentOperation) + return; + + /// Set current feature and remeber old current feature + ModuleBase_OperationFeature* aFOperation = dynamic_cast(aCurrentOperation); + if (aFOperation) { + SessionPtr aMgr = ModelAPI_Session::get(); + DocumentPtr aDoc = aMgr->activeDocument(); + // the parameter of current feature should be false, we should use all feature, not only visible + // in order to correctly save the previous feature of the nested operation, where the + // features can be not visible in the tree. The problem case is Edit sketch entitity(line) + // in the Sketch, created in ExtrusionCut operation. The entity disappears by commit. + // When sketch entity operation started, the sketch should be cashed here as the current. + // Otherwise(the flag is true), the ExtrusionCut is cashed, when commit happens, the sketch + // is disabled, sketch entity is disabled as extrusion cut is created earliest then sketch. + // As a result the sketch disappears from the viewer. However after commit it is displayed back. + aFOperation->setPreviousCurrentFeature(aDoc->currentFeature(false)); + if (aFOperation->isEditOperation()) // it should be performed by the feature edit only + // in create operation, the current feature is changed by addFeature() + aDoc->setCurrentFeature(aFOperation->feature(), false); } } void XGUI_OperationMgr::onOperationStarted() { ModuleBase_Operation* aSenderOperation = dynamic_cast(sender()); + updateApplyOfOperations(aSenderOperation); emit operationStarted(aSenderOperation); } +void XGUI_OperationMgr::onBeforeOperationAborted() +{ + onBeforeOperationCommitted(); +} + void XGUI_OperationMgr::onOperationAborted() { ModuleBase_Operation* aSenderOperation = dynamic_cast(sender()); emit operationAborted(aSenderOperation); } +void XGUI_OperationMgr::onBeforeOperationCommitted() +{ + ModuleBase_Operation* aCurrentOperation = dynamic_cast(sender()); + if (!aCurrentOperation) + return; + + /// Restore the previous current feature + ModuleBase_OperationFeature* aFOperation = dynamic_cast(aCurrentOperation); + if (aFOperation) { + if (aFOperation->isEditOperation()) { + /// Restore the previous current feature + setCurrentFeature(aFOperation->previousCurrentFeature()); + } + else { // create operation + // the Top created feature should stays the current. In nested operations, like Line in the Sketch or + // Sketch in ExtrusionCut, a previous feature should be restored on commit. It is performed here + // in order to perform it in the current transaction without opening a new one. + if (myOperations.front() != aFOperation) + setCurrentFeature(aFOperation->previousCurrentFeature()); + } + } +} + void XGUI_OperationMgr::onOperationCommitted() { + // apply state for all features from the stack of operations should be updated + updateApplyOfOperations(); + ModuleBase_Operation* aSenderOperation = dynamic_cast(sender()); emit operationCommitted(aSenderOperation); } @@ -355,15 +491,44 @@ void XGUI_OperationMgr::onOperationStopped() bool XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent) { + QObject* aSender = sender(); + // Let the manager decide what to do with the given key combination. ModuleBase_Operation* anOperation = currentOperation(); bool isAccepted = true; switch (theEvent->key()) { case Qt::Key_Return: case Qt::Key_Enter: { - emit keyEnterReleased(); - commitOperation(); + ModuleBase_Operation* aOperation = currentOperation(); + ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + ModuleBase_ModelWidget* aActiveWgt = aPanel->activeWidget(); + if (!aActiveWgt || !aActiveWgt->processEnter()) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast(currentOperation()); + if (!aFOperation || myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty()) { + emit keyEnterReleased(); + commitOperation(); + } + else + isAccepted = false; + } + } + break; + case Qt::Key_N: + case Qt::Key_P: { + bool noModifiers = (theEvent->modifiers() == Qt::NoModifier); + if (noModifiers) { + ModuleBase_IViewer* aViewer = myWorkshop->viewer(); + Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); + if (!aContext.IsNull()) { + Handle(V3d_View) aView = aViewer->activeView(); + if ((theEvent->key() == Qt::Key_N)) + aContext->HilightNextDetected(aView); + else if ((theEvent->key() == Qt::Key_P)) + aContext->HilightPreviousDetected(aView); + } + } } + break; default: isAccepted = false; @@ -375,3 +540,9 @@ bool XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent) return isAccepted; } +XGUI_Workshop* XGUI_OperationMgr::workshop() const +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + return aConnector->workshop(); +} +