X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_OperationMgr.cpp;h=2382354ea57b469471d9588722e1b8e8f43f7d66;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=1845110e88bb55870d26c4c8e70ff06fe7f2b6d7;hpb=e9187ec48b7a5a84b13852b96c432e072b2a182c;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp index 1845110e8..2382354ea 100644 --- a/src/XGUI/XGUI_OperationMgr.cpp +++ b/src/XGUI/XGUI_OperationMgr.cpp @@ -5,10 +5,16 @@ // Author: Natalia ERMOLAEVA #include "XGUI_OperationMgr.h" +#include "XGUI_ModuleConnector.h" +#include "XGUI_Workshop.h" +#include "XGUI_ErrorMgr.h" #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" @@ -73,9 +79,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; @@ -112,9 +121,11 @@ bool XGUI_OperationMgr::startOperation(ModuleBase_Operation* theOperation) 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 +139,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 +169,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,10 +187,13 @@ void XGUI_OperationMgr::onValidateOperation() { if (!hasOperation()) return; - ModuleBase_Operation* anOperation = currentOperation(); - if(anOperation) { - bool aCanCommit = myWorkshop->module()->canCommitOperation(); - setApplyEnabled(!myIsValidationLock && aCanCommit && anOperation->isValid()); + //ModuleBase_Operation* anOperation = currentOperation(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (currentOperation()); + if(aFOperation && aFOperation->feature().get()) { + //bool aCanCommit = myWorkshop->module()->canCommitOperation(); + //setApplyEnabled(!myIsValidationLock && aCanCommit && anOperation->isValid()); + setApplyEnabled(myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty()); } } @@ -187,10 +206,32 @@ void XGUI_OperationMgr::setLockValidating(bool toLock) 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 +257,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)) 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 +288,36 @@ void XGUI_OperationMgr::resumeOperation(ModuleBase_Operation* theOperation) theOperation->resume(); } -bool XGUI_OperationMgr::canStartOperation(QString theId) +bool XGUI_OperationMgr::isGrantedOperation(ModuleBase_Operation* theOperation) +{ + bool isGranted = false; + + QListIterator anIt(myOperations); + anIt.toBack(); + ModuleBase_Operation* aPreviousOperation = 0; + while (anIt.hasPrevious()) { + ModuleBase_Operation* anOp = anIt.previous(); + if (anOp == theOperation) { + if (anIt.hasPrevious()) + aPreviousOperation = anIt.previous(); + break; + } + } + if (aPreviousOperation) + isGranted = aPreviousOperation->isGranted(theOperation->id()); + + return isGranted; +} + +bool XGUI_OperationMgr::canStartOperation(const QString& theId, const bool isAdditionallyGranted) { bool aCanStart = true; ModuleBase_Operation* aCurrentOp = currentOperation(); if (aCurrentOp) { - if (!aCurrentOp->isGranted(theId)) { - if (canStopOperation()) { - if (myIsApplyEnabled) + bool aGranted = aCurrentOp->isGranted(theId) || isAdditionallyGranted; + if (!aGranted) { + if (canStopOperation(aCurrentOp)) { + if (myIsApplyEnabled && aCurrentOp->isModified()) aCurrentOp->commit(); else abortOperation(aCurrentOp); @@ -293,14 +356,16 @@ 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::onOperationStarted() { ModuleBase_Operation* aSenderOperation = dynamic_cast(sender()); + updateApplyOfOperations(aSenderOperation); emit operationStarted(aSenderOperation); } @@ -312,6 +377,9 @@ void XGUI_OperationMgr::onOperationAborted() 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); } @@ -364,6 +432,20 @@ bool XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent) emit keyEnterReleased(); commitOperation(); } + 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(); + 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 +457,9 @@ bool XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent) return isAccepted; } +XGUI_Workshop* XGUI_OperationMgr::workshop() const +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + return aConnector->workshop(); +} +