From 34f401890d4f21c13cceef473afb8fee6c0a9b59 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 28 Aug 2015 07:51:01 +0300 Subject: [PATCH] Issue #862: abort operations on save --- src/NewGeom/NewGeom_Module.cpp | 8 ++++++++ src/NewGeom/NewGeom_Module.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/NewGeom/NewGeom_Module.cpp b/src/NewGeom/NewGeom_Module.cpp index 71bde789c..dae10ab34 100644 --- a/src/NewGeom/NewGeom_Module.cpp +++ b/src/NewGeom/NewGeom_Module.cpp @@ -123,7 +123,10 @@ void NewGeom_Module::initialize(CAM_Application* theApp) myWorkshop->startApplication(); LightApp_Application* anApp = dynamic_cast(theApp); if (anApp) + { connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences())); + connect(anApp, SIGNAL(abortAllOperations( bool& )), this, SLOT(onAbortAllOperations( bool& ))); + } } //****************************************************** @@ -622,3 +625,8 @@ void NewGeom_Module::inspectSalomeModules() Config_ModuleReader::addDependencyModule(eachModule.toStdString()); } } + +void NewGeom_Module::onAbortAllOperations( bool& isNextOperationAllowed ) +{ + isNextOperationAllowed = workshop()->operationMgr()->abortAllOperations(); +} diff --git a/src/NewGeom/NewGeom_Module.h b/src/NewGeom/NewGeom_Module.h index 0ba1345b7..2275931fe 100644 --- a/src/NewGeom/NewGeom_Module.h +++ b/src/NewGeom/NewGeom_Module.h @@ -157,6 +157,8 @@ Q_OBJECT /// Obtains the current application and updates its actions void onUpdateCommandStatus(); + void onAbortAllOperations( bool& ); + protected: /// Create data model CAM_DataModel* createDataModel(); -- 2.39.2