From: Cédric Aguerre Date: Wed, 20 Apr 2016 07:35:46 +0000 (+0200) Subject: Merge branch 'master' into abn/qtesting X-Git-Tag: V8_1_0b1~26^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b01115dc855ba447124feec6f9640c8f58c72b70;p=modules%2Fmed.git Merge branch 'master' into abn/qtesting --- b01115dc855ba447124feec6f9640c8f58c72b70 diff --cc idl/MEDEventListener.idl index 77fcc8fa3,73d8b9be7..97a84d6f1 --- a/idl/MEDEventListener.idl +++ b/idl/MEDEventListener.idl @@@ -34,8 -34,7 +34,9 @@@ module MEDCAL EVENT_CLEAN_WORKSPACE, EVENT_ADD_DATASOURCE, EVENT_ADD_PRESENTATION, + EVENT_REMOVE_PRESENTATION, + EVENT_PLAY_TEST, + EVENT_QUIT_SALOME, EVENT_UNKNOWN }; diff --cc src/MEDCalc/gui/MEDModule.cxx index 7b8ffb2e1,448cc7f04..cb0c4703e --- a/src/MEDCalc/gui/MEDModule.cxx +++ b/src/MEDCalc/gui/MEDModule.cxx @@@ -381,17 -348,9 +381,22 @@@ MEDModule::onDblClick(const QModelIndex STDLOG(" - Field id: " + oss.str()); STDLOG(" - Presentation name: " + name); + // :TODO: + // get edited values from a popup widget + // get presentation + // call presentation edit function + } + +void +MEDModule::requestSALOMETermination() const +{ + STDLOG("Requesting SALOME termination!!"); + SUIT_Session::session()->closeSession( SUIT_Session::DONT_SAVE, 1 ); // killServers = True +} + + +//bool MEDModule::hasMainEventLoopStarted() const +//{ +// return _eventLoopStarted; +//} diff --cc src/MEDCalc/gui/WorkspaceController.cxx index 223eb7815,b85ea1f9d..b5c3d008d --- a/src/MEDCalc/gui/WorkspaceController.cxx +++ b/src/MEDCalc/gui/WorkspaceController.cxx @@@ -308,14 -306,12 +308,17 @@@ void WorkspaceController::processMedEve emit workspaceSignal(event); // forward to DatasourceController } else if ( event->type == MEDCALC::EVENT_ADD_PRESENTATION ) { - emit workspaceSignal(event); // forward to DatasourceController + emit workspaceSignal(event); // forward to PresentationController + } + else if ( event->type == MEDCALC::EVENT_REMOVE_PRESENTATION ) { + emit workspaceSignal(event); // forward to PresentationController } - + else if ( event->type == MEDCALC::EVENT_PLAY_TEST ) { + emit workspaceSignal(event); // forward to TestController + } + else if ( event->type == MEDCALC::EVENT_QUIT_SALOME ) { + emit workspaceSignal(event); // forward to TestController + } } /*! diff --cc src/MEDCalc/tui/medevents.py index 6c3c28d71,3db24ca00..2c819f6b3 --- a/src/MEDCalc/tui/medevents.py +++ b/src/MEDCalc/tui/medevents.py @@@ -115,9 -115,6 +115,11 @@@ def notifyGui_addDatasource(handlerId, def notifyGui_addPresentation(fieldId, presId): __notifyGui(MEDCALC.EVENT_ADD_PRESENTATION, dataId=fieldId, presentationId=presId) # + def notifyGui_removePresentation(presId): + __notifyGui(MEDCALC.EVENT_REMOVE_PRESENTATION, presentationId=presId) + # +def notifyGui_playQtTestingScenario(filename): + __notifyGui(MEDCALC.EVENT_PLAY_TEST, filename=filename) +# +def notifyGui_termination(): + __notifyGui(MEDCALC.EVENT_QUIT_SALOME) -