Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rfe301ed4aa3b3e5cd2a279488652338ee66366a1 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fe301ed4aa3b3e5cd2a279488652338ee66366a1) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -107,12 +107,14 @@ vDGPressures.roOutletPSI .toFixed(2) , vDGPressures.drainInletPSI .toFixed(2) , vDGPressures.drainOutletPSI .toFixed(2) , + vDGPressures.barometricPSI .toFixed(2) , ] label: [ "PPi", "PPo", "PRd", "PDr", + "bar", ] } @@ -210,7 +212,7 @@ textObjectName :"_DGConductivityData" title : qsTr(" Conduct ") x: col(3.7) - y: row(3.0) + y: row(3.2) model: [ vDGConductivity.RORejectionRatio .toFixed(3), vDGConductivity.CPi .toFixed(1), @@ -248,7 +250,7 @@ textObjectName :"_DGOperationModeData" title : qsTr(" DG Mode ") x: col(2.5) - y: row(1.7) + y: row(1.9) model: [ vDGOperationMode.text , ] @@ -260,7 +262,7 @@ textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.4) + y: row(2.6) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -287,7 +289,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.4) + y: row(2.6) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -312,7 +314,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.4) + y: row(2.6) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -337,7 +339,7 @@ textObjectName :"_HDPressureOcclusionData" title : qsTr(" Prsr Oc ") x: col(3.7) - y: row(1.7) + y: row(1.9) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , @@ -354,7 +356,7 @@ textObjectName :"_HDSyringePumpData" title : qsTr(" Syringe ") x: col(4.6) - y: row(1.7) + y: row(1.9) model: [ vHDSyringePump.syringePumpState , vHDSyringePump.heparinState , @@ -387,7 +389,7 @@ textObjectName :"_HDOperationModeData" title : qsTr(" HD Mode ") x: col(0.5) - y: row(1.7) + y: row(1.9) model: [ vHDOperationMode.text , ] @@ -521,9 +523,9 @@ DebugDataColumn { id: _PreTreatmentStatesColumn textObjectName :"_PreTreatmentStatesData" title : qsTr(" PreTx States ") - x: col(1.0) + x: col(1.5) y: row(5.5) - model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9" + model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11" .arg(vPreTreatmentStates.subMode ) .arg(vPreTreatmentStates.waterSampleState ) .arg(vPreTreatmentStates.selfTestConsumablesState) @@ -533,7 +535,10 @@ .arg(vPreTreatmentStates.primeState ) .arg(vPreTreatmentStates.recirculateState ) .arg(vPreTreatmentStates.patientConnectionState ) + .arg(vPreTreatmentStates.wetSelfTestsState ) + .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] + fontPixelSizeText: 30 } Text { id : _mouseEventCountText Index: sources/model/dg/data/MDGPressuresData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/model/dg/data/MDGPressuresData.cpp (.../MDGPressuresData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGPressuresData.cpp (.../MDGPressuresData.cpp) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -18,24 +18,27 @@ QVariantList MDGPressures::parameters() const { return { - _data.mROInletPSI .value, - _data.mROOutletPSI .value, - _data.mDrainInletPSI .value, - _data.mDrainOutletPSI .value + _data.mROInletPSI .value, + _data.mROOutletPSI .value, + _data.mDrainInletPSI .value, + _data.mDrainOutletPSI .value, + _data.mBarometricPSI .value }; } bool MDGPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mROInletPSI )) - if (GetValue(vByteArray, index, _data.mROOutletPSI )) - if (GetValue(vByteArray, index, _data.mDrainInletPSI )) - if (GetValue(vByteArray, index, _data.mDrainOutletPSI )) + if (GetValue(vByteArray, index, _data.mROInletPSI )) + if (GetValue(vByteArray, index, _data.mROOutletPSI )) + if (GetValue(vByteArray, index, _data.mDrainInletPSI )) + if (GetValue(vByteArray, index, _data.mDrainOutletPSI )) + if (GetValue(vByteArray, index, _data.mBarometricPSI )) 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; } } /*! @@ -45,9 +48,10 @@ */ MDGPressures::Data MDGPressures::data() const { Data data; - data.mROInletPSI = _data.mROInletPSI .value; - data.mROOutletPSI = _data.mROOutletPSI .value; - data.mDrainInletPSI = _data.mDrainInletPSI .value; - data.mDrainOutletPSI = _data.mDrainOutletPSI .value; + data.mROInletPSI = _data.mROInletPSI .value; + data.mROOutletPSI = _data.mROOutletPSI .value; + data.mDrainInletPSI = _data.mDrainInletPSI .value; + data.mDrainOutletPSI = _data.mDrainOutletPSI .value; + data.mBarometricPSI = _data.mBarometricPSI .value; return data; } Index: sources/model/dg/data/MDGPressuresData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -40,6 +40,7 @@ * | #2:(F32) | \ref Data::mROOutletPSI | * | #3:(F32) | \ref Data::mDrainInletPSI | * | #4:(F32) | \ref Data::mDrainOutletPSI | + * | #5:(F32) | \ref Data::mBarometricPSI | * * \sa Data * @@ -59,10 +60,11 @@ QVariantList parameters() const override; struct { - Types::F32 mROInletPSI ; - Types::F32 mROOutletPSI ; - Types::F32 mDrainInletPSI ; - Types::F32 mDrainOutletPSI ; + Types::F32 mROInletPSI ; ///< RO pump inlet pressure + Types::F32 mROOutletPSI ; ///< RO pump outlet pressure + Types::F32 mDrainInletPSI ; ///< Drain pump inlet pressure + Types::F32 mDrainOutletPSI ; ///< Drain pump outlet pressure + Types::F32 mBarometricPSI ; ///< Barometric pressure } _data; public: @@ -76,6 +78,7 @@ float mROOutletPSI = 0; ///< RO outlet PSI float mDrainInletPSI = 0; ///< Drain inlet PSI float mDrainOutletPSI = 0; ///< Drain outlet PSI + float mBarometricPSI = 0; ///< Drain outlet PSI }; MDGPressures () {} Index: sources/view/dg/data/VDGPressuresData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/view/dg/data/VDGPressuresData.cpp (.../VDGPressuresData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGPressuresData.cpp (.../VDGPressuresData.cpp) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -21,8 +21,9 @@ void VDGPressures::onActionReceive(const DGPressuresData &vData) { - roInletPSI ( vData.mROInletPSI ); - roOutletPSI ( vData.mROOutletPSI ); - drainInletPSI ( vData.mDrainInletPSI ); - drainOutletPSI ( vData.mDrainOutletPSI ); + roInletPSI ( vData.mROInletPSI ); + roOutletPSI ( vData.mROOutletPSI ); + drainInletPSI ( vData.mDrainInletPSI ); + drainOutletPSI ( vData.mDrainOutletPSI ); + barometricPSI ( vData.mBarometricPSI ); } Index: sources/view/dg/data/VDGPressuresData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -36,10 +36,11 @@ { Q_OBJECT - PROPERTY( float , roInletPSI , 0) - PROPERTY( float , roOutletPSI , 0) - PROPERTY( float , drainInletPSI , 0) - PROPERTY( float , drainOutletPSI , 0) + PROPERTY( float , roInletPSI , 0) + PROPERTY( float , roOutletPSI , 0) + PROPERTY( float , drainInletPSI , 0) + PROPERTY( float , drainOutletPSI , 0) + PROPERTY( float , barometricPSI , 0) VIEW_DEC(VDGPressures, DGPressuresData) };