Index: sources/model/td/data/MTDEjectorData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/model/td/data/MTDEjectorData.cpp (.../MTDEjectorData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/MTDEjectorData.cpp (.../MTDEjectorData.cpp) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -18,15 +18,19 @@ QVariantList MTDEjectorData::parameters() const { return { - _data.mH5State .value, - _data.mH5SetSpeed .value, + _data.mState .value, + _data.mSetSpeed .value, + _data.mRetractOpticalSensor .value, + _data.mEngageOpticalSensor .value, }; } bool MTDEjectorData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mH5State )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH5SetSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSetSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRetractOpticalSensor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mEngageOpticalSensor )) goto lError; return true ; @@ -43,7 +47,9 @@ */ MTDEjectorData::Data MTDEjectorData::data() const{ Data data; - data.mState = _data.mH5State .value; - data.mSetSpeed = _data.mH5SetSpeed .value; + data.mState = _data.mState .value; + data.mSetSpeed = _data.mSetSpeed .value; + data.mRetractOpticalSensor = _data.mRetractOpticalSensor .value; + data.mEngageOpticalSensor = _data.mEngageOpticalSensor .value; return data; }