Index: sources/ApplicationController.cpp =================================================================== diff -u -r5a248f0a45889844aa027f4f4a0661aa539975f0 -r1cfa9a2d55e3bf954e5d02f12b73d3a8deda9e5c --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 5a248f0a45889844aa027f4f4a0661aa539975f0) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 1cfa9a2d55e3bf954e5d02f12b73d3a8deda9e5c) @@ -24,7 +24,11 @@ //#include "FileHandler.h" #include "Settings.h" #include "MSettings.h" +#include "StateController.h" + +// TODO: Clean up APPLICATION CONTROLLER + /*! * \brief ApplicationController::ApplicationController * \details Constructor @@ -75,6 +79,11 @@ // it has been tested and works perfectly fine in normal run. quitThread(); // validated } + +void ApplicationController::doUnhandledMsgAppController(const QVariantList &msg) +{ + emit didUnhandledMsgAppController(msg); +} // disabled coco end /*! @@ -102,6 +111,9 @@ connect(&_settingsWatcher, SIGNAL(finished ()), this , SLOT(onSettingsUpdate())); + + connect(&_MessageDispatcher, SIGNAL(didUnhandledMsgDispatcher(const QVariantList &)), + this , SLOT(doUnhandledMsgAppController(const QVariantList &))); } /*! @@ -394,30 +406,8 @@ */ void ApplicationController::onSettingsUpdate() { - // TODO add new things - /* - onActionReceive(SettingsData()); - - /// POST /// - //call initialization functions when setting's ready. - //TODO move the initSettig in the Application POST since it is part of the post. _settingsError = _settingsWatcher.result(); - //DEBUG qDebug() << " ***** " << sender() << _settingsError; - _post.isDone( ! _settingsError ); - if ( _settingsError ) { - LOG_APPED_PO(QString("Settings read failed")); - alarmTrigger(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD); - } else { - _Settings.datetimeFormat(); - } - - // this singal can be emmited here [ others are postponed to the onTreatmentRangesDone ] - // here we know the CRC was fine with not empty configuration and all files can be read. - emit didSettingsDone( ); // MessageDispatcher -> MessageInterpreter : updateUnhandledMessages - */ - qDebug() << "Call"; - _settingsError = _settingsWatcher.result(); - emit didSettingsDone( ); // MessageDispatcher -> MessageInterpreter : updateUnhandledMessag + emit didSettingsDone(); // MessageDispatcher -> MessageInterpreter : updateUnhandledMessag } /*!