Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re6ffa6d5d1b7820875de07cdbb15f06617400344 -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -75,7 +75,7 @@ {Gui::GuiActionType::ID_BloodFlow , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes - {Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 parameters each 4bytes + {Gui::GuiActionType::ID_PressureOcclusion , 14 * 4 }, //14 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -302,22 +302,26 @@ vTreatmentPressureOcclusion.arterialLongFilter .toFixed(2), vTreatmentPressureOcclusion.venousLongFilter .toFixed(2), vTreatmentPressureOcclusion.tmpPressure .toFixed(2), + vTreatmentPressureOcclusion.tmpLongFilter .toFixed(2), vTreatmentPressureOcclusion.tmpMin .toFixed(2), - vTreatmentPressureOcclusion.tmpMax .toFixed(2) + vTreatmentPressureOcclusion.tmpMax .toFixed(2), + vTreatmentPressureOcclusion.barometricPresure .toFixed(2) ] label: [ - "Arterial (H12) " , - "Venous (H14) " , - "limit " , - "artMin (H12) " , - "artMax (H12) " , - "venMin (H14) " , - "venMax (H14) " , - "aLong (H12) " , - "vLong (H14) " , - "TMP " , - "tmpMin " , - "tmpMax " , + "Arterial (H12) " , + "Venous (H14) " , + "limit " , + "artMin (H12) " , + "artMax (H12) " , + "venMin (H14) " , + "venMax (H14) " , + "aLong (H12) " , + "vLong (H14) " , + "TMP " , + "TMPonng " , + "tmpMin " , + "tmpMax " , + "barometric (H23) " , ] } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r9c2a4c5abe3a93c3b3a7ed3d6fd9e12f0c161b3c -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 9c2a4c5abe3a93c3b3a7ed3d6fd9e12f0c161b3c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -81,8 +81,8 @@ unitText : Variables.unitTextPressure unitFontSize : Fonts.fontPixelContainerUnitSmall isActive : true - minimum : vTreatmentPressureOcclusion.arterialMin - maximum : vTreatmentPressureOcclusion.arterialMax + minimum : vTreatmentRanges.arterialPressureLimitWindowMin + maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes valid : ! vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindowRejectionReason @@ -99,9 +99,9 @@ unitText : Variables.unitTextPressure unitFontSize : _arterialWindow.unitFontSize isActive : true - minimum : vTreatmentPressureOcclusion.venousMin - maximum : vTreatmentPressureOcclusion.venousMax - step : vTreatmentRanges.venousPressureLimitWindowRes + minimum : vTreatmentRanges.venousPressureMonitorMin + maximum : vTreatmentRanges.venousPressureMonitorMax + step : vTreatmentRanges.venousPressureMonitorRes valid : ! vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindowRejectionReason onDidChange : function(vValue) { @@ -135,8 +135,8 @@ unitText : Variables.unitTextPressure unitFontSize : _arterialWindow.unitFontSize isActive : true - minimum : vTreatmentPressureOcclusion.tmpMin - maximum : vTreatmentPressureOcclusion.tmpMax + minimum : vTreatmentRanges.transmembranePressureLimitWindowMin + maximum : vTreatmentRanges.transmembranePressureLimitWindowMax step : vTreatmentRanges.transmembranePressureLimitWindowRes valid : ! vTreatmentAdjustmentPressuresLimits.tmpPressureLimitWindowRejectionReason Index: sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -18,35 +18,39 @@ QVariantList MPressureOcclusion::parameters() const { return { - _data. mH2Pressure .value, - _data. mH14Pressure .value, - _data. mLimitState .value, - _data. mH2Min .value, - _data. mH2Max .value, - _data. mH14Min .value, - _data. mH14Max .value, - _data. mH2LongFilter .value, - _data. mH14LongFilter .value, - _data. mTmpPressure .value, - _data. mTmpMin .value, - _data. mTmpMax .value, + _data. mH2Pressure .value, + _data. mH14Pressure .value, + _data. mLimitState .value, + _data. mH2Min .value, + _data. mH2Max .value, + _data. mH14Min .value, + _data. mH14Max .value, + _data. mH2LongFilter .value, + _data. mH14LongFilter .value, + _data. mTmpPressure .value, + _data. mTmpLongFilter .value, + _data. mTmpMin .value, + _data. mTmpMax .value, + _data. mBarometricPressure .value, }; } bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data. mH2Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH14Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mLimitState )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH2Min )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH2Max )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH14Min )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH14Max )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH2LongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mH14LongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mTmpPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mTmpMin )) goto lError; - if ( ! GetValue(vByteArray, index, _data. mTmpMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mLimitState )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2Min )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2Max )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14Min )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14Max )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2LongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14LongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpLongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mBarometricPressure )) goto lError; return true ; @@ -63,17 +67,19 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data. mH2Pressure .value; - data.mVenousPressure = _data. mH14Pressure .value; - data.mLimitState = _data. mLimitState .value; - data.mArterialMin = _data. mH2Min .value; - data.mArterialMax = _data. mH2Max .value; - data.mVenousMin = _data. mH14Min .value; - data.mVenousMax = _data. mH14Max .value; - data.mArterialLongFilter = _data. mH2LongFilter .value; - data.mVenousLongFilter = _data. mH14LongFilter .value; - data.mTmpPressure = _data. mTmpPressure .value; - data.mTmpMin = _data. mTmpMin .value; - data.mTmpMax = _data. mTmpMax .value; + data.mArterialPressure = _data. mH2Pressure .value; + data.mVenousPressure = _data. mH14Pressure .value; + data.mLimitState = _data. mLimitState .value; + data.mArterialMin = _data. mH2Min .value; + data.mArterialMax = _data. mH2Max .value; + data.mVenousMin = _data. mH14Min .value; + data.mVenousMax = _data. mH14Max .value; + data.mArterialLongFilter = _data. mH2LongFilter .value; + data.mVenousLongFilter = _data. mH14LongFilter .value; + data.mTmpPressure = _data. mTmpPressure .value; + data.mTmpLongFilter = _data. mTmpLongFilter .value; + data.mTmpMin = _data. mTmpMin .value; + data.mTmpMax = _data. mTmpMax .value; + data.mBarometricPressure = _data. mBarometricPressure .value; return data; } Index: sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r9d27f14c2b528c0f199004614f10d55589e08614 -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) +++ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -46,8 +46,10 @@ * | #8: (F32) | \ref Data::mArterialLongFilter | * | #9: (F32) | \ref Data::mVenousLongFilter | * | #10:(F32) | \ref Data::mTmpPressure | - * | #11:(F32) | \ref Data::mTmpMin | - * | #12:(F32) | \ref Data::mTmpMax | + * | #11:(F32) | \ref Data::mTmpLongFilter | + * | #12:(F32) | \ref Data::mTmpMin | + * | #13:(F32) | \ref Data::mTmpMax | + * | #14:(F32) | \ref Data::mBarometricPressure | * * \sa Data * @@ -76,9 +78,11 @@ Types::S32 mH14Max ; ///< Current venous minimum pressure limit (mmHg) Types::F32 mH2LongFilter ; ///< Current venous maximum pressure limit (mmHg) Types::F32 mH14LongFilter ; ///< Arterial long filter (mmHg) - Types::F32 mTmpPressure ; ///< Venous long filter (mmHg) - Types::F32 mTmpMin ; ///< Blood pump occlusion long filter - Types::F32 mTmpMax ; ///< Partial Occlusion base line + Types::F32 mTmpPressure ; ///< Lastet trans-membrane pressure(mmHg) + Types::F32 mTmpLongFilter ; ///< Tmp long filter (mmHg) + Types::F32 mTmpMin ; ///< Tmp minimum presure limit + Types::F32 mTmpMax ; ///< Tmp maximum presure limit + Types::F32 mBarometricPressure ; ///< barometric pressure } _data; @@ -99,8 +103,10 @@ float mArterialLongFilter = 0; float mVenousLongFilter = 0; float mTmpPressure = 0; + float mTmpLongFilter = 0; float mTmpMin = 0; float mTmpMax = 0; + float mBarometricPressure = 0; }; MPressureOcclusion () { } Index: sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -31,6 +31,8 @@ arterialLongFilter ( vData.mArterialLongFilter ); venousLongFilter ( vData.mVenousLongFilter ); tmpPressure ( vData.mTmpPressure ); + tmpLongFilter ( vData.mTmpLongFilter ); tmpMin ( vData.mTmpMin ); tmpMax ( vData.mTmpMax ); + barometricPresure ( vData.mBarometricPressure ); } Index: sources/view/td/data/treatment/VTreatmentPressureOcclusion.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r786c598a074df1620995ce09a1166a4f7173add6 --- sources/view/td/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 786c598a074df1620995ce09a1166a4f7173add6) @@ -46,8 +46,10 @@ PROPERTY( float , arterialLongFilter , 0) PROPERTY( float , venousLongFilter , 0) PROPERTY( float , tmpPressure , 0) + PROPERTY( float , tmpLongFilter , 0) PROPERTY( float , tmpMin , 0) PROPERTY( float , tmpMax , 0) + PROPERTY( float , barometricPresure , 0) VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) };