Index: sources/model/mtreatmentflows.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 --- sources/model/mtreatmentflows.cpp (.../mtreatmentflows.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/model/mtreatmentflows.cpp (.../mtreatmentflows.cpp) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) @@ -17,7 +17,7 @@ // ----- BloodFlow ----- QString MFlow::toString() const { - return QString(stringPrefix + "(%1, %2, %3, %4, %5, %6, %7)") + return QString(stringPrefix + ",%1,%2,%3,%4,%5,%6,%7") .arg(_data.mFlowSetPoint .value) .arg(_data.mMeasuredFlow .value) .arg(_data.mRotorSpeed .value) @@ -37,15 +37,23 @@ vData += _data.mPWMDutyCycle .value; } -void MFlow::fromByteArray(const QByteArray &vByteArray) { +bool MFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - Types::getValue<>(vByteArray, index, _data.mFlowSetPoint ); - Types::getValue<>(vByteArray, index, _data.mMeasuredFlow ); - Types::getValue<>(vByteArray, index, _data.mRotorSpeed ); - Types::getValue<>(vByteArray, index, _data.mMotorSpeed ); - Types::getValue<>(vByteArray, index, _data.mMotorCtlSpeed ); - Types::getValue<>(vByteArray, index, _data.mMotorCtlCurrent ); - Types::getValue<>(vByteArray, index, _data.mPWMDutyCycle ); + if (GetValue(vByteArray, index, _data.mFlowSetPoint )) + if (GetValue(vByteArray, index, _data.mMeasuredFlow )) + if (GetValue(vByteArray, index, _data.mRotorSpeed )) + if (GetValue(vByteArray, index, _data.mMotorSpeed )) + if (GetValue(vByteArray, index, _data.mMotorCtlSpeed )) + if (GetValue(vByteArray, index, _data.mMotorCtlCurrent )) + if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) + 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } const MFlow::Data &MFlow::data() const {