Index: denali.pro =================================================================== diff -u -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 -r525b1e622b1c377c2e168a61d44122bea5f8ccc0 --- denali.pro (.../denali.pro) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) +++ denali.pro (.../denali.pro) (revision 525b1e622b1c377c2e168a61d44122bea5f8ccc0) @@ -53,7 +53,6 @@ sources/main.h \ sources/model/MDGDebugText.h \ sources/model/MHDDebugText.h \ - sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ sources/storage/DriveWatcher.h \ sources/threads.h \ sources/maintimer.h \ @@ -76,6 +75,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ @@ -112,7 +112,6 @@ sources/gui/guicontroller.h \ \ # ---------- Views ---------- sources/view/VEventSpy.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h \ sources/view/hd/data/VHDTreatmentStatesData.h \ sources/view/vview.h \ sources/view/vpoweroff.h \ @@ -126,6 +125,7 @@ sources/view/vtreatmentadjustmentultrafiltrationedit.h \ sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h \ \ # ---------- Views - HD - Data sources/view/vtreatmenttime.h \ sources/view/vtreatmentbloodflow.h \ @@ -165,7 +165,6 @@ main.cpp \ sources/model/MDGDebugText.cpp \ sources/model/MHDDebugText.cpp \ - sources/model/hd/adjustment/MHDVersionResponse.cpp \ sources/model/hd/data/MHDVersionData.cpp \ sources/storage/DriveWatcher.cpp \ sources/threads.cpp \ @@ -187,6 +186,7 @@ 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 \ @@ -222,7 +222,6 @@ sources/gui/guicontroller.cpp \ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp \ sources/view/hd/data/VHDTreatmentStatesData.cpp \ sources/view/hd/data/VHDVersionData.cpp \ sources/view/vpoweroff.cpp \ @@ -236,6 +235,7 @@ sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp \ \ # ---------- Views - HD - Data sources/view/vtreatmenttime.cpp \ sources/view/vtreatmentbloodflow.cpp \ Fisheye: Tag 525b1e622b1c377c2e168a61d44122bea5f8ccc0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/MHDVersionResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp (revision 525b1e622b1c377c2e168a61d44122bea5f8ccc0) @@ -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; } +} + +AdjustHDVersionsResponseData 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; +}