Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -rf68b226e67eb500758ee94fe015df48931240013 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file EndTreatmentRinsebackStack.qml * \author (last) Behrouz NematiPour - * \date (last) 15-May-2021 + * \date (last) 19-Jul-2023 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -37,6 +37,7 @@ EndTreatmentRinseback { id: _endTreatmentRinseback } EndTreatmentRinsebackComplete { id: _endTreatmentRinsebackComplete } EndTreatmentAdditional { id: _endTreatmentAdditional } + EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect } Connections { target: _endTreatmentRinsebackInit function onRinsebackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doStart ()} //82.0 @@ -56,13 +57,19 @@ function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doConfirm ()} //82.7 function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8 } + Connections { target: _endTreatmentRinsebackReconnect + function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4 + function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9 + function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8 + } Connections { target: vHDTreatmentStates function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )} function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} function onRbStopChanged ( vValue ) { page( _endTreatmentRinsebackComplete , vValue )} function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )} + function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )} } Connections { target: vTreatmentAdjustmentRinseback @@ -74,34 +81,35 @@ _endTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text(); _endTreatmentRinseback .reasonText = vTreatmentAdjustmentRinseback.text(); _endTreatmentRinsebackComplete .reasonText = vTreatmentAdjustmentRinseback.text(); + _endTreatmentRinsebackReconnect .reasonText = vTreatmentAdjustmentRinseback.text(); } } } -/* TODO : stackView manual performance enhanced. - // an idea that is being worked on for later performance imporovement - // if the stackview becomes slow this idea is a manual transition with animation to be replacecd with stackView - PropertyAnimation { id: _rbInitAnimation - target: _endTreatmentRinsebackInit - property: "opacity" - duration: 1000 - to: vHDTreatmentStates.rbInit ? 1 : 0 - } - PropertyAnimation { id: _rbStopAnimation - target: _endTreatmentRinsebackComplete - property: "opacity" - duration: 1000 - to: vHDTreatmentStates.rbStop ? 1 : 0 - } - Connections { target: vHDTreatmentStates - onStateTriggered : { // this property is a TRIGGER and shall be set at the end of the property setters functions list - _endTreatmentRinsebackInit .visible = vHDTreatmentStates.rbInit - _endTreatmentRinseback .visible = vHDTreatmentStates.rbRun || vHDTreatmentStates.rbPaused - _endTreatmentRinsebackComplete .visible = vHDTreatmentStates.rbStop - _endTreatmentAdditional .visible = vHDTreatmentStates.rbAdditional - - } - onRbInitChanged: _rbInitAnimation.running = true - onRbStopChanged: _rbStopAnimation.running = true - } -*/ +// TODO : stackView manual performance enhanced. +// // an idea that is being worked on for later performance imporovement +// // if the stackview becomes slow this idea is a manual transition with animation to be replacecd with stackView +// PropertyAnimation { id: _rbInitAnimation +// target: _endTreatmentRinsebackInit +// property: "opacity" +// duration: 1000 +// to: vHDTreatmentStates.rbInit ? 1 : 0 +// } +// PropertyAnimation { id: _rbStopAnimation +// target: _endTreatmentRinsebackComplete +// property: "opacity" +// duration: 1000 +// to: vHDTreatmentStates.rbStop ? 1 : 0 +// } +// Connections { target: vHDTreatmentStates +// onStateTriggered : { // this property is a TRIGGER and shall be set at the end of the property setters functions list +// _endTreatmentRinsebackInit .visible = vHDTreatmentStates.rbInit +// _endTreatmentRinseback .visible = vHDTreatmentStates.rbRun || vHDTreatmentStates.rbPaused +// _endTreatmentRinsebackComplete .visible = vHDTreatmentStates.rbStop +// _endTreatmentAdditional .visible = vHDTreatmentStates.rbAdditional +// +// } +// onRbInitChanged: _rbInitAnimation.running = true +// onRbStopChanged: _rbStopAnimation.running = true +// } +//