Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -44,17 +44,18 @@ } PostTreatmentRinsebackComplete { id: _postTreatmentRinsebackComplete onAdditionalClicked : vTreatmentAdjustmentRinseback.doAdditional () //82.6 + onTreatmentBackClicked : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9 onConfirmClicked : vTreatmentAdjustmentRinseback.doConfirm () //82.7 onTreatmentEndClicked : vTreatmentAdjustmentRinseback.doTreatmentEnd () //82.8 } PostTreatmentAdditional { id: _postTreatmentAdditional } Connections { target: vHDTreatmentStates - onRbInitChanged : { if ( vrbInit ) { page( _postTreatmentRinsebackInit )}} - onRbRunChanged : { if ( vrbRun ) { page( _postTreatmentRinseback )}} - onRbPausedChanged : { if ( vrbPaused ) { page( _postTreatmentRinseback )}} - onRbStopChanged : { if ( vrbStop ) { page( _postTreatmentRinsebackComplete )}} - onRbAdditionalChanged : { if ( vrbAdditional ) { page( _postTreatmentAdditional )}} + onRbInitChanged : { page( _postTreatmentRinsebackInit , vrbInit )} + onRbRunChanged : { page( _postTreatmentRinseback , vrbRun )} + onRbPausedChanged : { page( _postTreatmentRinseback , vrbPaused )} + onRbStopChanged : { page( _postTreatmentRinsebackComplete , vrbStop )} + onRbAdditionalChanged : { page( _postTreatmentAdditional , vrbAdditional )} } Connections { target: vTreatmentAdjustmentRinseback @@ -69,3 +70,31 @@ } } } + +/* TODO: + // 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: _postTreatmentRinsebackInit + property: "opacity" + duration: 1000 + to: vHDTreatmentStates.rbInit ? 1 : 0 + } + PropertyAnimation { id: _rbStopAnimation + target: _postTreatmentRinsebackComplete + 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 + _postTreatmentRinsebackInit .visible = vHDTreatmentStates.rbInit + _postTreatmentRinseback .visible = vHDTreatmentStates.rbRun || vHDTreatmentStates.rbPaused + _postTreatmentRinsebackComplete .visible = vHDTreatmentStates.rbStop + _postTreatmentAdditional .visible = vHDTreatmentStates.rbAdditional + + } + onRbInitChanged: _rbInitAnimation.running = true + onRbStopChanged: _rbStopAnimation.running = true + } +*/