#include "XGUI_ModuleConnector.h"
#include "XGUI_Workshop.h"
#include "XGUI_ErrorMgr.h"
+#include "XGUI_Tools.h"
+#include "XGUI_ObjectsBrowser.h"
#include <ModuleBase_IPropertyPanel.h>
#include <ModuleBase_ModelWidget.h>
//#define DEBUG_CURRENT_FEATURE
+/// Processes "Delete" key event of application. This key is used by several application actions.
+/// There is a logical order of the actions processing. So the key can not be set for actions
+/// as a shortcut. The class listens the key event and call operation manager processor.
+class XGUI_ShortCutListener : public QObject
+{
+public:
+ /// Constructor
+ /// \param theParent the parent to be deleted when the parent is deleted
+ /// \param theOperationMgr the class to perform deletion
+ XGUI_ShortCutListener(QObject* theParent, XGUI_OperationMgr* theOperationMgr)
+ : QObject(theParent), myOperationMgr(theOperationMgr)
+ {
+ qApp->installEventFilter(this);
+ }
+ ~XGUI_ShortCutListener() {}
+
+ /// Switch on short cut listener
+ void setActive(const bool theIsActive) { myIsActive = theIsActive; }
+
+ /// Redefinition of virtual function to process Delete key release
+ virtual bool eventFilter(QObject *theObject, QEvent *theEvent)
+ {
+ bool isAccepted = false;
+ if (myIsActive && theEvent->type() == QEvent::KeyRelease) {
+ QKeyEvent* aKeyEvent = dynamic_cast<QKeyEvent*>(theEvent);
+ if(aKeyEvent) {
+ switch (aKeyEvent->key()) {
+ case Qt::Key_Delete: {
+ isAccepted = myOperationMgr->onProcessDelete(theObject);
+ }
+ }
+ }
+ }
+ if (!isAccepted)
+ isAccepted = QObject::eventFilter(theObject, theEvent);
+ return isAccepted;
+ }
+
+private:
+ XGUI_OperationMgr* myOperationMgr; /// processor for key event
+ bool myIsActive; /// boolean state whether the event filter perform own signal processing
+};
+
XGUI_OperationMgr::XGUI_OperationMgr(QObject* theParent,
ModuleBase_IWorkshop* theWorkshop)
: QObject(theParent), myWorkshop(theWorkshop)
/// 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
/// the actions priority
- //qApp->installEventFilter(this);
+ myShortCutListener = new XGUI_ShortCutListener(theParent, this);
}
XGUI_OperationMgr::~XGUI_OperationMgr()
{
}
+void XGUI_OperationMgr::activate()
+{
+ myShortCutListener->setActive(true);
+}
+
+void XGUI_OperationMgr::deactivate()
+{
+ myShortCutListener->setActive(false);
+}
+
ModuleBase_Operation* XGUI_OperationMgr::currentOperation() const
{
return myOperations.count() > 0 ? myOperations.last() : 0;
bool isAccepted = false;
if (theEvent->type() == QEvent::KeyRelease) {
QKeyEvent* aKeyEvent = dynamic_cast<QKeyEvent*>(theEvent);
- if(aKeyEvent) {
- isAccepted = onKeyReleased(aKeyEvent);
- }
+ if(aKeyEvent)
+ isAccepted = onKeyReleased(theObject, aKeyEvent);
}
if (!isAccepted)
isAccepted = QObject::eventFilter(theObject, theEvent);
connect(theOperation, SIGNAL(stopped()), SLOT(onOperationStopped()));
connect(theOperation, SIGNAL(resumed()), SLOT(onOperationResumed()));
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
- (theOperation);
- if (aFOperation)
- connect(aFOperation, SIGNAL(activatedByPreselection()),
- SIGNAL(operationActivatedByPreselection()));
bool isStarted = theOperation->start();
if (isStarted)
bool XGUI_OperationMgr::commitAllOperations()
{
- bool isCompositeCommitted = false;
+ bool isCompositeCommitted = false, anOperationProcessed = false;
while (hasOperation()) {
ModuleBase_Operation* anOperation = currentOperation();
- if (workshop()->errorMgr()->isApplyEnabled()) {
- onCommitOperation();
+ if (XGUI_Tools::workshop(myWorkshop)->errorMgr()->isApplyEnabled()) {
+ anOperationProcessed = onCommitOperation();
} else {
abortOperation(anOperation);
+ anOperationProcessed = true;
}
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(anOperation);
if (isCompositeCommitted)
break;
}
+ // not processed[committed] operation might be used in composite feature,
+ // so the while will be stopped by the previous check.
+ // this code is not necessary, but logically should be done when the processing will not
+ // be done for not composite feature by some reasons
+ if (!anOperationProcessed)
+ break;
}
return true;
}
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(currentOperation());
if(aFOperation && aFOperation->feature().get())
- workshop()->errorMgr()->updateActions(aFOperation->feature());
+ XGUI_Tools::workshop(myWorkshop)->errorMgr()->updateActions(aFOperation->feature());
}
void XGUI_OperationMgr::updateApplyOfOperations(ModuleBase_Operation* theOperation)
{
- XGUI_ErrorMgr* anErrorMgr = workshop()->errorMgr();
+ XGUI_ErrorMgr* anErrorMgr = XGUI_Tools::workshop(myWorkshop)->errorMgr();
if (theOperation) {
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (aFOperation)
bool XGUI_OperationMgr::commitOperation()
{
- if (hasOperation() && currentOperation()->isValid()) {
- onCommitOperation();
- return true;
- }
- return false;
+ //if (hasOperation() && currentOperation()->isValid()) {
+ // onCommitOperation();
+ // return true;
+ //}
+ //return false;
+ return onCommitOperation();
}
void XGUI_OperationMgr::resumeOperation(ModuleBase_Operation* theOperation)
DocumentPtr aDoc = aMgr->activeDocument();
bool aIsOp = aMgr->isOperation();
if (!aIsOp)
- aMgr->startOperation();
+ aMgr->startOperation(QString("Set current feature: %1").arg(theFeature->getKind().c_str()).toStdString());
aDoc->setCurrentFeature(theFeature, false);
if (!aIsOp)
aMgr->finishOperation();
else if (canStopOperation(aCurrentOp)) {
// the started operation is granted in the parrent operation,
// e.g. current - Line in Sketch, started Circle
- if (workshop()->errorMgr()->isApplyEnabled() && aCurrentOp->isModified())
+ if (XGUI_Tools::workshop(myWorkshop)->errorMgr()->isApplyEnabled() && aCurrentOp->isModified())
aCurrentOp->commit();
else
abortOperation(aCurrentOp);
}
}
-void XGUI_OperationMgr::onCommitOperation()
+bool XGUI_OperationMgr::onCommitOperation()
{
+ bool isCommitted = false;
ModuleBase_Operation* anOperation = currentOperation();
- if (anOperation)
- anOperation->commit();
+ if (anOperation && myWorkshop->module()->canCommitOperation())
+ isCommitted = anOperation->commit();
+ return isCommitted;
}
void XGUI_OperationMgr::onAbortOperation()
}
}
-bool XGUI_OperationMgr::onKeyReleased(QKeyEvent* theEvent)
+bool XGUI_OperationMgr::onKeyReleased(QObject *theObject, QKeyEvent* theEvent)
{
// Let the manager decide what to do with the given key combination.
ModuleBase_Operation* anOperation = currentOperation();
switch (theEvent->key()) {
case Qt::Key_Return:
case Qt::Key_Enter: {
- isAccepted = onProcessEnter();
+ isAccepted = onProcessEnter(theObject);
}
break;
case Qt::Key_N:
}
}
}
- case Qt::Key_Delete: {
- isAccepted = onProcessDelete();
- }
break;
break;
default:
return isAccepted;
}
-bool XGUI_OperationMgr::onProcessEnter()
+bool XGUI_OperationMgr::onProcessEnter(QObject* theObject)
{
bool isAccepted = false;
ModuleBase_Operation* aOperation = currentOperation();
+ // to avoid enter processing when operation has not been started yet
+ if (!aOperation)
+ return isAccepted;
ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+ // 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;
+
ModuleBase_ModelWidget* anActiveWgt = aPanel->activeWidget();
bool isAborted = false;
if (!anActiveWgt) {
return isAccepted;
}
-bool XGUI_OperationMgr::onProcessDelete()
+bool XGUI_OperationMgr::onProcessDelete(QObject* theObject)
{
bool isAccepted = false;
ModuleBase_Operation* aOperation = currentOperation();
ModuleBase_ModelWidget* anActiveWgt = 0;
+ // firstly the widget should process Delete action
+ ModuleBase_IPropertyPanel* aPanel;
+ bool isPPChildObject = false;
if (aOperation) {
- ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
- if (aPanel)
- anActiveWgt = aPanel->activeWidget();
+ aPanel = aOperation->propertyPanel();
+ if (aPanel) {
+ isPPChildObject = isChildObject(theObject, aPanel);
+ // process delete in active widget only if delete sender is child of property panel
+ // it is necessary for the case when OB is shown, user perform selection and click Delete
+ if (isPPChildObject) {
+ anActiveWgt = aPanel->activeWidget();
+ if (anActiveWgt) {
+ isAccepted = anActiveWgt->processDelete();
+ }
+ }
+ }
}
- if (anActiveWgt)
- isAccepted = anActiveWgt->processDelete();
if (!isAccepted) {
- workshop()->deleteObjects();
+ // after widget, object browser and viewer should process delete
+ /// other widgets such as line edit controls should not lead to
+ /// 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;
}
return isAccepted;
}
-XGUI_Workshop* XGUI_OperationMgr::workshop() const
+bool XGUI_OperationMgr::isChildObject(const QObject* theObject, const QObject* theParent)
{
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- return aConnector->workshop();
+ bool isPPChild = false;
+ if (theParent && theObject) {
+ QObject* aParent = (QObject*)theObject;
+ while (aParent ) {
+ isPPChild = aParent == theParent;
+ if (isPPChild)
+ break;
+ aParent = aParent->parent();
+ }
+ }
+ return isPPChild;
}
-