Index: sources/ApplicationController.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4a67c01045f365be38f1a12a8572c0070d343e1e --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 4a67c01045f365be38f1a12a8572c0070d343e1e) @@ -75,11 +75,11 @@ */ void ApplicationController::quit() { - // coco begin validated: Application termination is not correctly done in coco!!! + // disabled coco begin validated: Application termination is not correctly done in coco!!! // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// coco end +// disabled coco end /*! * \brief ApplicationController::initConnections @@ -173,15 +173,15 @@ */ void ApplicationController::quitThread() { - // coco begin validated: Application termination is not correctly done in coco!!! + // disabled coco begin validated: Application termination is not correctly done in coco!!! // it has been tested and works perfectly fine in normal run. if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// coco end +// disabled coco end /*! * \brief ApplicationController::onFailedTransmit @@ -233,11 +233,11 @@ */ void ApplicationController::onUSBDriveMount () { - // coco begin validated: This needs user interaction to plug-in USB device + // disabled coco begin validated: This needs user interaction to plug-in USB device // has been tested manually emit didUSBDriveMount(); } -// coco end +// disabled coco end /*! * \brief ApplicationController::onUSBDriveRemove @@ -246,11 +246,11 @@ */ void ApplicationController::onUSBDriveUmount() { - // coco begin validated: This needs user interaction to plug-in USB device + // disabled coco begin validated: This needs user interaction to plug-in USB device // has been tested manually emit didUSBDriveUmount(); } -// coco end +// disabled coco end /*! * \brief ApplicationController::onUSBDriveRemove @@ -259,11 +259,11 @@ */ void ApplicationController::onUSBDriveRemove() { - // coco begin validated: This needs user interaction to plug-in USB device + // disabled coco begin validated: This needs user interaction to plug-in USB device // has been tested manually emit didUSBDriveRemove(); } -// coco end +// disabled coco end /*! * \brief ApplicationController::onSDCardStateChange @@ -274,12 +274,12 @@ */ void ApplicationController::onSDCardStateChange(bool vIsReady, bool vIsReadOnly) { - // coco begin validated: This needs user interaction to plug-in SD Card + // disabled coco begin validated: This needs user interaction to plug-in SD Card // has been tested manually /// DEBUG: qDebug() << " ***** ApplicationController " << Storage::SDCard_Base_Path_Name << vIsReady; emit didSDCardStateChange(vIsReady, vIsReadOnly); } -// coco end +// disabled coco end /*! * \brief ApplicationController::onSDCardSpaceTooLow @@ -288,35 +288,35 @@ */ void ApplicationController::onSDCardSpaceTooLow(quint8 vAvailablePercent) { - // coco begin validated: This needs user interaction to plug-in SD Card + // disabled coco begin validated: This needs user interaction to plug-in SD Card // has been tested manually emit didSDCardSpaceTooLow(vAvailablePercent); } -// coco end +// disabled coco end /*! * \brief ApplicationController::onExportLog * \details the slot which will be called by UI to so the log export. */ void ApplicationController::onExportLog() { - // coco begin validated: This needs user interaction to plug-in USB device + // disabled coco begin validated: This needs user interaction to plug-in USB device // has been tested manually LOG_EXPORT; } -// coco end +// disabled coco end /*! * \brief ApplicationController::onExport * \details the slot which will be called by logger is done exporting. */ void ApplicationController::onExport() { - // coco begin validated: This needs user interaction to plug-in USB device + // disabled coco begin validated: This needs user interaction to plug-in USB device // has been tested manually emit didExport(); } -// coco end +// disabled coco end /*! * \brief ApplicationController::keepAlive @@ -339,7 +339,7 @@ createFakeSequencedLongMessage (mData, mFakeDataLen); } } - // coco end + // disabled coco end else { mData += static_cast(GuiActionData::NoData); } @@ -355,7 +355,7 @@ */ void ApplicationController::createFakeSequencedLongMessage(QVariantList &vData, const int vFakeDataLen) { - // coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing + // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing // will never be executed on the product // has been tested manually QByteArray data; @@ -401,7 +401,7 @@ vData += gFakeData; } } -// coco end +// disabled coco end /*! * \brief ApplicationController::createFakeSequencedAtBeginLongMessage @@ -411,7 +411,7 @@ */ void ApplicationController::createFakeSeqAtBeginLongMessage(QVariantList &vData, const int vFakeDataLen) { - // coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing + // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing // will never be executed on the product // has been tested manually QByteArray data; @@ -462,7 +462,7 @@ vData += gFakeData; } } -// coco end +// disabled coco end /*! * \brief ApplicationController::initSettings @@ -500,6 +500,10 @@ void ApplicationController::onSettingsUpdate() { onActionReceive(SettingsData()); + + // call initialization functions when setting's ready. + _Settings.datetimeFormat(); + emit didSettingsDone(); } @@ -535,7 +539,7 @@ * \param vAlarmID */ void ApplicationController::onPOSTFail(GuiAlarmID vAlarmID) { - emit didActionTransmit(GuiActionType::ID_AlarmTriggered, {vAlarmID ,0,0,0,0}); + emit didActionTransmit(GuiActionType::ID_AlarmTriggered, {vAlarmID ,0,0,0,0,0,0,0}); } /*!