Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r49dadacdb78d6e7a7e52bf405a4a3c9308f874e0 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 49dadacdb78d6e7a7e52bf405a4a3c9308f874e0) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -115,12 +115,7 @@ } } - TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration } - Connections { target: _treatmentAdjustmentDuration - function onConfirmClicked ( vValue ) { vTreatmentAdjustmentDuration.doAdjustment( - _treatmentAdjustmentDuration.durationValue ) - } - } + TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration } TreatmentAdjustmentVitalsInterval { id: _treatmentAdjustmentVitalsInterval } @@ -136,18 +131,6 @@ } } - Connections { target: vTreatmentAdjustmentDuration - function onAdjustmentTriggered ( vValue ) { - if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { - vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentDuration.ultrafiltration - _treatmentAdjustmentDuration.accept() - } else { - _treatmentAdjustmentDuration.setDurationValue(vTreatmentAdjustmentDuration.duration); - _treatmentAdjustmentDuration.notification.text = vTreatmentAdjustmentDuration.text(); - } - } - } - Connections { target: vTreatmentAdjustmentPressuresLimits function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -28,7 +28,7 @@ * To adjust the treatment duration */ TreatmentAdjustmentBase { id: _root - objectName: "_TreatmentAdjustmentDuration" // SquishQt testability + objectName : "_TreatmentAdjustmentDuration" // SquishQt testability closeVisible : true confirmVisible : false @@ -41,10 +41,10 @@ StackItem { id: _treatmentDurationStack objectName : "_treatmentDurationStack" anchors { - top: parent.top - bottom: notification.top - left: parent.left - right: parent.right + top : parent.top + bottom : notification.top + left : parent.left + right : parent.right } visible : true stackView { @@ -56,13 +56,12 @@ } TreatmentAdjustmentDurationEdit { id: _treatmentAdjustmentDurationEdit - objectName: "_treatmentAdjustmentDurationEdit" - visible: false + objectName : "_treatmentAdjustmentDurationEdit" + visible : false StackView.onActivating : { _root.titleText = qsTr("Edit Treatment Duration") _root.notificationText = "" - reset() } onContinueClicked : function(vNewTreatmentDuration) { @@ -73,13 +72,48 @@ } TreatmentAdjustmentDurationConfirm { id: _treatmentAdjustmentDurationConfirm - objectName: "_treatmentAdjustmentDurationConfirm" - visible: false + objectName : "_treatmentAdjustmentDurationConfirm" + visible : false StackView.onActivating : { _root.titleText = qsTr("Confirm Treatment Duration") _root.notificationText = "" } + + onConfirmClicked : function(vNewTreatmentDuration) { + // send new duration to TD and wait + // if accepted moves to confirm screen, otherwise show error in notification + vTreatmentAdjustmentDurationConfirm.doConfirm(vNewTreatmentDuration) + } } + + Connections { target: vTreatmentAdjustmentDurationEdit + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentDurationEdit.adjustment_Accepted) { + notification.text = "" + + _treatmentAdjustmentDurationConfirm.newTreatmentDuration = vTreatmentAdjustmentDurationEdit.duration + _treatmentAdjustmentDurationConfirm.ufVolumeGoal = vTreatmentAdjustmentDurationEdit.ufVolumeGoal + _treatmentAdjustmentDurationConfirm.ufRate = vTreatmentAdjustmentDurationEdit.ufRate + + _treatmentDurationStack.page(_treatmentAdjustmentDurationConfirm) + } + else { + notification.text = vTreatmentAdjustmentDurationEdit.adjustment_ReasonText + } + } + } + + Connections { target: vTreatmentAdjustmentDurationConfirm + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentDurationConfirm.adjustment_Accepted) { + notification.text = "" + close() + } + else { + notification.text = vTreatmentAdjustmentDurationConfirm.adjustment_ReasonText + } + } + } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml =================================================================== diff -u -rd5e9940fa96373f6cc118dfa9761d95f361689a5 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision d5e9940fa96373f6cc118dfa9761d95f361689a5) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -30,30 +30,70 @@ Item { id: _root objectName: "_TreatmentAdjustmentDurationConfirm" - signal confirmVolumeClicked(int vDuration) + property real ufVolumeGoal : 0 + property real ufRate : 0 + property int newTreatmentDuration : 0 - function reset() { - // _volumeGoalAdjuster.value = _private.setVolume - } + signal confirmClicked(int vNewTreatmentDuration) - component LabelUnitText: LabelUnitContainer { id: _labelUnitText - objectName : "_labelUnitText" - - property alias valueText: _labelUnitContainerText.text - + component LabelUnitValue: Rectangle { id: _labelUnitValue + property alias label : _label.text + property string unit : "" + property alias value : _value.text + property color textColor : Colors.offWhite width : (_infoArea.width - (_infoRow.spacing * 2)) / 3 height : Variables.adjustmentLabelUnitContainerHeight - titleFontPixelSize : Fonts.fontPixelContainerTitleSmall - unitText : Variables.unitTextDialCond - unitFontPixelSize : Fonts.fontPixelContainerUnitSmall + radius : 8.5 + color : Colors.panelBackgroundColor + border { + width : Variables.panelBorderWidth + color : Colors.panelBorderColor + } - contentItem: Text { id: _labelUnitContainerText - objectName : "_labelUnitContainerText" - anchors.centerIn : parent - width : contentWidth - height : contentHeight - color : Colors.ufVolumeGoalText - font.pixelSize : Fonts.fontPixelValueControl + Item { id: _contentItem + anchors.centerIn: parent + width : childrenRect.width + height : parent.height + + Text { id: _label + anchors { + left : parent.left + verticalCenter : parent.verticalCenter + } + width : contentWidth + color : _labelUnitValue.textColor + font.pixelSize : Fonts.fontPixelContainerTitleSmall + } + + Text { id: _unit + anchors { + left : _label.right + leftMargin : 5 + baseline : _label.baseline + } + width : contentWidth + text : _labelUnitValue.unit.length > 0 ? ("(%1)").arg(_labelUnitValue.unit) : "" + color : _labelUnitValue.textColor + font { + pixelSize : Fonts.fontPixelContainerUnitSmall + weight : Font.Thin + } + } + + Text { id: _value + anchors{ + left : _unit.right + leftMargin : Variables.defaultMargin + baseline : _label.baseline + } + width : 60 + horizontalAlignment : Text.AlignLeft + color : Colors.ufVolumeGoalText + font { + pixelSize : Fonts.fontPixelValueControl + weight : Font.DemiBold + } + } } } @@ -73,25 +113,22 @@ anchors.centerIn: parent spacing: Variables.defaultMargin * 2 - LabelUnitText { id: _ufVolumeGoal - objectName : "_ufVolumeGoal" - text : qsTr("UF Volume Goal") - unitText : Variables.unitVolume - valueText : "--" + LabelUnitValue { id: _ufVolumeGoal + label : qsTr("UF Volume Goal") + unit : Variables.unitVolume + value : _root.ufVolumeGoal.toFixed(Variables.ultrafiltrationPrecision) } - LabelUnitText { id: _ufNewRate - objectName : "_ufNewRate" - text : qsTr("New UF Rate") - unitText : Variables.unitTextRate - valueText : "--" + LabelUnitValue { id: _ufRate + label : qsTr("New UF Rate") + unit : Variables.unitTextRate + value : _root.ufRate.toFixed(Variables.ultrafiltrationPrecision) } - LabelUnitText { id: _newTreatmentDuration - objectName : "_newTreatmentDuration" - text : qsTr("New Treatment Duration") - unitText : Variables.unitTextDuration - valueText : "--" + LabelUnitValue { id: _newTreatmentDuration + label : qsTr("New Treatment Duration") + unit : Variables.unitTextDuration + value : _root.newTreatmentDuration } } } @@ -112,7 +149,7 @@ isDefault : true onClicked : { - _root.confirmClicked() + _root.confirmClicked(_root.newTreatmentDuration) } } } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp =================================================================== diff -u -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -21,25 +21,25 @@ .arg(_data.mAccepted .value) .arg(_data.mReason .value) .arg(_data.mDuration .value) - .arg(_data.mUFVolumeRemoved .value) - .arg(_data.mUFSetVolume .value); + .arg(_data.mUFVolumeGoal .value) + .arg(_data.mUFRate .value); } void MAdjustDurationConfirmResponse::toVariantList(QVariantList &vData) const { vData += _data.mAccepted .value; vData += _data.mReason .value; vData += _data.mDuration .value; - vData += _data.mUFVolumeRemoved .value; - vData += _data.mUFSetVolume .value; + vData += _data.mUFVolumeGoal .value; + vData += _data.mUFRate .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.mUFVolumeRemoved )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFSetVolume )) 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.mUFVolumeGoal )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRate )) 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.mUFVolumeRemoved = _data.mUFVolumeRemoved .value; - data.mUFSetVolume = _data.mUFSetVolume .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mUFVolumeGoal = _data.mUFVolumeGoal .value; + data.mUFRate = _data.mUFRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h =================================================================== diff -u -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -39,8 +39,8 @@ * | #2:(U32) | \ref Data::mReason | * | | | * | #4:(U32) | \ref Data::mDuration | - * | #3:(F32) | \ref Data::mUFVolumeRemoved | - * | #5:(F32) | \ref Data::mUFSetVolume | + * | #3:(F32) | \ref Data::mUFVolumeGoal | + * | #5:(F32) | \ref Data::mUFRate | * * \sa Data * @@ -64,8 +64,8 @@ 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 */ + float mUFVolumeGoal = 0; /*!< UF volume goal value of type float extracted out */ + float mUFRate = 0; /*!< UF rate value of type float extracted out */ }; protected: @@ -74,8 +74,8 @@ Types::U32 mReason ; Types::U32 mDuration ; - Types::F32 mUFVolumeRemoved ; - Types::F32 mUFSetVolume ; + Types::F32 mUFVolumeGoal ; + Types::F32 mUFRate ; } _data; public: Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp =================================================================== diff -u -r80a8c26d9ac3ee0b11fb18873b5f912cd9d2ae75 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision 80a8c26d9ac3ee0b11fb18873b5f912cd9d2ae75) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -18,26 +18,26 @@ QVariantList MAdjustDurationEditResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - _data.mDuration .value, - _data.mUFVolumeRemoved .value, - _data.mUFSetVolume .value + _data.mAccepted .value, + _data.mReason .value, + _data.mDuration .value, + _data.mUFVolumeGoal .value, + _data.mUFRate .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.mUFVolumeRemoved )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFSetVolume )) 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.mUFVolumeGoal )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; return true ; lError: - if(vIndex) { *vIndex = index; } + if (vIndex) { *vIndex = index; } return false ; } @@ -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.mUFVolumeRemoved = _data.mUFVolumeRemoved.value; - data.mUFSetVolume = _data.mUFSetVolume .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mUFVolumeGoal = _data.mUFVolumeGoal .value; + data.mUFRate = _data.mUFRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h =================================================================== diff -u -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h (.../MTreatmentAdjustDurationEditResponse.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h (.../MTreatmentAdjustDurationEditResponse.h) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -40,8 +40,8 @@ * | #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 | + * | #4:(F32) | \ref Data::mUFVolumeGoal | + * | #4:(F32) | \ref Data::mUFRate | * * \sa Data * @@ -62,11 +62,11 @@ struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mDuration ; - Types::F32 mUFVolumeRemoved ; - Types::F32 mUFSetVolume ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mDuration ; + Types::F32 mUFVolumeGoal ; + Types::F32 mUFRate ; } _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 mUFVolumeRemoved = 0; /*!< UF Volume Removed value of type float extracted out */ - float mUFSetVolume = 0; /*!< UF Set Volume 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 mUFVolumeGoal = 0; /*!< UF Volume Goal value of type float extracted out */ + float mUFRate = 0; /*!< UF Rate value of type float extracted out */ }; MAdjustDurationEditResponse () { } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp =================================================================== diff -u -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -36,13 +36,24 @@ ADJUST_VIEW_CONNECTION( AdjustDurationConfirmRequestData); } +/*! + * \brief doAdjustment + * \details the invocable slot to adjust the treatment duration + * \param vDuration - treatment duration + */ +void VTreatmentAdjustmentDurationConfirm::doConfirm(const quint32 vDuration) +{ + _data.duration = vDuration; + emit didAdjustment(_data); +} + void VTreatmentAdjustmentDurationConfirm::onActionReceive(const AdjustDurationConfirmResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - ufVolumeRemoved ( vData.mUFVolumeRemoved / 1000 ); // mL => L - ufSetVolume ( vData.mUFSetVolume / 1000 ); // mL => L + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ufVolumeGoal ( vData.mUFVolumeGoal / 1000 ); // mL => L + ufRate ( vData.mUFRate ); // *** 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 -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -45,22 +45,14 @@ // Treatment Duration data READONLY( quint32 , duration , 0) - READONLY( float , ufVolumeRemoved , 0) - READONLY( float , ufSetVolume , 0) + READONLY( float , ufVolumeGoal , 0) + READONLY( float , ufRate , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationConfirm, AdjustDurationConfirmResponseData) // ----- Adjust Duration public slots: - /*! - * \brief doAdjustment - * \details the invocable slot to adjust the treatment duration - * \param vDuration - treatment duration - */ - void doAdjustment(quint32 vDuration) { - _data.duration = vDuration; - emit didAdjustment(_data); - } + void doConfirm(const quint32 vDuration); signals: /*! Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp =================================================================== diff -u -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp (.../VTreatmentAdjustmentDurationEdit.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp (.../VTreatmentAdjustmentDurationEdit.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -36,13 +36,24 @@ ADJUST_VIEW_CONNECTION( AdjustDurationEditRequestData); } +/*! + * \brief doAdjustment + * \details the invocable slot to adjust the treatment duration + * \param vDuration - treatment duration + */ +void VTreatmentAdjustmentDurationEdit::doAdjustment(const quint32 vDuration) +{ + _data.duration = vDuration; + emit didAdjustment(_data); +} + void VTreatmentAdjustmentDurationEdit::onActionReceive(const AdjustDurationEditResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - ufVolumeRemoved ( vData.mUFVolumeRemoved / 1000 ); // mL => L - ufSetVolume ( vData.mUFSetVolume / 1000 ); // mL => L + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ufVolumeGoal ( vData.mUFVolumeGoal / 1000 ); // mL => L + ufRate ( vData.mUFRate ); // *** 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 -r266c2f5a2566834a1384a936736d2f01d07e4e08 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h (.../VTreatmentAdjustmentDurationEdit.h) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h (.../VTreatmentAdjustmentDurationEdit.h) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -41,26 +41,18 @@ // 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 , ufVolumeRemoved , 0) - READONLY( float , ufSetVolume , 0) + READONLY( quint32 , duration , 0) + READONLY( float , ufVolumeGoal , 0) + READONLY( float , ufRate , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationEdit, AdjustDurationEditResponseData) // ----- Adjust Duration public slots: - /*! - * \brief doAdjustment - * \details the invocable slot to adjust the treatment duration - * \param vDuration - treatment duration - */ - void doAdjustment(quint32 vDuration) { - _data.duration = vDuration; - emit didAdjustment(_data); - } + void doAdjustment(const quint32 vDuration); signals: /*!