Index: sources/ApplicationController.cpp =================================================================== diff -u -r787e08545efa12ddc8383de8b973ab9762de0853 -r36eb748ea49a98f902914a6808bb9c0fd23c7358 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 787e08545efa12ddc8383de8b973ab9762de0853) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 36eb748ea49a98f902914a6808bb9c0fd23c7358) @@ -133,15 +133,17 @@ connect(&_DeviceController , SIGNAL(didSDCardSpaceTooLow(quint8)), this , SLOT( onSDCardSpaceTooLow(quint8))); - connect(&_GuiController , SIGNAL(didExportLog ()), - this , SLOT( onExportLog ())); - connect(&_GuiController , SIGNAL(didExportService ()), - this , SLOT( onExportService ())); - connect(&_GuiController , SIGNAL(didExportTreatment ()), - this , SLOT( onExportTreatment ())); + connect(&_GuiController , SIGNAL(didExportLog (const GuiStringIndexMap &)), + this , SLOT( onExportLog (const GuiStringIndexMap &))); + connect(&_GuiController , SIGNAL(didExportService (const GuiStringIndexMap &)), + this , SLOT( onExportService (const GuiStringIndexMap &))); + connect(&_GuiController , SIGNAL(didExportTreatment (const GuiStringIndexMap &)), + this , SLOT( onExportTreatment (const GuiStringIndexMap &))); connect(&_Logger , SIGNAL(didExportLogs ()), this , SLOT( onExport ())); + connect(&_Logger , SIGNAL(didExportStat (quint32, const QString &, quint8)), + this , SLOT( onExportStat (quint32, const QString &, quint8))); // Settings - move to application thread connect(this, SIGNAL(didSettingsInit()), @@ -313,25 +315,25 @@ * \brief ApplicationController::onExportLog * \details the slot which will be called by UI to so the log export. */ -void ApplicationController::onExportLog() +void ApplicationController::onExportLog(const GuiStringIndexMap &vExportList) { - LOG_EXPORTLOG; + LOG_EXPORTLOG(vExportList); } /*! * \brief ApplicationController::onExportService * \details the slot which will be called by UI to do the service log export. */ -void ApplicationController::onExportService() +void ApplicationController::onExportService(const GuiStringIndexMap &vExportList) { - LOG_EXPORTERR; + LOG_EXPORTERR(vExportList); } /*! * \brief ApplicationController::onExportTreatment * \details the slot which will be called by UI to do the treatment treatment log export. */ -void ApplicationController::onExportTreatment() +void ApplicationController::onExportTreatment(const GuiStringIndexMap &vExportList) { - LOG_EXPORTTRT; + LOG_EXPORTTRT(vExportList); } /*! @@ -344,6 +346,12 @@ // has been tested manually emit didExport(); } + +void ApplicationController::onExportStat(quint32 vIndex, const QString &vFileName, quint8 vPercent) +{ + // DEBUG: qDebug() << "1" << vIndex << vFileName << vPercent; + emit didExportStat(vIndex, vFileName, vPercent); +} // disabled coco end /*!