Index: denali.pro.user =================================================================== diff -u -r97fc44f948bd39ed0b4238558a16bf99f750bf5e -ra19862d191c2501faa4e8cde64804ef18b80c6b3 --- denali.pro.user (.../denali.pro.user) (revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e) +++ denali.pro.user (.../denali.pro.user) (revision a19862d191c2501faa4e8cde64804ef18b80c6b3) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 1 0 0 @@ -1185,7 +1185,7 @@ false true - /home/denali/projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release 1 Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r772d48b0ccaa0d25b6ed48bba3a4b29dc73c5c16 -ra19862d191c2501faa4e8cde64804ef18b80c6b3 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 772d48b0ccaa0d25b6ed48bba3a4b29dc73c5c16) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision a19862d191c2501faa4e8cde64804ef18b80c6b3) @@ -183,82 +183,90 @@ vPayload.clear(); int count = vData.length(); + LOG_EVENT(QString("%0").arg(vActionId)); + switch (vActionId) { // notice we are in transmit mode - case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len - break; // No data, Just registered + case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len + break; // No data, Just registered + case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len + { + if ( count ) { // this message has a variable length + vPayload = Format::fromVariant(vData[0]); + } + LOG_EVENT(mSenderID + QString("CheckIn")); + } break; - case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len - if ( count ) { // this message has a variable length - vPayload = Format::fromVariant(vData[0]); - } - LOG_EVENT(mSenderID + QString("CheckIn")); - break; + case Gui::GuiActionType::ID_RawData: // len: 255, can have any len + { + if ( count ) { // this message has a variable length + vPayload = Format::fromVariant(vData[0]); + } + LOG_EVENT(mSenderID + QString("RawData")); - case Gui::GuiActionType::ID_RawData: // len: 255, can have any len - if ( count ) { // this message has a variable length - vPayload = Format::fromVariant(vData[0]); - } - LOG_EVENT(mSenderID + QString("RawData")); - break; + } break; - case Gui::GuiActionType::ID_PowerOff: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload += Format::fromVariant(vData); - LOG_EVENT(AdjustPowerOffRequestData::toString(vData)); - break; + case Gui::GuiActionType::ID_PowerOff: + { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload += Format::fromVariant(vData); + LOG_EVENT(AdjustPowerOffRequestData::toString(vData)); - case Gui::GuiActionType::ID_AdjustBloodDialysateReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData)); - break; + } break; - case Gui::GuiActionType::ID_AdjustDurationReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - LOG_EVENT(AdjustDurationRequestData::toString(vData)); - break; + case Gui::GuiActionType::ID_AdjustBloodDialysateReq: + { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData)); + } break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData)); - break; + case Gui::GuiActionType::ID_AdjustDurationReq: + { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AdjustDurationRequestData::toString(vData)); + } break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData)); - break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq: { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData)); + } break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData)); - break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq: { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData)); + } break; - case Gui::GuiActionType::ID_AlarmSilenceReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - LOG_EVENT(AlarmSilenceRequestData::toString(vData)); - break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq: { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData)); + } break; - case Gui::GuiActionType::ID_CreateTreatmentReq: { - if ( ! count ) { logInvalidLength(vActionId); return false; } - vPayload = Format::fromVariant(vData); - TreatmentParameters params; - params.fromVariantList(vData); - LOG_EVENT(params.toString()); - break; - } + case Gui::GuiActionType::ID_AlarmSilenceReq: { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AlarmSilenceRequestData::toString(vData)); + } break; - default: - QString mActionIdHexString = Format::toHexString(vActionId); - LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); - ok = false; - break; + case Gui::GuiActionType::ID_CreateTreatmentReq: { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + TreatmentParameters params; + params.fromVariantList(vData); + LOG_EVENT("GOT HERE"); + LOG_EVENT(params.toString()); + } break; + default: { + QString mActionIdHexString = Format::toHexString(vActionId); + LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); + ok = false; + } break; + } return ok; } Index: sources/model/MModel.h =================================================================== diff -u -rd1907168ef46faa6de1ada400cad789f8379041f -ra19862d191c2501faa4e8cde64804ef18b80c6b3 --- sources/model/MModel.h (.../MModel.h) (revision d1907168ef46faa6de1ada400cad789f8379041f) +++ sources/model/MModel.h (.../MModel.h) (revision a19862d191c2501faa4e8cde64804ef18b80c6b3) @@ -230,8 +230,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersRespData ) + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) + //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ Index: sources/storage/filesaver.cpp =================================================================== diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -ra19862d191c2501faa4e8cde64804ef18b80c6b3 --- sources/storage/filesaver.cpp (.../filesaver.cpp) (revision c71deaab48699cffdf9db816dfac2778d79c2238) +++ sources/storage/filesaver.cpp (.../filesaver.cpp) (revision a19862d191c2501faa4e8cde64804ef18b80c6b3) @@ -22,7 +22,6 @@ * @param filename (QString) contains the path to the file to be written to * @param content (QString) the content to write to the file * @param append (bool) if True, append the content. Otherwise, overwrite it - * @return (int) the job ID number, emitted by this class once the file has been saved */ void FileSaver::concurrentSave(const QString &filename, const QString &content, bool append) { @@ -32,9 +31,11 @@ /** * @brief FileSaver::onFileSaved - * Emits a QPair, true if the save was succesful and the job id of the file that has been saved + * Emits when the file save operation is complete and true if the save was successful, false otherwise */ void FileSaver::onFileSaved() { + // coco begin validated: Has been validated manually emit fileSaved(_futureWatcher.result()); } +// coco end Index: sources/view/VCreateTreatment.cpp =================================================================== diff -u -rf3b164487b1648637f5dd9a306cb6ade763d27c9 -ra19862d191c2501faa4e8cde64804ef18b80c6b3 --- sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) +++ sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision a19862d191c2501faa4e8cde64804ef18b80c6b3) @@ -262,7 +262,7 @@ * \param messageData The message data must contain the reject reason codes for all parameters * \returns True if FW OK's treatment parameters, false otherwise */ -bool VCreateTreatment::onFWValidationResponse(GuiActionType actionType, QVariantList messageData) { +bool VCreateTreatment::onFWValidationResponse(const GuiActionType &actionType, const QVariantList &messageData) { if (actionType != GuiActionType::ID_CreateTreatmentRsp) return false; Index: sources/view/VCreateTreatment.h =================================================================== diff -u -rf3b164487b1648637f5dd9a306cb6ade763d27c9 -ra19862d191c2501faa4e8cde64804ef18b80c6b3 --- sources/view/VCreateTreatment.h (.../VCreateTreatment.h) (revision f3b164487b1648637f5dd9a306cb6ade763d27c9) +++ sources/view/VCreateTreatment.h (.../VCreateTreatment.h) (revision a19862d191c2501faa4e8cde64804ef18b80c6b3) @@ -122,11 +122,11 @@ void onFinishedSaveNewTreatment(bool result); signals: - void didCreateTreatment(TreatmentData); + void didCreateTreatment(const TreatmentData &data); void showConfirm(); void showPrime(); void showBegin(); - void validateParamsWithFW(GuiActionType,QVariantList); + void validateParamsWithFW(const GuiActionType &action, const QVariantList &data); void resetCreateTreatment(); void fwValidationFailed(QString reason); @@ -136,7 +136,7 @@ void onFinishedConfirm(); void onFinishedPrime(); void onStart(); - bool onFWValidationResponse(GuiActionType actionType, QVariantList messageData); + bool onFWValidationResponse(const GuiActionType &actionType, const QVariantList &messageData); void onUserModifiedParameters(); };