Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r0174cd0f5d8788c28d7d3b7e8f63df249380232f -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 0174cd0f5d8788c28d7d3b7e8f63df249380232f) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -257,7 +257,7 @@ case Gui::GuiActionType::ID_CreateTreatmentReq: { if ( ! count ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); - MTreatmentParameters params; + MAdjustTreatmentParametersRequest params; params.fromVariantList(vData); LOG_EVENT(params.toString()); } break; @@ -609,7 +609,7 @@ if ( ! isType (vMessage, Gui::GuiActionType::ID_CreateTreatmentRsp) ) return ok; if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::ID_CreateTreatmentRsp) ) return ok; - Model::MTreatmentParametersResp mData; + Model::MTreatmentParametersResponse mData; ok = mData.fromByteArray(vMessage.data); LOG_DATUM(mData.toString()); Index: sources/model/MModel.h =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/model/MModel.h (.../MModel.h) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ sources/model/MModel.h (.../MModel.h) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -148,20 +148,20 @@ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ - /* Request */ \ + /* Request */ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ + REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ /* Response */ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ - REGISTER_METATYPE( AdjustTreatmentParametersData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) //===============================================================================// @@ -300,7 +300,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustTreatmentParametersRespData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTreatmentParametersResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/MTreatmentParameters.cpp =================================================================== diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/model/MTreatmentParameters.cpp (.../MTreatmentParameters.cpp) (revision aaa318408687dd27830dbb692b953d2b70c69d38) +++ sources/model/MTreatmentParameters.cpp (.../MTreatmentParameters.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -1,9 +1,9 @@ #include "MTreatmentParameters.h" using namespace Model; -MTreatmentParameters::MTreatmentParameters() {} +MAdjustTreatmentParametersRequest::MAdjustTreatmentParametersRequest() {} -QString MTreatmentParameters::toString() +QString MAdjustTreatmentParametersRequest::toString() { return QString(stringPrefix + "(%1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, %14, %15, %16, %17)") .arg(data.bloodFlowRate) @@ -25,7 +25,7 @@ .arg(data.rinsebackFlowRate); } -MTreatmentParameters::Data MTreatmentParameters::fromVariantList(const QVariantList &list) +MAdjustTreatmentParametersRequest::Data MAdjustTreatmentParametersRequest::fromVariantList(const QVariantList &list) { Data data; if (list.length() != 17) Index: sources/model/MTreatmentParameters.h =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/model/MTreatmentParameters.h (.../MTreatmentParameters.h) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ sources/model/MTreatmentParameters.h (.../MTreatmentParameters.h) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -8,11 +8,11 @@ class tst_models; namespace Model { -class MTreatmentParameters +class MAdjustTreatmentParametersRequest { friend class::tst_models; public: - MTreatmentParameters(); + MAdjustTreatmentParametersRequest(); struct Data { quint32 bloodFlowRate = 0; // mL/min @@ -37,11 +37,11 @@ Data data; QString toString(); - MTreatmentParameters::Data fromVariantList(const QVariantList &list); + MAdjustTreatmentParametersRequest::Data fromVariantList(const QVariantList &list); private: QString stringPrefix = "Treatment Parameters"; }; } -typedef Model::MTreatmentParameters::Data AdjustTreatmentParametersData; +typedef Model::MAdjustTreatmentParametersRequest::Data AdjustTreatmentParametersRequestData; #endif // MTREATMENTPARAMETERS_H Index: sources/model/MTreatmentParametersResp.cpp =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/model/MTreatmentParametersResp.cpp (.../MTreatmentParametersResp.cpp) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ sources/model/MTreatmentParametersResp.cpp (.../MTreatmentParametersResp.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -1,14 +1,14 @@ #include "MTreatmentParametersResp.h" using namespace Model; -MTreatmentParametersResp::MTreatmentParametersResp() {} +MTreatmentParametersResponse::MTreatmentParametersResponse() {} /** * @brief TreatmentParametersResp::toVariantList * Converts the response data to a QVariantList * @param list (&QVariantlist) - the list to write the data to */ -void MTreatmentParametersResp::toVariantList(QVariantList &list) const +void MTreatmentParametersResponse::toVariantList(QVariantList &list) const { list += _data.requestValid.value; list += _data.bloodFlowRate.value; @@ -31,7 +31,7 @@ } -AdjustTreatmentParametersRespData MTreatmentParametersResp::fromVariantList(const QVariantList &list) +AdjustTreatmentParametersResponseData MTreatmentParametersResponse::fromVariantList(const QVariantList &list) { Data data; if (list.length() != 18) @@ -60,7 +60,7 @@ return data; } -bool MTreatmentParametersResp::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MTreatmentParametersResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.requestValid )) if (GetValue(vByteArray, index, _data.bloodFlowRate )) @@ -101,7 +101,7 @@ else { if(vIndex) *vIndex = index; return false; } } -QString MTreatmentParametersResp::toString() const { +QString MTreatmentParametersResponse::toString() const { return QString(stringPrefix + "(%0, %1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, %14, %15, %16, %17)") .arg(_data.requestValid.value) .arg(_data.bloodFlowRate.value) @@ -123,7 +123,7 @@ .arg(_data.rinsebackFlowRate.value); } -AdjustTreatmentParametersRespData MTreatmentParametersResp::data() const { +AdjustTreatmentParametersResponseData MTreatmentParametersResponse::data() const { Data data; data.requestValid = _data.requestValid.value; data.bloodFlowRate = _data.bloodFlowRate.value; Index: sources/model/MTreatmentParametersResp.h =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -10,11 +10,11 @@ class tst_models; namespace Model { -class MTreatmentParametersResp +class MTreatmentParametersResponse { friend class::tst_models; public: - MTreatmentParametersResp(); + MTreatmentParametersResponse(); struct Data { quint32 requestValid = 0; @@ -75,5 +75,5 @@ } -typedef Model::MTreatmentParametersResp::Data AdjustTreatmentParametersRespData; +typedef Model::MTreatmentParametersResponse::Data AdjustTreatmentParametersResponseData; #endif // MTREATMENTPARAMETERSRESP_H Index: sources/view/VCreateTreatment.cpp =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -237,8 +237,8 @@ if (actionType != GuiActionType::ID_CreateTreatmentRsp) return false; - Model::MTreatmentParametersResp response; - AdjustTreatmentParametersRespData data = response.fromVariantList(messageData); + Model::MTreatmentParametersResponse response; + AdjustTreatmentParametersResponseData data = response.fromVariantList(messageData); bool success = true; if (data.requestValid != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) { @@ -471,7 +471,7 @@ * \param vData - the selected TreatmentParametersData * \return true on success, false otherwise. */ -bool VCreateTreatment::validate(const AdjustTreatmentParametersData &vData) +bool VCreateTreatment::validate(const AdjustTreatmentParametersRequestData &vData) { bool success = true; Index: sources/view/VCreateTreatment.h =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- sources/view/VCreateTreatment.h (.../VCreateTreatment.h) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ sources/view/VCreateTreatment.h (.../VCreateTreatment.h) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -116,8 +116,8 @@ PROPERTY(bool, continueEnabled, false) PROPERTY(bool, saveTreatmentProfile, false) - AdjustTreatmentParametersData treatmentData; - bool validate(const AdjustTreatmentParametersData &vData); + AdjustTreatmentParametersRequestData treatmentData; + bool validate(const AdjustTreatmentParametersRequestData &vData); QString saveNewTreatment(const QJsonObject &obj, const QString &dir = Treatment_Profiles_Dir); QString getParameterRangesDataCSV(); bool saveTreatmentRangesCSV(const QString &filename); @@ -144,7 +144,7 @@ void onFinishedSaveNewTreatment(bool result); signals: - void didCreateTreatment(const AdjustTreatmentParametersData &data); + void didCreateTreatment(const AdjustTreatmentParametersRequestData &data); void showConfirm(); void showPrime(); void showBegin(); Index: unittests/tst_models.cpp =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -1469,7 +1469,7 @@ void tst_models::tst_MTreatmentParametersResp() { - Model::MTreatmentParametersResp mData; + Model::MTreatmentParametersResponse mData; QFETCH(int , errorIndex ); @@ -1600,14 +1600,14 @@ void tst_models::tst_MTreatmentParametersResp_fromVariantList() { - Model::MTreatmentParametersResp mData; + Model::MTreatmentParametersResponse mData; QVariantList list; for (int i = 0; i < 20; ++i) { list.append(QVariant(1)); - AdjustTreatmentParametersRespData tempData = mData.fromVariantList(list); + AdjustTreatmentParametersResponseData tempData = mData.fromVariantList(list); if (i == 17) { QVERIFY(1 == tempData.requestValid); QVERIFY(1 == tempData.bloodFlowRate); @@ -1629,7 +1629,7 @@ QVERIFY(1 == tempData.rinsebackFlowRate); } else { - AdjustTreatmentParametersRespData data; + AdjustTreatmentParametersResponseData data; QVERIFY(data.requestValid == tempData.requestValid); QVERIFY(data.bloodFlowRate == tempData.bloodFlowRate); QVERIFY(data.dialysateFlowRate == tempData.dialysateFlowRate); @@ -1656,14 +1656,14 @@ void tst_models::tst_MTreatmentParameters_fromVariantList() { - Model::MTreatmentParameters mData; + Model::MAdjustTreatmentParametersRequest mData; QVariantList list; for (int i = 0; i < 20; ++i) { list.append(QVariant(1)); - AdjustTreatmentParametersData tempData = mData.fromVariantList(list); + AdjustTreatmentParametersRequestData tempData = mData.fromVariantList(list); if (i == 16) { QVERIFY(1 == tempData.bloodFlowRate); QVERIFY(1 == tempData.dialysateFlowRate); @@ -1684,7 +1684,7 @@ QVERIFY(1 == tempData.rinsebackFlowRate); } else { - AdjustTreatmentParametersData data; + AdjustTreatmentParametersRequestData data; QVERIFY(data.bloodFlowRate == tempData.bloodFlowRate); QVERIFY(data.dialysateFlowRate == tempData.dialysateFlowRate); QVERIFY(data.duration == tempData.duration); Index: unittests/tst_views.cpp =================================================================== diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) @@ -663,7 +663,7 @@ QVERIFY(!view.onFWValidationResponse(action, messageData)); } - AdjustTreatmentParametersData dataBackup = view.treatmentData; + AdjustTreatmentParametersRequestData dataBackup = view.treatmentData; QVariantList validMessageData; for (int i = 0; i < 18; ++i) { validMessageData.append(0); }