Index: sources/ApplicationController.cpp =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -rfec49d1a8016d25cedff4cf2fefb4c4cd1c7c259 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision fec49d1a8016d25cedff4cf2fefb4c4cd1c7c259) @@ -93,6 +93,8 @@ this , SLOT(onPOSTWiFi (bool))); connect(&_post , SIGNAL( didBluetooth(bool)), this , SLOT(onPOSTBluetooth(bool))); + connect(&_post , SIGNAL( didCloudSync(bool)), + this , SLOT(onPOSTCloudSync(bool))); connect(&_post , SIGNAL( didFail (Gui::GuiAlarmID )), this , SLOT(onPOSTFail (Gui::GuiAlarmID ))); @@ -114,24 +116,32 @@ this , SLOT( onFailedTransmit(Sequence))); // USB drive - connect(&_GuiController , SIGNAL(didUSBDriveUmount()), - this , SLOT( onUSBDriveUmount())); + connect(&_GuiController , SIGNAL(didUSBDriveUmount()), + this , SLOT( onUSBDriveUmount())); connect(&_DeviceController , SIGNAL(didUSBDriveMount ()), this , SLOT( onUSBDriveMount ())); connect(&_DeviceController , SIGNAL(didUSBDriveRemove()), this , SLOT( onUSBDriveRemove())); + connect(&_DeviceController , SIGNAL(didUSBSpaceChange(bool, qint64, qint64, quint8)), + this , SLOT( onUSBSpaceChange(bool, qint64, qint64, quint8))); // SD Card connect(&_DeviceController , SIGNAL(didSDCardStateChange(bool, bool)), this , SLOT( onSDCardStateChange(bool, bool))); + connect(&_DeviceController , SIGNAL(didSDCardSpaceChange(bool, qint64, qint64, quint8)), + this , SLOT( onSDCardSpaceChange(bool, qint64, qint64, quint8))); connect(&_DeviceController , SIGNAL(didSDCardSpaceTooLow(quint8)), this , SLOT( onSDCardSpaceTooLow(quint8))); - connect(&_GuiController , SIGNAL(didExportLog()), - this , SLOT( onExportLog())); + connect(&_GuiController , SIGNAL(didExportLog ()), + this , SLOT( onExportLog ())); + connect(&_GuiController , SIGNAL(didExportService ()), + this , SLOT( onExportService ())); + connect(&_GuiController , SIGNAL(didExportTreatment ()), + this , SLOT( onExportTreatment ())); - connect(&_Logger , SIGNAL(didExportLogs()), - this , SLOT( onExport ())); + connect(&_Logger , SIGNAL(didExportLogs ()), + this , SLOT( onExport ())); // Settings - move to application thread connect(this, SIGNAL(didSettingsInit()), @@ -259,12 +269,15 @@ */ void ApplicationController::onUSBDriveRemove() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually emit didUSBDriveRemove(); } -// disabled coco end +void ApplicationController::onUSBSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) +{ + //DEBUG:0: qDebug() << "ApplicationController::onUSBSpaceChange" << vReady << vTotal << vAvailable << vPercent; + emit didUSBSpaceChange(vReady, vTotal, vAvailable, vPercent); +} + /*! * \brief ApplicationController::onSDCardStateChange * \details This is the slot which connects to the _DeviceController didSDCardStateChange signal @@ -274,13 +287,15 @@ */ void ApplicationController::onSDCardStateChange(bool vIsReady, bool vIsReadOnly) { - // 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; + //DEBUG:0: qDebug() << " ***** ApplicationController " << Storage::SDCard_Base_Path_Name << vIsReady; emit didSDCardStateChange(vIsReady, vIsReadOnly); } -// disabled coco end +void ApplicationController::onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) +{ + emit didSDCardSpaceChange(vReady, vTotal, vAvailable, vPercent); +} + /*! * \brief ApplicationController::onSDCardSpaceTooLow * \details The handler slot for the didSDCardSpaceTooLow signal comes form DeviceController @@ -300,11 +315,24 @@ */ void ApplicationController::onExportLog() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually - LOG_EXPORT; + LOG_EXPORTLOG; } -// disabled coco end +/*! + * \brief ApplicationController::onExportService + * \details the slot which will be called by UI to do the service log export. + */ +void ApplicationController::onExportService() +{ + LOG_EXPORTERR; +} +/*! + * \brief ApplicationController::onExportTreatment + * \details the slot which will be called by UI to do the treatment treatment log export. + */ +void ApplicationController::onExportTreatment() +{ + LOG_EXPORTTRT; +} /*! * \brief ApplicationController::onExport @@ -507,7 +535,6 @@ emit didSettingsDone(); } - /*! * \brief ApplicationController::onPOSTWiFi * \details Starts the WiFi Interface @@ -516,6 +543,7 @@ if (vPass) { _WifiInterface.doStart(); } + emit didPOSTWiFi(vPass); } /*! @@ -529,9 +557,18 @@ } else { _BluetoothInterface.doNotifyStatePOSTError(); + emit didPOSTBluetooth(vPass); } } +/*! + * \brief ApplicationController::onPOSTCloudSync + * \details Notifies the CloudSync POST status + */ +void ApplicationController::onPOSTCloudSync(bool vPass) +{ + emit didPOSTCloudSync(vPass); +} /*! * \brief ApplicationController::onPOSTFail