Index: denali.pro.user =================================================================== diff -u -r35db01154f90ebfdb6174033a66f5c20af82e14d -rf8b8214be787dbfcff21322d1fa131673519733c --- denali.pro.user (.../denali.pro.user) (revision 35db01154f90ebfdb6174033a66f5c20af82e14d) +++ denali.pro.user (.../denali.pro.user) (revision f8b8214be787dbfcff21322d1fa131673519733c) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r35db01154f90ebfdb6174033a66f5c20af82e14d -rf8b8214be787dbfcff21322d1fa131673519733c --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 35db01154f90ebfdb6174033a66f5c20af82e14d) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision f8b8214be787dbfcff21322d1fa131673519733c) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 15-Aug-2022 + * \date (last) 16-Aug-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b8214be787dbfcff21322d1fa131673519733c --- sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp (.../MTreatmentBloodPrimeData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp (.../MTreatmentBloodPrimeData.cpp) (revision f8b8214be787dbfcff21322d1fa131673519733c) @@ -20,19 +20,16 @@ return { _data.mTarget .value, _data.mCurrent.value, - _data.mSafety.value, }; } bool MTreatmentBloodPrime::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mTarget )) if (GetValue(vByteArray, index, _data.mCurrent)) - if (GetValue(vByteArray, index, _data.mSafety)) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } } /*! @@ -44,6 +41,5 @@ Data data; data.mTarget = _data.mTarget .value; data.mCurrent = _data.mCurrent.value; - data.mSafety = _data.mSafety.value; return data; } Index: sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rf8b8214be787dbfcff21322d1fa131673519733c --- sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h (.../MTreatmentBloodPrimeData.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h (.../MTreatmentBloodPrimeData.h) (revision f8b8214be787dbfcff21322d1fa131673519733c) @@ -60,7 +60,6 @@ struct { Types::F32 mTarget ; Types::F32 mCurrent; - Types::F32 mSafety ; } _data; public: @@ -72,7 +71,6 @@ struct Data { float mTarget = 0; ///< Target volume of BloodPrime delivery float mCurrent = 0; ///< Current volume of BloodPrime delivery - float mSafety = 0; ///< Safety volume of BloodPrime delivery }; public: Index: sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b8214be787dbfcff21322d1fa131673519733c --- sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp (.../VTreatmentBloodPrimeData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp (.../VTreatmentBloodPrimeData.cpp) (revision f8b8214be787dbfcff21322d1fa131673519733c) @@ -23,5 +23,4 @@ { target (vData.mTarget ); current(vData.mCurrent); - safety (vData.mSafety ); } Index: sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b8214be787dbfcff21322d1fa131673519733c --- sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h (.../VTreatmentBloodPrimeData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h (.../VTreatmentBloodPrimeData.h) (revision f8b8214be787dbfcff21322d1fa131673519733c) @@ -38,7 +38,6 @@ PROPERTY( float , target , 0) PROPERTY( float , current , 0) - PROPERTY( float , safety , 0) VIEW_DEC(VTreatmentBloodPrime, TreatmentBloodPrimeData) };