Index: denali.pro =================================================================== diff -u -r525b1e622b1c377c2e168a61d44122bea5f8ccc0 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- denali.pro (.../denali.pro) (revision 525b1e622b1c377c2e168a61d44122bea5f8ccc0) +++ denali.pro (.../denali.pro) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -165,6 +165,7 @@ main.cpp \ sources/model/MDGDebugText.cpp \ sources/model/MHDDebugText.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \ sources/model/hd/data/MHDVersionData.cpp \ sources/storage/DriveWatcher.cpp \ sources/threads.cpp \ @@ -186,7 +187,6 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.cpp \ sources/model/hd/data/MTreatmentFlowsData.cpp \ @@ -223,7 +223,6 @@ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ sources/view/hd/data/VHDTreatmentStatesData.cpp \ - sources/view/hd/data/VHDVersionData.cpp \ sources/view/vpoweroff.cpp \ \ # ---------- Views - Alarm sources/view/valarmstatus.cpp \ Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -300,11 +300,11 @@ * \param vData - Data model contains HD Version state. * \return void */ -void MessageDispatcher::onHDVersions(const AdjustHDVersionsRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustVersionsRequest &vData) { QVariantList mData; mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustHDVersionsReq, mData); + onActionTransmit(GuiActionType::ID_AdjustVersionsReq, mData); } /*! Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -108,7 +108,7 @@ GuiActionType::ID_AdjustUltrafiltrationStateReq , GuiActionType::ID_AdjustUltrafiltrationEditReq , GuiActionType::ID_AdjustUltrafiltrationConfirmReq , - GuiActionType::ID_AdjustHDVersionsReq , + GuiActionType::ID_AdjustVersionsReq , GuiActionType::ID_AlarmSilenceReq , }; Index: sources/canbus/messageglobals.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -107,10 +107,8 @@ {Gui::GuiActionType::ID_AdjustSalineRsp , 3 * 4 }, // 3 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustHDVersionsReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustVersionsReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustHDVersionsRsp , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGVersionsReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGVersionsRsp , 8 * 4 }, // 8 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file messageinterpreter.cpp - * \author (last) Behrouz NematiPour - * \date (last) 20-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 13-Dec-2019 * @@ -245,10 +245,10 @@ LOG_EVENT(AlarmSilenceRequestData::toString(vData)); break; - case Gui::GuiActionType::ID_HDVersionData: + case Gui::GuiActionType::ID_AdjustVersionsReq: if ( ! count ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); - LOG_EVENT(HDVersionRequestData::toString(vData)); + LOG_EVENT(AdjustVersionsRequest::toString(vData)); break; default: @@ -323,7 +323,6 @@ case Gui::GuiActionType::ID_TreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates ); break; case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break; case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; - case Gui::GuiActionType::ID_HDVersionData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDVersionData ); break; // ----- Events case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break; @@ -340,6 +339,7 @@ case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp); break; case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; + case Gui::GuiActionType::ID_AdjustHDVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp ); break; // ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq); break; // this message has been inherited from MAbstract and should use notify but since the response message is not standard can't use notify yet. Index: sources/gui/guiglobals.cpp =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -40,7 +40,6 @@ #include "VTreatmentSalineData.h" #include "VHDTreatmentStatesData.h" #include "VHDAccelerometerData.h" -#include "VHDVersionData.h" #include "VDGDrainPumpData.h" #include "VDGHeatersData.h" @@ -58,6 +57,7 @@ #include "vtreatmentadjustmentultrafiltrationedit.h" #include "vtreatmentadjustmentultrafiltrationconfirm.h" #include "VTreatmentAdjustmentSaline.h" +#include "VTreatmentAdjustmentHDVersions.h" namespace Gui { MainView *_viewer = nullptr; Index: sources/gui/guiglobals.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -116,9 +116,8 @@ ID_AdjustSalineReq = 0x1200, // 18 ID_AdjustSalineRsp = 0x1400, // 20 - ID_AdjustHDVersionsReq = 0x1C00, // 28 + ID_AdjustVersionsReq = 0x1C00, // 28 ID_AdjustHDVersionsRsp = 0x1D00, // 29 - ID_AdjustDGVersionsReq = 0x1C00, // 28 ID_AdjustDGVersionsRsp = 0x1E00, // 30 }; Index: sources/model/MModel.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/model/MModel.h (.../MModel.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/model/MModel.h (.../MModel.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -150,22 +150,22 @@ \ 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( AdjustHDVersionsRequestData ) \ - /* Response */ + REGISTER_METATYPE( AdjustHDVersionsRequest ) \ + /* Response */ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ - REGISTER_METATYPE( AdjustHDVersionsResponseData ) + REGISTER_METATYPE( AdjustHDVersionsResponse ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ @@ -182,7 +182,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ - + \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ @@ -193,27 +193,27 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ - + \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ - /* Response */ + /* Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) - /* Request */ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponse ) + /* Request */ \ #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsRequestData ) + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsRequest ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ @@ -251,7 +251,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponse ) // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ @@ -260,7 +260,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDVersionsRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequest ) // /* Request */ ----------------------- NoEmit --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ @@ -269,7 +269,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDVersionsRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequest ) // /* Request */ ----------------------- public --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ @@ -278,7 +278,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDVersionsRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequest ) //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ @@ -316,6 +316,6 @@ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) + ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponse ) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Fisheye: Tag ae1f28a34d323bd6e301450f22525ca3545c9319 refers to a dead (removed) revision in file `sources/model/hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -0,0 +1,65 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDVersionResponse.cpp + * \author (last) Peman Montazemi + * \date (last) 4-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 + * + */ +#include "MTreatmentAdjustHDVersionsResponse.h" + +using namespace Model; + + +QVariantList MAdjustHDVersionsResponse::parameters() const { + return { + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor.value, + _data.mFPGAMinor.value, + _data.mFPGALab .value + }; +} + +bool MAdjustHDVersionsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor)) + if (GetValue(vByteArray, index, _data.mFPGAMinor)) + if (GetValue(vByteArray, index, _data.mFPGALab )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +AdjustHDVersionsResponse MAdjustHDVersionsResponse::data() const { + Data data; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor.value; + data.mFPGAMinor = _data.mFPGAMinor.value; + data.mFPGALab = _data.mFPGALab .value; + return data; +} Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (.../MTreatmentAdjustHDVersionsResponse.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (.../MTreatmentAdjustHDVersionsResponse.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -68,4 +68,4 @@ }; } -typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponseData; +typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponse; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -155,7 +155,7 @@ } }; -class MAdjustVersionReq : public MModel { +class MAdjustVersionsReq : public MModel { public: // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. @@ -190,5 +190,5 @@ typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; -typedef Model:: MAdjustVersionReq AdjustHDVersionsRequestData; +typedef Model:: MAdjustVersionsReq AdjustVersionsRequest; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Index: sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -rae1f28a34d323bd6e301450f22525ca3545c9319 --- sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h (.../VTreatmentAdjustmentHDVersions.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h (.../VTreatmentAdjustmentHDVersions.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) @@ -27,7 +27,7 @@ // friends friend class ::tst_views; - AdjustHDVersionsRequestData _data; + AdjustVersionsRequest _data; // coco begin validated: // The property adjustment_Triggered has to be always true @@ -46,7 +46,7 @@ PROPERTY( qint8, verFPGAMinor, 0) PROPERTY( qint8, verFPGALab, 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponseData) + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponse) // ---------- HD Version public slots: Fisheye: Tag ae1f28a34d323bd6e301450f22525ca3545c9319 refers to a dead (removed) revision in file `sources/view/hd/data/VHDVersionData.cpp'. Fisheye: No comparison available. Pass `N' to diff?