Index: sources/model/dd/data/MDDPressuresData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDPressuresData.cpp (.../MDDPressuresData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDPressuresData.cpp (.../MDDPressuresData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -18,39 +18,23 @@ QVariantList MDDPressures::parameters() const { return { - _data.m1Pressure .value, - _data.m3Pressure .value, - _data.d9Pressure .value, - _data.d66Pressure .value, - _data.d51Pressure .value, - _data.d18Pressure .value, - _data.d41Pressure .value, - _data.m1PresTemp .value, - _data.m3PresTemp .value, - _data.d9PresTemp .value, - _data.d66PresTemp .value, - _data.d51PresTemp .value, - _data.d18PresTemp .value, - _data.d41PresTemp .value + _data.mD9Pressure .value, + _data.mD66Pressure .value, + _data.mD51Pressure .value, + _data.mD18Pressure .value, + _data.mD41Pressure .value, + _data.mD87Pressure .value, }; } bool MDDPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.m1Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d9Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d66Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d51Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d18Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d41Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m1PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d9PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d66PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d51PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d18PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d41PresTemp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD9Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD66Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD51Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD18Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD41Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD87Pressure )) goto lError; return true ; @@ -67,19 +51,12 @@ */ MDDPressures::Data MDDPressures::data() const { Data data; - data.mWaterInletPSI = _data.m1Pressure .value; - data.mWaterOutletPSI = _data.m3Pressure .value; - data.mHydrolicOutletPSI = _data.d9Pressure .value; - data.mBicarbBagPSI = _data.d66Pressure .value; - data.mSpentDialysatePSI = _data.d51Pressure .value; - data.mFreshDialysatePSI = _data.d18Pressure .value; - data.mTransmembranePSI = _data.d41Pressure .value; - data.mWaterInletTemp = _data.m1PresTemp .value; - data.mWaterOutletTemp = _data.m3PresTemp .value; - data.mHydrolicOutletTemp = _data.d9PresTemp .value; - data.mBicarbBagTemp = _data.d66PresTemp .value; - data.mSpentDialysateTemp = _data.d51PresTemp .value; - data.mFreshDialysateTemp = _data.d18PresTemp .value; - data.mTransmembraneTemp = _data.d41PresTemp .value; + data.mD9Pressure = _data.mD9Pressure .value; + data.mD66Pressure = _data.mD66Pressure .value; + data.mD51Pressure = _data.mD51Pressure .value; + data.mD18Pressure = _data.mD18Pressure .value; + data.mD41Pressure = _data.mD41Pressure .value; + data.mD87Pressure = _data.mD87Pressure .value; + return data; }