X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_OperationMgr.cpp;h=42f892d212103f2d37bebefb575461c1d6c767d5;hb=fac255fcec3913e743169b3c207f28ca1303a0ff;hp=9f29412ebda7f1d0e7ff34134d0bc996d9c72d05;hpb=ef735191febeda718b07736db7abdd728a81c17b;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp index 9f29412eb..42f892d21 100644 --- a/src/XGUI/XGUI_OperationMgr.cpp +++ b/src/XGUI/XGUI_OperationMgr.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: XGUI_OperationMgr.cpp -// Created: 20 Apr 2014 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "XGUI_OperationMgr.h" #include "XGUI_ModuleConnector.h" @@ -10,6 +24,7 @@ #include "XGUI_ErrorMgr.h" #include "XGUI_Tools.h" #include "XGUI_ObjectsBrowser.h" +#include "XGUI_ContextMenuMgr.h" #include #include @@ -26,6 +41,7 @@ #include #include +#include #include #include @@ -56,15 +72,25 @@ public: virtual bool eventFilter(QObject *theObject, QEvent *theEvent) { bool isAccepted = false; - if (myIsActive && theEvent->type() == QEvent::KeyRelease) { - QKeyEvent* aKeyEvent = dynamic_cast(theEvent); - if(aKeyEvent) { - switch (aKeyEvent->key()) { - case Qt::Key_Delete: { - isAccepted = myOperationMgr->onProcessDelete(theObject); + if (myIsActive) { + if (theEvent->type() == QEvent::KeyRelease) { + QKeyEvent* aKeyEvent = dynamic_cast(theEvent); + if (aKeyEvent) { + myOperationMgr->setSHIFTPressed(aKeyEvent->modifiers() & Qt::ShiftModifier); + switch (aKeyEvent->key()) { + case Qt::Key_Delete: + isAccepted = myOperationMgr->onProcessDelete(theObject); + break; + default: + isAccepted = myOperationMgr->onKeyReleased(theObject, aKeyEvent); + break; } } } + else if (theEvent->type() == QEvent::KeyPress) { + QKeyEvent* aKeyEvent = dynamic_cast(theEvent); + myOperationMgr->setSHIFTPressed(aKeyEvent->modifiers() & Qt::ShiftModifier); + } } if (!isAccepted) isAccepted = QObject::eventFilter(theObject, theEvent); @@ -78,7 +104,7 @@ private: XGUI_OperationMgr::XGUI_OperationMgr(QObject* theParent, ModuleBase_IWorkshop* theWorkshop) -: QObject(theParent), myWorkshop(theWorkshop) +: QObject(theParent), myWorkshop(theWorkshop), mySHIFTPressed(false) { /// we need to install filter to the application in order to react to 'Delete' key button /// this key can not be a short cut for a corresponded action because we need to set @@ -128,9 +154,12 @@ bool XGUI_OperationMgr::hasOperation(const QString& theId) const ModuleBase_Operation* XGUI_OperationMgr::findOperation(const QString& theId) const { - foreach(ModuleBase_Operation* aOp, myOperations) { - if (aOp->id() == theId) - return aOp; + QList::const_iterator anIt = myOperations.end(); + while (anIt != myOperations.begin()) { + --anIt; + ModuleBase_Operation* anOperation = *anIt; + if (anOperation->id() == theId) + return anOperation; } return 0; } @@ -145,7 +174,8 @@ QStringList XGUI_OperationMgr::operationList() const { QStringList result; foreach(ModuleBase_Operation* eachOperation, myOperations) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(eachOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(eachOperation); if (aFOperation) { FeaturePtr aFeature = aFOperation->feature(); if(aFeature) { @@ -165,20 +195,6 @@ ModuleBase_Operation* XGUI_OperationMgr::previousOperation(ModuleBase_Operation* return myOperations.at(idx - 1); } -bool XGUI_OperationMgr::eventFilter(QObject *theObject, QEvent *theEvent) -{ - bool isAccepted = false; - if (theEvent->type() == QEvent::KeyRelease) { - QKeyEvent* aKeyEvent = dynamic_cast(theEvent); - if(aKeyEvent) - isAccepted = onKeyReleased(theObject, aKeyEvent); - } - if (!isAccepted) - isAccepted = QObject::eventFilter(theObject, theEvent); - - return isAccepted; -} - bool XGUI_OperationMgr::startOperation(ModuleBase_Operation* theOperation) { if (hasOperation()) @@ -244,7 +260,7 @@ bool XGUI_OperationMgr::commitAllOperations() (anOperation); if (aFOperation) { FeaturePtr aFeature = aFOperation->feature(); - CompositeFeaturePtr aComposite = + CompositeFeaturePtr aComposite = std::dynamic_pointer_cast(aFeature); isCompositeCommitted = aComposite.get(); if (isCompositeCommitted) @@ -274,7 +290,8 @@ void XGUI_OperationMgr::updateApplyOfOperations(ModuleBase_Operation* theOperati { XGUI_ErrorMgr* anErrorMgr = XGUI_Tools::workshop(myWorkshop)->errorMgr(); if (theOperation) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation) anErrorMgr->updateAcceptAllAction(aFOperation->feature()); } @@ -284,6 +301,8 @@ void XGUI_OperationMgr::updateApplyOfOperations(ModuleBase_Operation* theOperati updateApplyOfOperations(anOperation); } } + // Apply button of the current operation should also be updated + onValidateOperation(); } bool XGUI_OperationMgr::canStopOperation(ModuleBase_Operation* theOperation) @@ -339,15 +358,23 @@ void XGUI_OperationMgr::setCurrentFeature(const FeaturePtr& theFeature) DocumentPtr aDoc = aMgr->activeDocument(); bool aIsOp = aMgr->isOperation(); if (!aIsOp) - aMgr->startOperation(QString("Set current feature: %1").arg(theFeature->getKind().c_str()).toStdString()); + aMgr->startOperation(QString("Set current feature: %1") + .arg(theFeature->getKind().c_str()).toStdString()); aDoc->setCurrentFeature(theFeature, false); +#ifdef DEBUG_CURRENT_FEATURE + qDebug(QString(" document->setCurrentFeature(false) = %1 SET").arg( + ModuleBase_Tools::objectName( + ModelAPI_Session::get()->activeDocument()->currentFeature(false))).toStdString().c_str()); +#endif + if (!aIsOp) aMgr->finishOperation(); } -bool XGUI_OperationMgr::canStartOperation(const QString& theId) +bool XGUI_OperationMgr::canStartOperation(const QString& theId, bool& isCommitted) { bool aCanStart = true; + isCommitted = false; ModuleBase_Operation* aCurrentOp = currentOperation(); if (aCurrentOp) { bool aGranted = aCurrentOp->isGranted(theId); @@ -364,11 +391,8 @@ bool XGUI_OperationMgr::canStartOperation(const QString& theId) } else if (canStopOperation(aCurrentOp)) { // the started operation is granted in the parrent operation, - // e.g. current - Line in Sketch, started Circle - if (XGUI_Tools::workshop(myWorkshop)->errorMgr()->isApplyEnabled() && aCurrentOp->isModified()) - aCurrentOp->commit(); - else - abortOperation(aCurrentOp); + // e.g. current - Line in Sketch, started Circle + stopOperation(aCurrentOp, isCommitted); } else { aCanStart = false; } @@ -377,6 +401,16 @@ bool XGUI_OperationMgr::canStartOperation(const QString& theId) return aCanStart; } +void XGUI_OperationMgr::stopOperation(ModuleBase_Operation* theOperation, bool& isCommitted) +{ + if (XGUI_Tools::workshop(myWorkshop)->errorMgr()->isApplyEnabled() && theOperation->isModified()) + isCommitted = theOperation->commit(); + else { + isCommitted = false; + abortOperation(theOperation); + } +} + void XGUI_OperationMgr::abortOperation(ModuleBase_Operation* theOperation) { ModuleBase_Operation* aCurrentOperation = currentOperation(); @@ -419,43 +453,49 @@ void XGUI_OperationMgr::onBeforeOperationStarted() return; /// Set current feature and remeber old current feature - ModuleBase_OperationFeature* aFOperation = dynamic_cast(aCurrentOperation); + 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 + // 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. + // As a result the sketch disappears from the viewer. + // However after commit it is displayed back. aFOperation->setPreviousCurrentFeature(aDoc->currentFeature(false)); #ifdef DEBUG_CURRENT_FEATURE FeaturePtr aFeature = aFOperation->feature(); QString aKind = aFeature ? aFeature->getKind().c_str() : ""; - qDebug(QString("onBeforeOperationStarted(), edit operation = %1, feature = %2") + qDebug(""); + qDebug(QString("onBeforeOperationStarted() isEditOperation = %1, feature = %2") .arg(aFOperation->isEditOperation()) - .arg(ModuleBase_Tools::objectInfo(aFeature)).toStdString().c_str()); - - qDebug(QString("\tdocument->currentFeature(false) = %1").arg( - ModuleBase_Tools::objectInfo(ModelAPI_Session::get()->activeDocument()->currentFeature(false))).toStdString().c_str()); + .arg(ModuleBase_Tools::objectName(aFeature)).toStdString().c_str()); + qDebug(QString(" document->currentFeature(false) = %1 : DO: setPreviousCurrentFeature").arg( + ModuleBase_Tools::objectName(aDoc->currentFeature(false))).toStdString().c_str()); #endif - if (aFOperation->isEditOperation()) // it should be performed by the feature edit only + 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); - #ifdef DEBUG_CURRENT_FEATURE - qDebug("\tdocument->setCurrentFeature"); - qDebug(QString("\tdocument->currentFeature(false) = %1").arg( - ModuleBase_Tools::objectInfo(ModelAPI_Session::get()->activeDocument()->currentFeature(false))).toStdString().c_str()); + qDebug(QString(" document->setCurrentFeature(false) = %1").arg( + ModuleBase_Tools::objectName(aDoc->currentFeature(false))).toStdString().c_str()); #endif - ModuleBase_IModule* aModule = myWorkshop->module(); - if (aModule) - aModule->beforeOperationStarted(aFOperation); + // this is the only place where flushes must be called after setCurrentFeature for the + // current moment: after this the opertion is not finished, so, the ObjectBrowser + // state may be corrupted (issue #1457) + static Events_Loop* aLoop = Events_Loop::loop(); + static Events_ID aCreateEvent = aLoop->eventByName(EVENT_OBJECT_CREATED); + aLoop->flush(aCreateEvent); + static Events_ID aDeleteEvent = aLoop->eventByName(EVENT_OBJECT_DELETED); + aLoop->flush(aDeleteEvent); + } } } @@ -463,7 +503,8 @@ void XGUI_OperationMgr::onOperationStarted() { ModuleBase_Operation* aSenderOperation = dynamic_cast(sender()); updateApplyOfOperations(aSenderOperation); - emit operationStarted(aSenderOperation); + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + aWorkshop->operationStarted(aSenderOperation); } void XGUI_OperationMgr::onBeforeOperationAborted() @@ -484,16 +525,18 @@ void XGUI_OperationMgr::onBeforeOperationCommitted() return; /// Restore the previous current feature - ModuleBase_OperationFeature* aFOperation = dynamic_cast(aCurrentOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(aCurrentOperation); if (aFOperation) { #ifdef DEBUG_CURRENT_FEATURE QString aKind = aFOperation->feature()->getKind().c_str(); - qDebug(QString("onBeforeOperationCommitted(), edit operation = %1, feature = %2") + qDebug(QString("onBeforeOperationCommitted() isEditOperation = %1, feature = %2") .arg(aFOperation->isEditOperation()) - .arg(ModuleBase_Tools::objectInfo(aFOperation->feature())).toStdString().c_str()); - - qDebug(QString("\tdocument->currentFeature(false) = %1").arg( - ModuleBase_Tools::objectInfo(ModelAPI_Session::get()->activeDocument()->currentFeature(false))).toStdString().c_str()); + .arg(ModuleBase_Tools::objectName(aFOperation->feature())).toStdString().c_str()); + qDebug(QString(" document->currentFeature(false) = %1").arg( + ModuleBase_Tools::objectName( + ModelAPI_Session::get()->activeDocument()->currentFeature(false))) + .toStdString().c_str()); #endif if (aFOperation->isEditOperation()) { @@ -501,17 +544,14 @@ void XGUI_OperationMgr::onBeforeOperationCommitted() 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 + // 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()); } -#ifdef DEBUG_CURRENT_FEATURE - qDebug("\tdocument->setCurrentFeature"); - qDebug(QString("\tdocument->currentFeature(false) = %1").arg( - ModuleBase_Tools::objectInfo(ModelAPI_Session::get()->activeDocument()->currentFeature(false))).toStdString().c_str()); -#endif ModuleBase_IModule* aModule = myWorkshop->module(); if (aModule) aModule->beforeOperationStopped(aFOperation); @@ -570,6 +610,33 @@ bool XGUI_OperationMgr::onKeyReleased(QObject *theObject, QKeyEvent* theEvent) ModuleBase_Operation* anOperation = currentOperation(); bool isAccepted = false; switch (theEvent->key()) { + case Qt::Key_Escape: { + ModuleBase_Operation* aOperation = currentOperation(); + if (aOperation) { + onAbortOperation(); + isAccepted = true; + } + } + break; + case Qt::Key_Tab: + case Qt::Key_Backtab: + { + ModuleBase_Operation* aOperation = currentOperation(); + if (aOperation) { + ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel(); + if (aPanel) { + QWidget* aFocusedWidget = qApp->focusWidget(); + bool isPPChildObject = aFocusedWidget && isChildObject(aFocusedWidget, aPanel); + if (!isPPChildObject) { + // check for case when the operation is started but property panel is not filled + XGUI_PropertyPanel* aPP = dynamic_cast(aPanel); + aPP->setFocusNextPrevChild(theEvent->key() == Qt::Key_Tab); + isAccepted = true; + } + } + } + } + break; case Qt::Key_Return: case Qt::Key_Enter: { isAccepted = onProcessEnter(theObject); @@ -610,16 +677,18 @@ bool XGUI_OperationMgr::onProcessEnter(QObject* theObject) if (!aOperation) return isAccepted; ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + // the next code is obsolete as we want to process Enter in property panel always // only property panel enter is processed in order to do not process enter in application dialogs - bool isPPChild = isChildObject(theObject, aPanel); - if (!isPPChild) - return isAccepted; + //bool isPPChild = isChildObject(theObject, aPanel); + //if (!isPPChild) + // return isAccepted; ModuleBase_ModelWidget* anActiveWgt = aPanel->activeWidget(); bool isAborted = false; if (!anActiveWgt) { QWidget* aFocusWidget = aPanel->focusWidget(); - QToolButton* aCancelBtn = aPanel->findChild(PROP_PANEL_CANCEL); + QToolButton* aCancelBtn = + dynamic_cast(aPanel)->findButton(PROP_PANEL_CANCEL); if (aFocusWidget && aCancelBtn && aFocusWidget == aCancelBtn) { abortOperation(aOperation); isAccepted = true; @@ -629,12 +698,16 @@ bool XGUI_OperationMgr::onProcessEnter(QObject* theObject) if (!isAborted) { isAccepted = anActiveWgt && anActiveWgt->processEnter(); if (!isAccepted) { - isAccepted = myWorkshop->module()->processEnter(anActiveWgt ? anActiveWgt->attributeID() : ""); + isAccepted = + myWorkshop->module()->processEnter(anActiveWgt ? anActiveWgt->attributeID() : ""); if (!isAccepted) { /// functionality is similar to Apply click - ModuleBase_OperationFeature* aFOperation = dynamic_cast(currentOperation()); - if (!aFOperation || myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty()) { - // key released is emitted to apply the current value to the model if it was modified in PP + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(currentOperation()); + if (!aFOperation || + myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty()) { + // key released is emitted to apply the current value to the model + // if it was modified in PP emit keyEnterReleased(); commitOperation(); isAccepted = true; @@ -647,6 +720,12 @@ bool XGUI_OperationMgr::onProcessEnter(QObject* theObject) return isAccepted; } +bool editorControl(QObject* theObject) +{ + QLineEdit* aLineEdit = dynamic_cast(theObject); + return aLineEdit; +} + bool XGUI_OperationMgr::onProcessDelete(QObject* theObject) { bool isAccepted = false; @@ -675,12 +754,30 @@ bool XGUI_OperationMgr::onProcessDelete(QObject* theObject) /// processing delete by workshop XGUI_ObjectsBrowser* aBrowser = XGUI_Tools::workshop(myWorkshop)->objectBrowser(); QWidget* aViewPort = myWorkshop->viewer()->activeViewPort(); - // property panel child object is processed to process delete performed on Apply button of PP - if (theObject == aBrowser->treeView() || - isChildObject(theObject, aViewPort) || - isPPChildObject) - XGUI_Tools::workshop(myWorkshop)->deleteObjects(); - isAccepted = true; + bool isToDeleteObject = false; + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + XGUI_ContextMenuMgr* aContextMenuMgr = aWorkshop->contextMenuMgr(); + if (theObject == aBrowser->treeView()) { + aContextMenuMgr->updateObjectBrowserMenu(); + isToDeleteObject = aContextMenuMgr->action("DELETE_CMD")->isEnabled(); + } + else if (isChildObject(theObject, aViewPort)) { + aContextMenuMgr->updateViewerMenu(); + isToDeleteObject = aContextMenuMgr->action("DELETE_CMD")->isEnabled(); + } + else if (isPPChildObject) { + // property panel child object is processed to process delete performed on Apply button of PP + isToDeleteObject = true; + } + else if (editorControl(theObject)) { + isToDeleteObject = false; /// Line Edit of Rename operation in ObjectBrowser + isAccepted = true; + } + + if (isToDeleteObject) { + aWorkshop->deleteObjects(); + isAccepted = true; + } } return isAccepted;