Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -18,28 +18,28 @@ QString MAdjustDurationConfirmResponse::toString() const { return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mDuration .value) - .arg(_data.mUFVolume .value) - .arg(_data.mUFRate .value); + .arg(_data.mAccepted .value) + .arg(_data.mReason .value) + .arg(_data.mDuration .value) + .arg(_data.mUFVolumeRemoved .value) + .arg(_data.mUFSetVolume .value); } void MAdjustDurationConfirmResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; - vData += _data.mDuration .value; - vData += _data.mUFVolume .value; - vData += _data.mUFRate .value; + vData += _data.mAccepted .value; + vData += _data.mReason .value; + vData += _data.mDuration .value; + vData += _data.mUFVolumeRemoved .value; + vData += _data.mUFSetVolume .value; } bool MAdjustDurationConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeRemoved )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFSetVolume )) goto lError; return true ; @@ -57,10 +57,10 @@ */ AdjustDurationConfirmResponseData MAdjustDurationConfirmResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mDuration = _data.mDuration .value; - data.mUFVolume = _data.mUFVolume .value; - data.mUFRate = _data.mUFRate .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mUFVolumeRemoved = _data.mUFVolumeRemoved .value; + data.mUFSetVolume = _data.mUFSetVolume .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -35,12 +35,12 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAccepted | - * | #2:(U32) | \ref Data::mReason | - * | | | - * | #4:(U32) | \ref Data::mDuration | - * | #3:(F32) | \ref Data::mUFVolume | - * | #5:(F32) | \ref Data::mUFRate | + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | | | + * | #4:(U32) | \ref Data::mDuration | + * | #3:(F32) | \ref Data::mUFVolumeRemoved | + * | #5:(F32) | \ref Data::mUFSetVolume | * * \sa Data * @@ -60,22 +60,22 @@ public: QString stringPrefix = "AdjustDurationConfirm"; struct Data { - bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ - float mUFVolume = 0; /*!< UF volume value of type float extracted out */ - float mUFRate = 0; /*!< UF rate value of type float extracted out */ + quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ + float mUFVolumeRemoved = 0; /*!< UF volume removed value of type float extracted out */ + float mUFSetVolume = 0; /*!< UF set volume value of type float extracted out */ }; protected: struct _Data { - Types::U32 mAccepted ; - Types::U32 mReason ; + Types::U32 mAccepted ; + Types::U32 mReason ; - Types::U32 mDuration ; - Types::F32 mUFVolume ; - Types::F32 mUFRate ; + Types::U32 mDuration ; + Types::F32 mUFVolumeRemoved ; + Types::F32 mUFSetVolume ; } _data; public: Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -18,21 +18,21 @@ QVariantList MAdjustDurationEditResponse::parameters() const { return { - _data.mAccepted.value, - _data.mReason .value, - _data.mDuration.value, - _data.mUFVolume.value, - _data.mUFRate .value + _data.mAccepted .value, + _data.mReason .value, + _data.mDuration .value, + _data.mUFVolumeRemoved .value, + _data.mUFSetVolume .value }; } bool MAdjustDurationEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeRemoved )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFSetVolume )) goto lError; return true ; @@ -49,10 +49,10 @@ */ AdjustDurationEditResponseData MAdjustDurationEditResponse::data() const { Data data; - data.mAccepted = _data.mAccepted.value; - data.mReason = _data.mReason .value; - data.mDuration = _data.mDuration.value; - data.mUFVolume = _data.mUFVolume.value; - data.mUFRate = _data.mUFRate .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mUFVolume = _data.mUFVolumeRemoved.value; + data.mUFRate = _data.mUFSetVolume .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h (.../MTreatmentAdjustDurationEditResponse.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h (.../MTreatmentAdjustDurationEditResponse.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -37,11 +37,11 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAccepted | - * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mDuration | - * | #4:(F32) | \ref Data::mUFVolume | - * | #4:(F32) | \ref Data::mUFRate | + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mDuration | + * | #4:(F32) | \ref Data::mUFVolumeRemoved | + * | #4:(F32) | \ref Data::mUFSetVolume | * * \sa Data * @@ -62,11 +62,11 @@ struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mDuration ; - Types::F32 mUFVolume ; - Types::F32 mUFRate ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mDuration ; + Types::F32 mUFVolumeRemoved ; + Types::F32 mUFSetVolume ; } _data; public: @@ -76,11 +76,11 @@ QString infoText () const override { return QString("AdjustDurationEdit") ; } struct Data { - bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mDuration = 0; /*!< Duration value of type quint32 extracted out */ - float mUFVolume = 0; /*!< UF Volume value of type float extracted out */ - float mUFRate = 0; /*!< UF Rate value of type float extracted out */ + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mDuration = 0; /*!< Duration value of type quint32 extracted out */ + float mUFVolumeRemoved = 0; /*!< UF Volume Removed value of type float extracted out */ + float mUFSetVolume = 0; /*!< UF Set Volume value of type float extracted out */ }; MAdjustDurationEditResponse () { } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -38,11 +38,11 @@ void VTreatmentAdjustmentDurationConfirm::onActionReceive(const AdjustDurationConfirmResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - ufVolume ( vData.mUFVolume / 1000 ); // mL => L - ufRate ( vData.mUFRate ); + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ufVolumeRemoved ( vData.mUFVolumeRemoved / 1000 ); // mL => L + ufSetVolume ( vData.mUFSetVolume / 1000 ); // mL => L // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -41,12 +41,12 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustment , 0) + TRIGGER( bool , adjustment , 0) // Treatment Duration data - READONLY( quint32 , duration , 0) - READONLY( float , ufVolume , 0) - READONLY( float , ufRate , 0) + READONLY( quint32 , duration , 0) + READONLY( float , ufVolumeRemoved , 0) + READONLY( float , ufSetVolume , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationConfirm, AdjustDurationConfirmResponseData) Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp (.../VTreatmentAdjustmentDurationEdit.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp (.../VTreatmentAdjustmentDurationEdit.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -38,11 +38,11 @@ void VTreatmentAdjustmentDurationEdit::onActionReceive(const AdjustDurationEditResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - ufVolume ( vData.mUFVolume / 1000 ); // mL => L - ufRate ( vData.mUFRate ); + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ufVolumeRemoved ( vData.mUFVolumeRemoved / 1000 ); // mL => L + ufSetVolume ( vData.mUFSetVolume / 1000 ); // mL => L // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h (.../VTreatmentAdjustmentDurationEdit.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h (.../VTreatmentAdjustmentDurationEdit.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -41,12 +41,12 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustment , 0) + TRIGGER( bool , adjustment , 0) // Treatment Duration data - READONLY( quint32 , duration , 0) - READONLY( float , ufVolume , 0) - READONLY( float , ufRate , 0) + READONLY( quint32 , duration , 0) + READONLY( float , ufVolumeRemoved , 0) + READONLY( float , ufSetVolume , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationEdit, AdjustDurationEditResponseData)