Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -r4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 31f8f296fb58f57c121a39dfd7e78b11723479c6) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5) @@ -75,7 +75,7 @@ {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes - {Gui::GuiActionType::ID_PressureOcclusion , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5) @@ -26,6 +26,10 @@ _data.mArterialLimitHigh .value, _data.mVenousLimitLow .value, _data.mVenousLimitHigh .value, + _data.mArtLongFilter .value, + _data.mVenousLongFilter .value, + _data.mBloodOcclLongFilter .value, + _data.mPartialOcclBaseline .value, }; } @@ -39,6 +43,10 @@ if (GetValue(vByteArray, index, _data.mArterialLimitHigh )) if (GetValue(vByteArray, index, _data.mVenousLimitLow )) if (GetValue(vByteArray, index, _data.mVenousLimitHigh )) + if (GetValue(vByteArray, index, _data.mArtLongFilter )) + if (GetValue(vByteArray, index, _data.mVenousLongFilter )) + if (GetValue(vByteArray, index, _data.mBloodOcclLongFilter )) + if (GetValue(vByteArray, index, _data.mPartialOcclBaseline )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,6 +56,10 @@ 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; } } /*! @@ -57,13 +69,17 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data.mArterialPressure .value; - data.mVenousPressure = _data.mVenousPressure .value; - data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; - data.mPressureLimitState = _data.mPressureLimitState .value; - data.mArterialLimitLow = _data.mArterialLimitLow .value; - data.mArterialLimitHigh = _data.mArterialLimitHigh .value; - data.mVenousLimitLow = _data.mVenousLimitLow .value; - data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mArterialPressure = _data.mArterialPressure .value; + data.mVenousPressure = _data.mVenousPressure .value; + data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; + data.mPressureLimitState = _data.mPressureLimitState .value; + data.mArterialLimitLow = _data.mArterialLimitLow .value; + data.mArterialLimitHigh = _data.mArterialLimitHigh .value; + data.mVenousLimitLow = _data.mVenousLimitLow .value; + data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mArtLongFilter = _data.mArtLongFilter .value; + data.mVenousLongFilter = _data.mVenousLongFilter .value; + data.mBloodOcclLongFilter = _data.mBloodOcclLongFilter .value; + data.mPartialOcclBaseline = _data.mPartialOcclBaseline .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5) @@ -36,14 +36,18 @@ * * | Payload || * | || - * | #1:(F32) | \ref Data::mArterialPressure | - * | #2:(F32) | \ref Data::mVenousPressure | - * | #3:(U32) | \ref Data::mBloodPumpOcclusion | - * | #4:(U32) | \ref Data::mPressureLimitState | - * | #5:(U32) | \ref Data::mArterialLimitLow | - * | #6:(U32) | \ref Data::mArterialLimitHigh | - * | #7:(U32) | \ref Data::mVenousLimitLow | - * | #8:(U32) | \ref Data::mVenousLimitHigh | + * | #1: (F32) | \ref Data::mArterialPressure | + * | #2: (F32) | \ref Data::mVenousPressure | + * | #3: (U32) | \ref Data::mBloodPumpOcclusion | + * | #4: (U32) | \ref Data::mPressureLimitState | + * | #5: (S32) | \ref Data::mArterialLimitLow | + * | #6: (S32) | \ref Data::mArterialLimitHigh | + * | #7: (S32) | \ref Data::mVenousLimitLow | + * | #8: (S32) | \ref Data::mVenousLimitHigh | + * | #9: (F32) | \ref Data::mArtLongFilter | + * | #10:(F32) | \ref Data::mVenousLongFilter | + * | #11:(F32) | \ref Data::mBloodOcclLongFilter | + * | #12:(F32) | \ref Data::mPartialOcclBaseline | * * \sa Data * @@ -71,6 +75,10 @@ Types::S32 mArterialLimitHigh ; ///< Current arterial maximum pressure limit (mmHg) Types::S32 mVenousLimitLow ; ///< Current venous minimum pressure limit (mmHg) Types::S32 mVenousLimitHigh ; ///< Current venous maximum pressure limit (mmHg) + Types::F32 mArtLongFilter ; ///< Arterial long filter (mmHg) + Types::F32 mVenousLongFilter ; ///< Venous long filter (mmHg) + Types::F32 mBloodOcclLongFilter ; ///< Blood pump occlusion long filter + Types::F32 mPartialOcclBaseline ; ///< Partial Occlusion base line } _data; public: @@ -87,7 +95,11 @@ qint32 mArterialLimitLow = 0; qint32 mArterialLimitHigh = 0; qint32 mVenousLimitLow = 0; - qint32 mVenousLimitHigh = 0; + qint32 mVenousLimitHigh = 0; + float mArtLongFilter = 0; + float mVenousLongFilter = 0; + float mBloodOcclLongFilter = 0; + float mPartialOcclBaseline = 0; }; MPressureOcclusion () { } Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5) @@ -21,12 +21,16 @@ void VTreatmentPressureOcclusion::onActionReceive(const PressureOcclusionData &vData) { - arterialPressure ( vData.mArterialPressure ); - venousPressure ( vData.mVenousPressure ); - bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); - pressureLimitState ( vData.mPressureLimitState ); - arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); - arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); - venousPressureLimitLowerBound ( vData.mVenousLimitLow ); - venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); + arterialPressure ( vData.mArterialPressure ); + venousPressure ( vData.mVenousPressure ); + bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); + pressureLimitState ( vData.mPressureLimitState ); + arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); + arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); + venousPressureLimitLowerBound ( vData.mVenousLimitLow ); + venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); + arterialPressureLongFilter ( vData.mArtLongFilter ); + venousLongFilter ( vData.mVenousLongFilter ); + bloodPumpOcclLongFilter ( vData.mBloodOcclLongFilter ); + partialOcclBaseLine ( vData.mPartialOcclBaseline ); } Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5) @@ -44,6 +44,10 @@ PROPERTY( qint32 , arterialPressureLimitUpperBound , 0) PROPERTY( qint32 , venousPressureLimitLowerBound , 0) PROPERTY( qint32 , venousPressureLimitUpperBound , 0) + PROPERTY( float , arterialPressureLongFilter , 0) + PROPERTY( float , venousLongFilter , 0) + PROPERTY( float , bloodPumpOcclLongFilter , 0) + PROPERTY( float , partialOcclBaseLine , 0) VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) };