Index: denali.pro.user =================================================================== diff -u -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- denali.pro.user (.../denali.pro.user) (revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957) +++ denali.pro.user (.../denali.pro.user) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -1,6 +1,6 @@ - + EnvironmentId Index: resources/settings/TreatmentParameters/DataList.conf =================================================================== diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- resources/settings/TreatmentParameters/DataList.conf (.../DataList.conf) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e) +++ resources/settings/TreatmentParameters/DataList.conf (.../DataList.conf) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -18,5 +18,5 @@ Unfractionated 1,000 IU/mL [Water Sample Result] -Pass Fail +Pass Index: sources/Threads.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/Threads.cpp (.../Threads.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/Threads.cpp (.../Threads.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -20,7 +20,6 @@ // Application #include "MessageGlobals.h" -#include "Logger.h" /*! * \details All the Thread has been and shall be defined in here Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -192,7 +192,7 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 35 * 4 }, //35 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 33 * 4 }, //33 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes Index: sources/gui/qml/compounds/Fader.qml =================================================================== diff -u -r8f83b92860a33498ea7856e63afef0a10ee11923 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/gui/qml/compounds/Fader.qml (.../Fader.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) +++ sources/gui/qml/compounds/Fader.qml (.../Fader.qml) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -28,22 +28,22 @@ property string fadingProperyName : "" property var fadingProperyValue : undefined - loops : Animation.Infinite - alwaysRunToEnd : true - running : // TODO : it has some bugs if while is runnig background changes, but since it has been used for fault mode we may not get any other message level. - fadingProperyTarget.visible - && fadingProperyRunning - ColorAnimation { - target : fadingProperyTarget - property : fadingProperyName - to : Qt.darker(fadingProperyValue) - duration : 1000 - } - - ColorAnimation { - target : fadingProperyTarget - property : fadingProperyName - to : fadingProperyValue - duration : 1000 - } + // loops : Animation.Infinite + // alwaysRunToEnd : true + // running : // TODO : it has some bugs if while is runnig background changes, but since it has been used for fault mode we may not get any other message level. + // fadingProperyTarget.visible + // && fadingProperyRunning + // ColorAnimation { + // target : fadingProperyTarget + // property : fadingProperyName + // to : Qt.darker(fadingProperyValue) + // duration : 1000 + // } + // + // ColorAnimation { + // target : fadingProperyTarget + // property : fadingProperyName + // to : fadingProperyValue + // duration : 1000 + // } } Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp =================================================================== diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -20,6 +20,7 @@ return { _data.mAccepted .value, _data.mReason .value, + _data.mBloodFlowRate .value, _data.mDialysateFlowRate .value, _data.mTreatmentDuration .value, @@ -32,7 +33,8 @@ _data.mSodiumConcentration .value, _data.mDialysateTemperature .value, _data.mDialyzerType .value, - _data.mTreatmentDateTime .value, + _data.mTreatmentStartEpoch .value, + _data.mTreatmentEndEpoch .value, _data.mAverageBloodFlow .value, _data.mAverageDialysateFlow .value, _data.mDialysateVolumeUsed .value, @@ -42,21 +44,24 @@ _data.mTargetUFRate .value, _data.mActualUFRate .value, _data.mSalineBolusVolume .value, - _data.mHeparinType .value, - _data.mHeparinConcentration .value, _data.mHeparinBolusVolume .value, _data.mHeparinDispenseRate .value, _data.mHeparinStop .value, _data.mHeparinDeliveredVolume .value, _data.mAverageArterialPressure .value, _data.mAverageVenousPressure .value, - _data.mEndTreatmentEarlyAlarm .value, _data.mDeviceID .value, _data.mWaterSampleTestResult .value, + + _data.mHeparinType .value, + _data.mHeparinConcentration .value, }; } bool MAdjustTreatmentLogResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + _data.mHeparinType .value = 0; + _data.mHeparinConcentration .value = 1000; + int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mAccepted )) if (GetValue(vByteArray, index, _data.mReason )) @@ -72,7 +77,8 @@ if (GetValue(vByteArray, index, _data.mSodiumConcentration )) if (GetValue(vByteArray, index, _data.mDialysateTemperature )) if (GetValue(vByteArray, index, _data.mDialyzerType )) - if (GetValue(vByteArray, index, _data.mTreatmentDateTime )) + if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch )) + if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch )) if (GetValue(vByteArray, index, _data.mAverageBloodFlow )) if (GetValue(vByteArray, index, _data.mAverageDialysateFlow )) if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed )) @@ -82,15 +88,12 @@ if (GetValue(vByteArray, index, _data.mTargetUFRate )) if (GetValue(vByteArray, index, _data.mActualUFRate )) if (GetValue(vByteArray, index, _data.mSalineBolusVolume )) - if (GetValue(vByteArray, index, _data.mHeparinType )) - if (GetValue(vByteArray, index, _data.mHeparinConcentration )) if (GetValue(vByteArray, index, _data.mHeparinBolusVolume )) if (GetValue(vByteArray, index, _data.mHeparinDispenseRate )) if (GetValue(vByteArray, index, _data.mHeparinStop )) if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume )) if (GetValue(vByteArray, index, _data.mAverageArterialPressure )) if (GetValue(vByteArray, index, _data.mAverageVenousPressure )) - if (GetValue(vByteArray, index, _data.mEndTreatmentEarlyAlarm )) if (GetValue(vByteArray, index, _data.mDeviceID )) if (GetValue(vByteArray, index, _data.mWaterSampleTestResult )) return true ; @@ -127,8 +130,6 @@ 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; } } /*! @@ -140,6 +141,7 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; + data.mBloodFlowRate = _data.mBloodFlowRate .value; data.mDialysateFlowRate = _data.mDialysateFlowRate .value; data.mTreatmentDuration = _data.mTreatmentDuration .value; @@ -152,7 +154,8 @@ data.mSodiumConcentration = _data.mSodiumConcentration .value; data.mDialysateTemperature = _data.mDialysateTemperature .value; data.mDialyzerType = _data.mDialyzerType .value; - data.mTreatmentDateTime = _data.mTreatmentDateTime .value; + data.mTreatmentStartEpoch = _data.mTreatmentStartEpoch .value; + data.mTreatmentEndEpoch = _data.mTreatmentEndEpoch .value; data.mAverageBloodFlow = _data.mAverageBloodFlow .value; data.mAverageDialysateFlow = _data.mAverageDialysateFlow .value; data.mDialysateVolumeUsed = _data.mDialysateVolumeUsed .value; @@ -162,16 +165,17 @@ data.mTargetUFRate = _data.mTargetUFRate .value; data.mActualUFRate = _data.mActualUFRate .value; data.mSalineBolusVolume = _data.mSalineBolusVolume .value; - data.mHeparinType = _data.mHeparinType .value; - data.mHeparinConcentration = _data.mHeparinConcentration .value; data.mHeparinBolusVolume = _data.mHeparinBolusVolume .value; data.mHeparinDispenseRate = _data.mHeparinDispenseRate .value; data.mHeparinStop = _data.mHeparinStop .value; data.mHeparinDeliveredVolume = _data.mHeparinDeliveredVolume .value; data.mAverageArterialPressure = _data.mAverageArterialPressure .value; data.mAverageVenousPressure = _data.mAverageVenousPressure .value; - data.mEndTreatmentEarlyAlarm = _data.mEndTreatmentEarlyAlarm .value; data.mDeviceID = _data.mDeviceID .value; data.mWaterSampleTestResult = _data.mWaterSampleTestResult .value; + + data.mHeparinType = _data.mHeparinType .value; + data.mHeparinConcentration = _data.mHeparinConcentration .value; + return data; } Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -36,41 +36,40 @@ * * | Payload || * | || - * | # 1:(U32) | \ref Data::mAccepted | | - * | # 2:(U32) | \ref Data::mReason | | - * | # 3:(U32) | \ref Data::mBloodFlowRate | (mL/min) | - * | # 4:(U32) | \ref Data::mDialysateFlowRate | (mL/min) | - * | # 5:(U32) | \ref Data::mTreatmentDuration | (min) | - * | # 6:(U32) | \ref Data::mActualTreatmentDuration | (min) | - * | # 7:(U32) | \ref Data::mAcidConcentrateType | | - * | # 8:(U32) | \ref Data::mBicarbonateConcentrateType | | - * | # 9:(U32) | \ref Data::mPotassiumConcentration | (mEq/L) | - * | #10:(U32) | \ref Data::mCalciumConcentration | (mEq/L) | - * | #11:(U32) | \ref Data::mBicarbonateConcentration | (mEq/L) | - * | #12:(U32) | \ref Data::mSodiumConcentration | (mEq/L) | - * | #13:(F32) | \ref Data::mDialysateTemperature | (Celsius) | - * | #14:(U32) | \ref Data::mDialyzerType | | - * | #15:(U32) | \ref Data::mTreatmentDateTime | | - * | #16:(F32) | \ref Data::mAverageBloodFlow | (mL/min) | - * | #17:(F32) | \ref Data::mAverageDialysateFlow | (mL/min) | - * | #18:(F32) | \ref Data::mDialysateVolumeUsed | (L) | - * | #19:(F32) | \ref Data::mAverageDialysateTemp | (Celsius) | - * | #20:(F32) | \ref Data::mTargetUFVolume | (L) | - * | #21:(F32) | \ref Data::mActualUFVolume | (L) | - * | #22:(F32) | \ref Data::mTargetUFRate | (mL/min) | - * | #23:(F32) | \ref Data::mActualUFRate | (mL/min) | - * | #24:(U32) | \ref Data::mSalineBolusVolume | (mL) | - * | #25:(U32) | \ref Data::mHeparinType | | - * | #26:(U32) | \ref Data::mHeparinConcentration | (IU/mL) | - * | #27:(F32) | \ref Data::mHeparinBolusVolume | (mL) | - * | #28:(F32) | \ref Data::mHeparinDispenseRate | (mL/hr) | - * | #29:(U32) | \ref Data::mHeparinStop | (min) | - * | #30:(F32) | \ref Data::mHeparinDeliveredVolume | (mL) | - * | #31:(F32) | \ref Data::mAverageArterialPressure | (mmHg) | - * | #32:(F32) | \ref Data::mAverageVenousPressure | (mmHg) | - * | #33:(U32) | \ref Data::mEndTreatmentEarlyAlarm | | - * | #34:(U32) | \ref Data::mDeviceID | | - * | #35:(U32) | \ref Data::mWaterSampleTestResult | | + * | 01 - (U32) | \ref Data::mAccepted | The accept or reject bool | | + * | 02 - (U32) | \ref Data::mReason | The rejection reason | | + * | 03 - (U32) | \ref Data::mBloodFlowRate | Blood Flow Rate | (mL/min) | + * | 04 - (U32) | \ref Data::mDialysateFlowRate | Dialysate Flow Rate | (mL/min) | + * | 05 - (U32) | \ref Data::mTreatmentDuration | Treatment Duration | (sec) | + * | 06 - (U32) | \ref Data::mActualTreatmentDuration | Actual Treatment Duration | (sec) | + * | 07 - (U32) | \ref Data::mAcidConcentrateType | Acid Concentrate Type | | + * | 08 - (U32) | \ref Data::mBicarbonateConcentrateType | Bicarbonate Concentrate Type | | + * | 09 - (U32) | \ref Data::mPotassiumConcentration | Potassium Concentration | (mEq/L) | + * | 10 - (U32) | \ref Data::mCalciumConcentration | Calcium Concentration | (mEq/L) | + * | 11 - (U32) | \ref Data::mBicarbonateConcentration | Bicarbonate Concentration | (mEq/L) | + * | 12 - (U32) | \ref Data::mSodiumConcentration | SodiumConcentration | (mEq/L) | + * | 13 - (F32) | \ref Data::mDialysateTemperature | Dialysate Temperature | (Celsius) | + * | 14 - (U32) | \ref Data::mDialyzerType | Dialyzer Type | | + * | 15 - (U32) | \ref Data::mTreatmentStartEpoch | Treatment Start Date and Time | (epoch) | + * | 16 - (U32) | \ref Data::mTreatmentEndEpoch | Treatment End Date and Time | (epoch) | + * | 17 - (F32) | \ref Data::mAverageBloodFlow | Average Blood Flow | (mL/min) | + * | 18 - (F32) | \ref Data::mAverageDialysateFlow | Average Dialysate Flow | (mL/min) | + * | 19 - (F32) | \ref Data::mDialysateVolumeUsed | Dialysate Volume Used | (L) | + * | 20 - (F32) | \ref Data::mAverageDialysateTemp | Average Dialysate Temp | (Celsius) | + * | 21 - (F32) | \ref Data::mTargetUFVolume | Target UF Volume | (L) | + * | 22 - (F32) | \ref Data::mActualUFVolume | Actual UF Volume | (L) | + * | 23 - (F32) | \ref Data::mTargetUFRate | Target UF Rate | (mL/min) | + * | 24 - (F32) | \ref Data::mActualUFRate | Actual UF Rate | (mL/min) | + * | 25 - (U32) | \ref Data::mSalineBolusVolume | Saline Bolus Volume | (mL) | + * | 26 - (F32) | \ref Data::mHeparinBolusVolume | Heparin Bolus Volume | (mL) | + * | 27 - (F32) | \ref Data::mHeparinDispenseRate | Heparin Dispense Rate | (mL/hr) | + * | 28 - (U32) | \ref Data::mHeparinStop | Heparin Pre-Stop | (min) | + * | 29 - (F32) | \ref Data::mHeparinDeliveredVolume | Heparin Delivered Volume | (mL) | + * | 30 - (F32) | \ref Data::mAverageArterialPressure | Average Arterial Pressure | (mmHg) | + * | 31 - (F32) | \ref Data::mAverageVenousPressure | Average Venous Pressure | (mmHg) | + * | 32 - (U32) | \ref Data::mDeviceID | Device ID | | + * | 33 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | | + * * \sa Data * \sa MAdjustTreatmentLogReq : TreatmentLog Request * \sa MTreatmentTreatmentLog : TreatmentLog Data @@ -91,41 +90,41 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mBloodFlowRate ; - Types::U32 mDialysateFlowRate ; - Types::U32 mTreatmentDuration ; - Types::U32 mActualTreatmentDuration ; - Types::U32 mAcidConcentrateType ; - Types::U32 mBicarbonateConcentrateType ; - Types::U32 mPotassiumConcentration ; - Types::U32 mCalciumConcentration ; - Types::U32 mBicarbonateConcentration ; - Types::U32 mSodiumConcentration ; - Types::F32 mDialysateTemperature ; - Types::U32 mDialyzerType ; - Types::U32 mTreatmentDateTime ; - Types::F32 mAverageBloodFlow ; - Types::F32 mAverageDialysateFlow ; - Types::F32 mDialysateVolumeUsed ; - Types::F32 mAverageDialysateTemp ; - Types::F32 mTargetUFVolume ; - Types::F32 mActualUFVolume ; - Types::F32 mTargetUFRate ; - Types::F32 mActualUFRate ; - Types::U32 mSalineBolusVolume ; - Types::U32 mHeparinType ; - Types::U32 mHeparinConcentration ; - Types::F32 mHeparinBolusVolume ; - Types::F32 mHeparinDispenseRate ; - Types::U32 mHeparinStop ; - Types::F32 mHeparinDeliveredVolume ; - Types::F32 mAverageArterialPressure ; - Types::F32 mAverageVenousPressure ; - Types::U32 mEndTreatmentEarlyAlarm ; - Types::U32 mDeviceID ; - Types::U32 mWaterSampleTestResult ; + Types::U32 mAccepted ; ///< 01 - (U32) The accept or reject bool flag + Types::U32 mReason ; ///< 02 - (U32) The rejection reason + Types::U32 mBloodFlowRate ; ///< 03 - (U32) Blood Flow Rate (mL/min) + Types::U32 mDialysateFlowRate ; ///< 04 - (U32) Dialysate Flow Rate (mL/min) + Types::U32 mTreatmentDuration ; ///< 05 - (U32) Treatment Duration (sec) + Types::U32 mActualTreatmentDuration ; ///< 06 - (U32) Actual Treatment Duration (sec) + Types::U32 mAcidConcentrateType ; ///< 07 - (U32) Acid Concentrate Type + Types::U32 mBicarbonateConcentrateType ; ///< 08 - (U32) Bicarbonate Concentrate Type + Types::U32 mPotassiumConcentration ; ///< 09 - (U32) Potassium Concentration (mEq/L) + Types::U32 mCalciumConcentration ; ///< 10 - (U32) Calcium Concentration (mEq/L) + Types::U32 mBicarbonateConcentration ; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) + Types::U32 mSodiumConcentration ; ///< 12 - (U32) SodiumConcentration (mEq/L) + Types::F32 mDialysateTemperature ; ///< 13 - (F32) Dialysate Temperature (Celsius) + Types::U32 mDialyzerType ; ///< 14 - (U32) Dialyzer Type + Types::U32 mTreatmentStartEpoch ; ///< 15 - (U32) Treatment Start Date and Time (epoch) + Types::U32 mTreatmentEndEpoch ; ///< 16 - (U32) Treatment End Date and Time (epoch) + Types::F32 mAverageBloodFlow ; ///< 17 - (F32) Average Blood Flow (mL/min) + Types::F32 mAverageDialysateFlow ; ///< 18 - (F32) Average Dialysate Flow (mL/min) + Types::F32 mDialysateVolumeUsed ; ///< 19 - (F32) Dialysate Volume Used (L) + Types::F32 mAverageDialysateTemp ; ///< 20 - (F32) Average Dialysate Temp (Celsius) + Types::F32 mTargetUFVolume ; ///< 21 - (F32) Target UF Volume (L) + Types::F32 mActualUFVolume ; ///< 22 - (F32) Actual UF Volume (L) + Types::F32 mTargetUFRate ; ///< 23 - (F32) Target UF Rate (mL/min) + Types::F32 mActualUFRate ; ///< 24 - (F32) Actual UF Rate (mL/min) + Types::U32 mSalineBolusVolume ; ///< 25 - (U32) Saline Bolus Volume (mL) + Types::F32 mHeparinBolusVolume ; ///< 26 - (F32) Heparin Bolus Volume (mL) + Types::F32 mHeparinDispenseRate ; ///< 27 - (F32) Heparin Dispense Rate (mL/hr) + Types::U32 mHeparinStop ; ///< 28 - (U32) Heparin Stop (min) + Types::F32 mHeparinDeliveredVolume ; ///< 29 - (F32) Heparin Delivered Volume (mL) + Types::F32 mAverageArterialPressure ; ///< 30 - (F32) Average Arterial Pressure (mmHg) + Types::F32 mAverageVenousPressure ; ///< 31 - (F32) Average Venous Pressure (mmHg) + Types::U32 mDeviceID ; ///< 32 - (U32) Device ID + Types::U32 mWaterSampleTestResult ; ///< 33 - (U32) Water Sample Test Result + Types::U32 mHeparinType ; ///< Heparin Type // is filled by UI, for now + Types::U32 mHeparinConcentration ; ///< Heparin Concentration (IU/mL) // is filled by UI, for now } _data; public: @@ -135,41 +134,41 @@ QString infoText () const override { return QString("AdjustTreatmentLog") ; } struct Data { - bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mBloodFlowRate = 0; /*!< Blood Flow Rate (mL/min) */ - quint32 mDialysateFlowRate = 0; /*!< Dialysate Flow Rate (mL/min) */ - quint32 mTreatmentDuration = 0; /*!< Treatment Duration (min) */ - quint32 mActualTreatmentDuration = 0; /*!< Actual Treatment Duration (min) */ - quint32 mAcidConcentrateType = 0; /*!< Acid Concentrate Type */ - quint32 mBicarbonateConcentrateType = 0; /*!< Bicarbonate Concentrate Type */ - quint32 mPotassiumConcentration = 0; /*!< Potassium Concentration (mEq/L) */ - quint32 mCalciumConcentration = 0; /*!< Calcium Concentration (mEq/L) */ - quint32 mBicarbonateConcentration = 0; /*!< Bicarbonate Concentration (mEq/L) */ - quint32 mSodiumConcentration = 0; /*!< SodiumConcentration (mEq/L) */ - float mDialysateTemperature = 0; /*!< Dialysate Temperature (Celsius) */ - quint32 mDialyzerType = 0; /*!< Dialyzer Type */ - quint32 mTreatmentDateTime = 0; /*!< Treatment Date and Time */ - float mAverageBloodFlow = 0; /*!< Average Blood Flow (mL/min) */ - float mAverageDialysateFlow = 0; /*!< Average Dialysate Flow (mL/min) */ - float mDialysateVolumeUsed = 0; /*!< Dialysate Volume Used (L) */ - float mAverageDialysateTemp = 0; /*!< Average Dialysate Temp (Celsius) */ - float mTargetUFVolume = 0; /*!< Target UF Volume (L) */ - float mActualUFVolume = 0; /*!< Actual UF Volume (L) */ - float mTargetUFRate = 0; /*!< Target UF Rate (mL/min) */ - float mActualUFRate = 0; /*!< Actual UF Rate (mL/min) */ - quint32 mSalineBolusVolume = 0; /*!< Saline Bolus Volume (mL) */ - quint32 mHeparinType = 0; /*!< Heparin Type */ - quint32 mHeparinConcentration = 0; /*!< Heparin Concentration (IU/mL) */ - float mHeparinBolusVolume = 0; /*!< Heparin Bolus Volume (mL) */ - float mHeparinDispenseRate = 0; /*!< Heparin Dispense Rate (mL/hr) */ - quint32 mHeparinStop = 0; /*!< Heparin Stop (min) */ - float mHeparinDeliveredVolume = 0; /*!< Heparin Delivered Volume (mL) */ - float mAverageArterialPressure = 0; /*!< Average Arterial Pressure (mmHg) */ - float mAverageVenousPressure = 0; /*!< Average Venous Pressure (mmHg) */ - quint32 mEndTreatmentEarlyAlarm = 0; /*!< End Treatment Early Alarm */ - quint32 mDeviceID = 0; /*!< Device ID */ - quint32 mWaterSampleTestResult = 0; /*!< Water Sample Test Result */ + bool mAccepted = 0; ///< 01 - (U32) The accept or reject bool flag + quint32 mReason = 0; ///< 02 - (U32) The rejection reason + quint32 mBloodFlowRate = 0; ///< 03 - (U32) Blood Flow Rate (mL/min) + quint32 mDialysateFlowRate = 0; ///< 04 - (U32) Dialysate Flow Rate (mL/min) + quint32 mTreatmentDuration = 0; ///< 05 - (U32) Treatment Duration (sec) + quint32 mActualTreatmentDuration = 0; ///< 06 - (U32) Actual Treatment Duration (sec) + quint32 mAcidConcentrateType = 0; ///< 07 - (U32) Acid Concentrate Type + quint32 mBicarbonateConcentrateType = 0; ///< 08 - (U32) Bicarbonate Concentrate Type + quint32 mPotassiumConcentration = 0; ///< 09 - (U32) Potassium Concentration (mEq/L) + quint32 mCalciumConcentration = 0; ///< 10 - (U32) Calcium Concentration (mEq/L) + quint32 mBicarbonateConcentration = 0; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) + quint32 mSodiumConcentration = 0; ///< 12 - (U32) SodiumConcentration (mEq/L) + float mDialysateTemperature = 0; ///< 13 - (F32) Dialysate Temperature (Celsius) + quint32 mDialyzerType = 0; ///< 14 - (U32) Dialyzer Type + quint32 mTreatmentStartEpoch = 0; ///< 15 - (U32) Treatment Start Date and Time (epoch) + quint32 mTreatmentEndEpoch = 0; ///< 16 - (U32) Treatment End Date and Time (epoch) + float mAverageBloodFlow = 0; ///< 17 - (F32) Average Blood Flow (mL/min) + float mAverageDialysateFlow = 0; ///< 18 - (F32) Average Dialysate Flow (mL/min) + float mDialysateVolumeUsed = 0; ///< 19 - (F32) Dialysate Volume Used (L) + float mAverageDialysateTemp = 0; ///< 20 - (F32) Average Dialysate Temp (Celsius) + float mTargetUFVolume = 0; ///< 21 - (F32) Target UF Volume (L) + float mActualUFVolume = 0; ///< 22 - (F32) Actual UF Volume (L) + float mTargetUFRate = 0; ///< 23 - (F32) Target UF Rate (mL/min) + float mActualUFRate = 0; ///< 24 - (F32) Actual UF Rate (mL/min) + quint32 mSalineBolusVolume = 0; ///< 25 - (U32) Saline Bolus Volume (mL) + float mHeparinBolusVolume = 0; ///< 26 - (F32) Heparin Bolus Volume (mL) + float mHeparinDispenseRate = 0; ///< 27 - (F32) Heparin Dispense Rate (mL/hr) + quint32 mHeparinStop = 0; ///< 28 - (U32) Heparin Stop (min) + float mHeparinDeliveredVolume = 0; ///< 29 - (F32) Heparin Delivered Volume (mL) + float mAverageArterialPressure = 0; ///< 30 - (F32) Average Arterial Pressure (mmHg) + float mAverageVenousPressure = 0; ///< 31 - (F32) Average Venous Pressure (mmHg) + quint32 mDeviceID = 0; ///< 32 - (U32) Device ID + quint32 mWaterSampleTestResult = 0; ///< 33 - (U32) Water Sample Test Result + quint32 mHeparinType = 0; ///< Heparin Type // is filled by UI, for now + quint32 mHeparinConcentration = 0; ///< Heparin Concentration (IU/mL) // is filled by UI, for now }; MAdjustTreatmentLogResponse () { } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r6233e005c77ee0aa10e80c02254a21f2042b840b -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 25-Jun-2021 + * \date (last) 01-Jul-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -215,46 +215,53 @@ /*0185*/case GuiAlarmID::ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE : { result = QObject::tr("DG trimmer heater internal temperature out of range." ); break; } /*0186*/case GuiAlarmID::ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT : { result = QObject::tr("DG heaters on with no flow time out." ); break; } /*0187*/case GuiAlarmID::ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT : { result = QObject::tr("DG drain circulation line timeout." ); break; } -/*0188*/case GuiAlarmID::ALARM_ID_BLOOD_SITTING_WARNING : { result = QObject::tr("Blood sitting too long warning (>4 min)." ); break; } -/*0189*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_ALARM : { result = QObject::tr("HD end of treatment alarm (user not acting to end treatment)." ); break; } -/*0190*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_MEDIUM : { result = QObject::tr("HD prime completed medium priority alarm." ); break; } -/*0191*/case GuiAlarmID::ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD Saline bolus volume check failure." ); break; } -/*0192*/case GuiAlarmID::ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD rinseback volume check failure." ); break; } -/*0193*/case GuiAlarmID::ALARM_ID_END_TREATMENT_TIMEOUT_ALARM : { result = QObject::tr("HD end treatment sub-mode timeout alarm." ); break; } -/*0194*/case GuiAlarmID::ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD blood prime volume check failure." ); break; } -/*0195*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_DETECTED : { result = QObject::tr("HD syringe detected alarm." ); break; } -/*0196*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED : { result = QObject::tr("HD syringe pump syringe removed alarm." ); break; } -/*0197*/case GuiAlarmID::ALARM_ID_EMPTY_SALINE_BAG : { result = QObject::tr("HD Saline bag is empty." ); break; } -/*0198*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_HIGH : { result = QObject::tr("HD dialysate temperature too high alarm." ); break; } -/*0199*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_LOW : { result = QObject::tr("HD dialysate temperature too low alarm." ); break; } -/*0200*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_BY_USER : { result = QObject::tr("Treatment stopped by user action - pressed stop button." ); break; } -/*0201*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_WARNING : { result = QObject::tr("HD end of treatment warning." ); break; } -/*0202*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY : { result = QObject::tr("HD prime completed low priority alarm." ); break; } -/*0203*/case GuiAlarmID::ALARM_ID_PRIME_OUT_OF_TIME : { result = QObject::tr("HD prime out of time alarm." ); break; } -/*0204*/case GuiAlarmID::ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT : { result = QObject::tr("HD time out on prime sub-mode purge air state." ); break; } -/*0205*/case GuiAlarmID::ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT : { result = QObject::tr("HD prime dialysate dialyzer time out alarm." ); break; } -/*0206*/case GuiAlarmID::ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT : { result = QObject::tr("HD prime dialysate bypass time out alarm." ); break; } -/*0207*/case GuiAlarmID::ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode dry self-tests failure." ); break; } -/*0208*/case GuiAlarmID::ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode wet self-tests failure." ); break; } -/*0209*/case GuiAlarmID::ALARM_ID_RTC_BATTERY_LOW : { result = QObject::tr("RTC battery low." ); break; } -/*0210*/case GuiAlarmID::ALARM_ID_RTC_RAM_OPS_ERROR : { result = QObject::tr("RTC (i.e read time) or RAM operations failure (read or write)." ); break; } -/*0211*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK : { result = QObject::tr("HD in treatment stopped sub-mode after rinseback completed (no escalation)." ); break; } -/*0212*/case GuiAlarmID::ALARM_ID_INSTALL_NEW_CARTRIDGE : { result = QObject::tr("HD needs new cartridge to be installed." ); break; } -/*0213*/case GuiAlarmID::ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY : { result = QObject::tr("HD cartridge installed improperly alarm." ); break; } -/*0214*/case GuiAlarmID::ALARM_ID_NO_CARTRIDGE_LOADED : { result = QObject::tr("HD no cartridge loaded alarm." ); break; } -/*0215*/case GuiAlarmID::ALARM_ID_CARTRIDGE_REMOVAL_FAILURE : { result = QObject::tr("HD fail to remove cartridge alarm." ); break; } -/*0216*/case GuiAlarmID::ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Bicarb conductivity out of range during bicarb pump check alarm." ); break; } -/*0217*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT : { result = QObject::tr("DG reservoir drain time out." ); break; } -/*0218*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT : { result = QObject::tr("DG reservoir fill time out." ); break; } -/*0219*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT : { result = QObject::tr("DG reservoir leak time out." ); break; } -/*0220*/case GuiAlarmID::ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE : { result = QObject::tr("DG temperature sensors difference out of range." ); break; } -/*0221*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG heat disinfect target temperature time out (could not reach to temperature)." ); break; } -/*0222*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT: { result = QObject::tr("DG heat disinfect inlet pressure and temperature sensors out of range." ); break; } -/*0223*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG heat disinfect inlet conductivity and temperature out of range." ); break; } -/*0224*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG chemical disinfect could not reach to target temperature." ); break; } -/*0225*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT: { result = QObject::tr("DG chemical disinfect inlet pressure and temperature sensors out of range." ); break; } -/*0226*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG chemical disinfect inlet conductivity and temperature out of range." ); break; } -/*0227*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } +/*0188*/case GuiAlarmID::ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED : { result = QObject::tr("HD battery pack detected an error." ); break; } +/*0189*/case GuiAlarmID::ALARM_ID_BLOOD_SITTING_WARNING : { result = QObject::tr("Blood sitting too long warning (>4 min)." ); break; } +/*0190*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_ALARM : { result = QObject::tr("HD end of treatment alarm (user not acting to end treatment)." ); break; } +/*0191*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_MEDIUM : { result = QObject::tr("HD prime completed medium priority alarm." ); break; } +/*0192*/case GuiAlarmID::ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD Saline bolus volume check failure." ); break; } +/*0193*/case GuiAlarmID::ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD rinseback volume check failure." ); break; } +/*0194*/case GuiAlarmID::ALARM_ID_END_TREATMENT_TIMEOUT_ALARM : { result = QObject::tr("HD end treatment sub-mode timeout alarm." ); break; } +/*0195*/case GuiAlarmID::ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD blood prime volume check failure." ); break; } +/*0196*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_DETECTED : { result = QObject::tr("HD syringe detected alarm." ); break; } +/*0197*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED : { result = QObject::tr("HD syringe pump syringe removed alarm." ); break; } +/*0198*/case GuiAlarmID::ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW : { result = QObject::tr("HD battery pack SOC is too low." ); break; } +/*0199*/case GuiAlarmID::ALARM_ID_EMPTY_SALINE_BAG : { result = QObject::tr("HD Saline bag is empty." ); break; } +/*0200*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_HIGH : { result = QObject::tr("HD dialysate temperature too high alarm." ); break; } +/*0201*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_LOW : { result = QObject::tr("HD dialysate temperature too low alarm." ); break; } +/*0202*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_BY_USER : { result = QObject::tr("Treatment stopped by user action - pressed stop button." ); break; } +/*0203*/case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_WARNING : { result = QObject::tr("HD end of treatment warning." ); break; } +/*0204*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY : { result = QObject::tr("HD prime completed low priority alarm." ); break; } +/*0205*/case GuiAlarmID::ALARM_ID_PRIME_OUT_OF_TIME : { result = QObject::tr("HD prime out of time alarm." ); break; } +/*0206*/case GuiAlarmID::ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT : { result = QObject::tr("HD time out on prime sub-mode purge air state." ); break; } +/*0207*/case GuiAlarmID::ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT : { result = QObject::tr("HD prime dialysate dialyzer time out alarm." ); break; } +/*0208*/case GuiAlarmID::ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT : { result = QObject::tr("HD prime dialysate bypass time out alarm." ); break; } +/*0209*/case GuiAlarmID::ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode dry self-tests failure." ); break; } +/*0210*/case GuiAlarmID::ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode wet self-tests failure." ); break; } +/*0211*/case GuiAlarmID::ALARM_ID_RTC_BATTERY_LOW : { result = QObject::tr("RTC battery low." ); break; } +/*0212*/case GuiAlarmID::ALARM_ID_RTC_RAM_OPS_ERROR : { result = QObject::tr("RTC (i.e read time) or RAM operations failure (read or write)." ); break; } +/*0213*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK : { result = QObject::tr("HD in treatment stopped sub-mode after rinseback completed (no escalation)." ); break; } +/*0214*/case GuiAlarmID::ALARM_ID_INSTALL_NEW_CARTRIDGE : { result = QObject::tr("HD needs new cartridge to be installed." ); break; } +/*0215*/case GuiAlarmID::ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY : { result = QObject::tr("HD cartridge installed improperly alarm." ); break; } +/*0216*/case GuiAlarmID::ALARM_ID_NO_CARTRIDGE_LOADED : { result = QObject::tr("HD no cartridge loaded alarm." ); break; } +/*0217*/case GuiAlarmID::ALARM_ID_CARTRIDGE_REMOVAL_FAILURE : { result = QObject::tr("HD fail to remove cartridge alarm." ); break; } +/*0218*/case GuiAlarmID::ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Bicarb conductivity out of range during bicarb pump check alarm." ); break; } +/*0219*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT : { result = QObject::tr("DG reservoir drain time out." ); break; } +/*0220*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT : { result = QObject::tr("DG reservoir fill time out." ); break; } +/*0221*/case GuiAlarmID::ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT : { result = QObject::tr("DG reservoir leak time out." ); break; } +/*0222*/case GuiAlarmID::ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE : { result = QObject::tr("DG temperature sensors difference out of range." ); break; } +/*0223*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG heat disinfect target temperature time out (could not reach to temperature)." ); break; } +/*0224*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT: { result = QObject::tr("DG heat disinfect inlet pressure and temperature sensors out of range." ); break; } +/*0225*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG heat disinfect inlet conductivity and temperature out of range." ); break; } +/*0226*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG chemical disinfect could not reach to target temperature." ); break; } +/*0227*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT: { result = QObject::tr("DG chemical disinfect inlet pressure and temperature sensors out of range." ); break; } +/*0228*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG chemical disinfect inlet conductivity and temperature out of range." ); break; } +/*0229*/case GuiAlarmID::ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CALIBRATION : { result = QObject::tr("DG load cells invalid calibration." ); break; } +/*0230*/case GuiAlarmID::ALARM_ID_DG_FLOW_SENSORS_INVALID_CALIBRATION : { result = QObject::tr("DG flow sensors invalid calibration." ); break; } +/*0231*/case GuiAlarmID::ALARM_ID_DG_COND_SENSORS_INVALID_CALIBRATION : { result = QObject::tr("DG conductivity sensors invalid calibration." ); break; } +/*0232*/case GuiAlarmID::ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_NV_RECORD : { result = QObject::tr("DG drain line volume invalid non-volatile record." ); break; } +/*0233*/case GuiAlarmID::ALARM_ID_DG_RESERVOIRS_INVALID_NV_RECORD : { result = QObject::tr("DG reservoirs invalid non-volatile record." ); break; } +/*0234*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/storage/FileHandler.cpp =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -25,7 +25,7 @@ // Project -#include "Logger.h" +// #include "Logger.h" // logger should not be used in this class. // namespace using namespace Storage; Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -29,8 +29,7 @@ #define FLOAT3 0,'f',3 #define ADDTITLE(vTITLE) logContent += QString("[%1]\n").arg(vTITLE) #define ADDALINE(vTEXT ) logContent += QString("%1\n" ).arg(vTEXT ) -#define ADDTOLOG(vINDEX) index = vINDEX; logContent += _titles[index] + sep + _values[index] + sep + _units[index] + "\n"; - +#define ADDTOLOG(vINDEX) index = vINDEX; logContent += title(index) + sep + value(index) + sep + unit(index) + "\n"; /*! * \brief TreatmentLog::TreatmentLog * The constructor to initial the Treatment Log @@ -69,8 +68,8 @@ QString mTreatmentDuration = QTime (0, 0).addSecs(vData.mTreatmentDuration ).toString(_timeFormat); QString mActualTreatmentDuration = QTime (0, 0).addSecs(vData.mActualTreatmentDuration ).toString(_timeFormat); - QString mTreatmentDateTime = Format::fromEpoch( vData.mTreatmentDateTime , _datetimeFormat); - quint32 mHeparinConcentration = 1000; // vData.mHeparinConcentration + QString mTreatmentStartDateTime = Format::fromEpoch( vData.mTreatmentStartEpoch , _datetimeFormat); + QString mTreatmentEndDateTime = Format::fromEpoch( vData.mTreatmentEndEpoch , _datetimeFormat); // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods. // - the category shall become as part of the group @@ -86,9 +85,7 @@ _values.clear(); for (int i = 0; i < eTreatmentLogIndexCount; i++) _values << ""; - _values[eDeviceID ] = mStrText.arg(vData.mDeviceID ); - _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); _values[eTreatmentDuration ] = mTreatmentDuration ; @@ -102,12 +99,13 @@ _values[eDialysateTemperature ] = mStrText.arg(vData.mDialysateTemperature ,FLOAT3 ); _values[eDialyzerType ] = mDialyzerType ; _values[eHeparinType ] = mHeparinType ; - _values[eHeparinConcentration ] = mStrText.arg(mHeparinConcentration ); // Decided to be removed, but has to be here until it is actually removed from the message + _values[eHeparinConcentration ] = mStrText.arg(vData.mHeparinConcentration ); _values[eHeparinBolusVolume ] = mStrText.arg(vData.mHeparinBolusVolume ,FLOAT3 ); _values[eHeparinDispenseRate ] = mStrText.arg(vData.mHeparinDispenseRate ,FLOAT3 ); _values[eHeparinStop ] = mStrText.arg(vData.mHeparinStop ); _values[eHeparinDeliveredVolume ] = mStrText.arg(vData.mHeparinDeliveredVolume ,FLOAT3 ); - _values[eTreatmentDateTime ] = mTreatmentDateTime ; + _values[eTreatmentStartDateTime ] = mTreatmentStartDateTime ; + _values[eTreatmentEndDateTime ] = mTreatmentEndDateTime ; _values[eWaterSampleTestResult ] = mWaterSampleTestResult ; _values[eDialysateVolumeUsed ] = mStrText.arg(vData.mDialysateVolumeUsed ,FLOAT3 ); _values[eTargetUFVolume ] = mStrText.arg(vData.mTargetUFVolume ,FLOAT3 ); @@ -120,7 +118,6 @@ _values[eAverageDialysateTemp ] = mStrText.arg(vData.mAverageDialysateTemp ,FLOAT3 ); _values[eAverageArterialPressure ] = mStrText.arg(vData.mAverageArterialPressure ,FLOAT3 ); _values[eAverageVenousPressure ] = mStrText.arg(vData.mAverageVenousPressure ,FLOAT3 ); - _values[eEndTreatmentEarlyAlarm ] = mStrText.arg(vData.mEndTreatmentEarlyAlarm ); } /*! @@ -209,7 +206,6 @@ ADDTITLE("Title"); ADDALINE(csv.arg(tr("Patient Name")) + NONE); ADDALINE(csv.arg(tr("Patient ID" )) + NONE); - ADDTOLOG( eTreatmentDateTime ); ADDTOLOG( eDeviceID ); ADDTITLE("Treatment Prescription" ); @@ -231,8 +227,8 @@ ADDTOLOG( eHeparinStop ); ADDTITLE("Treatment Parameters" ); - ADDALINE(csv.arg(tr("Start Time")) + NONE); - ADDALINE(csv.arg(tr("End Time" )) + NONE); + ADDTOLOG( eTreatmentStartDateTime ); + ADDTOLOG( eTreatmentEndDateTime ); ADDTOLOG( eTreatmentDuration ); ADDTITLE("Post-Treatment Data" ); @@ -251,7 +247,6 @@ ADDTOLOG( eAverageDialysateTemp ); ADDTOLOG( eAverageArterialPressure ); ADDTOLOG( eAverageVenousPressure ); - ADDTOLOG( eEndTreatmentEarlyAlarm ); ADDTITLE("Treatment Data" ); for ( const TreatmentLogAvrgeData &item : _treatmentLogAvrgeData ) { @@ -290,7 +285,7 @@ } ADDALINE(""); - QString mDateTime = _values[eTreatmentDateTime]; + QString mDateTime = _values[eTreatmentStartDateTime]; mDateTime.replace("/", "" ); // remove date separator mDateTime.replace(":", "" ); // remove time separator mDateTime.replace(" ", "_"); // replace spaces Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -31,6 +31,11 @@ namespace Storage { + +/*! + * \brief The TreatmentLog class + * This class is the controller which converts/saves/exports model to be used in the UI/TreatmentLog + */ class TreatmentLog : public QObject { Q_OBJECT @@ -55,6 +60,13 @@ QString _unitTextDispencingRate = tr("mL/hr" ); QString _unitTextBloodPressure = tr("mmHg" ); + + enum Role { + eValue, + eTitle, + eUnit + }; + enum TreatmentLogIndex { eDeviceID , eBloodFlowRate , @@ -75,7 +87,8 @@ eHeparinDispenseRate , eHeparinStop , eHeparinDeliveredVolume , - eTreatmentDateTime , + eTreatmentStartDateTime , + eTreatmentEndDateTime , eWaterSampleTestResult , eDialysateVolumeUsed , eTargetUFVolume , @@ -88,7 +101,6 @@ eAverageDialysateTemp , eAverageArterialPressure , eAverageVenousPressure , - eEndTreatmentEarlyAlarm , eTreatmentLogIndexCount }; @@ -113,7 +125,8 @@ tr("Heparin Dispense Rate" ), tr("Heparin Stop" ), tr("Heparin Delivered Volume" ), - tr("Treatment DateTime" ), + tr("Treatment Start DateTime" ), + tr("Treatment End DateTime" ), tr("Water Sample Test Result" ), tr("Dialysate Volume Used" ), tr("Target UF Volume" ), @@ -126,7 +139,6 @@ tr("Average Dialysate Temp" ), tr("Average Arterial Pressure" ), tr("Average Venous Pressure" ), - tr("End Treatment Early Alarm" ), }; const QStringList _units { @@ -151,6 +163,7 @@ _unitTextFluid , "" , "" , + "" , _unitTextVolume , _unitTextVolume , _unitTextVolume , @@ -162,9 +175,21 @@ _unitTextTemperature , _unitTextBloodPressure , _unitTextBloodPressure , - "" , }; + QString title(quint8 vIndex) const { + if (vIndex < _titles.count()) return _titles[vIndex]; + return ""; + } + QString value(quint8 vIndex) const { + if (vIndex < _values.count()) return _values[vIndex]; + return ""; + } + QString unit(quint8 vIndex) const { + if (vIndex < _units.count()) return _units[vIndex]; + return ""; + } + // Lists QStringList _values; QList _treatmentLogAvrgeData; Index: sources/view/VEventSpy.cpp =================================================================== diff -u -r052c794d6a8db55a2fbfdad172275af073ee54c3 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 052c794d6a8db55a2fbfdad172275af073ee54c3) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -21,7 +21,6 @@ // Project #include "GuiGlobals.h" -#include "Logger.h" #include "FileHandler.h" #include "DeviceController.h" Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -84,7 +84,8 @@ sodiumConcentration ( vData.mSodiumConcentration ); dialysateTemperature ( vData.mDialysateTemperature ); dialyzerType ( vData.mDialyzerType ); - treatmentDateTime ( vData.mTreatmentDateTime ); + treatmentStartEpoch ( vData.mTreatmentStartEpoch ); + treatmentEndEpoch ( vData.mTreatmentEndEpoch ); averageBloodFlow ( vData.mAverageBloodFlow ); averageDialysateFlow ( vData.mAverageDialysateFlow ); dialysateVolumeUsed ( vData.mDialysateVolumeUsed ); @@ -94,18 +95,18 @@ targetUFRate ( vData.mTargetUFRate ); actualUFRate ( vData.mActualUFRate ); salineBolusVolume ( vData.mSalineBolusVolume ); - heparinType ( vData.mHeparinType ); - heparinConcentration ( vData.mHeparinConcentration ); heparinBolusVolume ( vData.mHeparinBolusVolume ); heparinDispenseRate ( vData.mHeparinDispenseRate ); heparinStop ( vData.mHeparinStop ); heparinDeliveredVolume ( vData.mHeparinDeliveredVolume ); averageArterialPressure ( vData.mAverageArterialPressure ); averageVenousPressure ( vData.mAverageVenousPressure ); - endTreatmentEarlyAlarm ( vData.mEndTreatmentEarlyAlarm ); deviceID ( vData.mDeviceID ); waterSampleTestResult ( vData.mWaterSampleTestResult ); + heparinType ( vData.mHeparinType ); + heparinConcentration ( vData.mHeparinConcentration ); + if (adjustment_Accepted()) _TreatmentLog.doSave(); Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -62,7 +62,8 @@ PROPERTY(quint32 , sodiumConcentration , 0 ) PROPERTY(float , dialysateTemperature , 0 ) PROPERTY(quint32 , dialyzerType , 0 ) - PROPERTY(quint32 , treatmentDateTime , 0 ) + PROPERTY(quint32 , treatmentStartEpoch , 0 ) + PROPERTY(quint32 , treatmentEndEpoch , 0 ) PROPERTY(float , averageBloodFlow , 0 ) PROPERTY(float , averageDialysateFlow , 0 ) PROPERTY(float , dialysateVolumeUsed , 0 ) @@ -72,18 +73,18 @@ PROPERTY(float , targetUFRate , 0 ) PROPERTY(float , actualUFRate , 0 ) PROPERTY(quint32 , salineBolusVolume , 0 ) - PROPERTY(quint32 , heparinType , 0 ) - PROPERTY(quint32 , heparinConcentration , 0 ) PROPERTY(float , heparinBolusVolume , 0 ) PROPERTY(float , heparinDispenseRate , 0 ) PROPERTY(quint32 , heparinStop , 0 ) PROPERTY(float , heparinDeliveredVolume , 0 ) PROPERTY(float , averageArterialPressure , 0 ) PROPERTY(float , averageVenousPressure , 0 ) - PROPERTY(quint32 , endTreatmentEarlyAlarm , 0 ) PROPERTY(quint32 , deviceID , 0 ) PROPERTY(quint32 , waterSampleTestResult , 0 ) + PROPERTY(quint32 , heparinType , 0 ) + PROPERTY(quint32 , heparinConcentration , 0 ) + PROPERTY(QStringList , parametersTitle , _TreatmentLog.titles()) PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ()) PROPERTY(QStringList , parametersText , {}) Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r66506a15ac0234c0a2fcf78d3262fdb91c51cbca -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 66506a15ac0234c0a2fcf78d3262fdb91c51cbca) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -19,7 +19,6 @@ // Project #include "GuiController.h" -// #include "Logger.h" using namespace View; Index: sources/view/settings/VNetworkModel.cpp =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r1c18f738693756ca1f0342c2cc158e32bc28f90b --- sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) @@ -1,6 +1,5 @@ // Qt -#include // Project #include "VNetworkModel.h"