X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_OperationMgr.cpp;h=42f892d212103f2d37bebefb575461c1d6c767d5;hb=fac255fcec3913e743169b3c207f28ca1303a0ff;hp=61adc99ea80937249f3c07a803ca494ad3c98561;hpb=410f0c3d028be602c474a6ee64b8d3a7a32afb25;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp index 61adc99ea..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" @@ -58,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); @@ -80,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 @@ -171,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()) @@ -351,6 +361,12 @@ void XGUI_OperationMgr::setCurrentFeature(const FeaturePtr& theFeature) 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(); } @@ -456,19 +472,21 @@ void XGUI_OperationMgr::onBeforeOperationStarted() #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 // in create operation, the current feature is changed by addFeature() aDoc->setCurrentFeature(aFOperation->feature(), false); +#ifdef DEBUG_CURRENT_FEATURE + qDebug(QString(" document->setCurrentFeature(false) = %1").arg( + ModuleBase_Tools::objectName(aDoc->currentFeature(false))).toStdString().c_str()); +#endif // 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) @@ -478,14 +496,6 @@ void XGUI_OperationMgr::onBeforeOperationStarted() static Events_ID aDeleteEvent = aLoop->eventByName(EVENT_OBJECT_DELETED); aLoop->flush(aDeleteEvent); } - -#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 } } @@ -520,12 +530,11 @@ void XGUI_OperationMgr::onBeforeOperationCommitted() 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( + .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 @@ -543,13 +552,6 @@ void XGUI_OperationMgr::onBeforeOperationCommitted() 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); @@ -608,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); @@ -648,10 +677,11 @@ 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;