Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,29 +18,29 @@ QVariantList MBloodFlow::parameters() const { return { - _data.mFlowSetPoint .value, - _data.mMeasuredFlow .value, - _data.mRotorSpeed .value, - _data.mMotorSpeed .value, - _data.mMotorCtlCurrent .value, - _data.mRPM .value, - _data.mRotorCount .value, - _data.mPresFlow .value, - _data.mRotorHall .value, + _data.mH4FlowSetPoint .value, + _data.mH4MeasuredFlow .value, + _data.mH4RotorSpeed .value, + _data.mH4MotorSpeed .value, + _data.mH4MotorCtlCurrent .value, + _data.mH4RPM .value, + _data.mH4RotorCount .value, + _data.mH4PresFlow .value, + _data.mH4RotorHall .value, }; } bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRPM )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPresFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorHall )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4FlowSetPoint )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MeasuredFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MotorCtlCurrent )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorCount )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4PresFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorHall )) goto lError; return true ; @@ -58,14 +58,14 @@ */ MBloodFlow::Data MBloodFlow::data() const { Data data; - data.mFlowSetPoint = _data.mFlowSetPoint .value; - data.mMeasuredFlow = _data.mMeasuredFlow .value; - data.mRotorSpeed = _data.mRotorSpeed .value; - data.mMotorSpeed = _data.mMotorSpeed .value; - data.mMotorCtlCurrent = _data.mMotorCtlCurrent .value; - data.mRPM = _data.mRPM .value; - data.mRotorCount = _data.mRotorCount .value; - data.mPresFlow = _data.mPresFlow .value; - data.mRotorHall = _data.mRotorHall .value; + data.mFlowSetPoint = _data.mH4FlowSetPoint .value; + data.mMeasuredFlow = _data.mH4MeasuredFlow .value; + data.mRotorSpeed = _data.mH4RotorSpeed .value; + data.mMotorSpeed = _data.mH4MotorSpeed .value; + data.mMotorCtlCurrent = _data.mH4MotorCtlCurrent .value; + data.mRPM = _data.mH4RPM .value; + data.mRotorCount = _data.mH4RotorCount .value; + data.mPresFlow = _data.mH4PresFlow .value; + data.mRotorHall = _data.mH4RotorHall .value; return data; }