Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -rcba8451ac737fb0b618173a4bea37411fdaaf824 -rdfb5f7070961fd2a34c2cb8d897ecc43c4f46598 --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision dfb5f7070961fd2a34c2cb8d897ecc43c4f46598) @@ -45,8 +45,6 @@ // Rinseback EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit } EndTreatmentRinseback { id: _endTreatmentRinseback } - EndTreatmentAdditional { id: _endTreatmentAdditional } - EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect } Connections { target: stackView function onCurrentItemChanged() { @@ -72,19 +70,12 @@ function onAdditionalButtonClicked () { vTreatmentAdjustmentRinseback.doConfirm () } // Recirculate } - 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: vTDTreatmentStates function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )} function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} function onRbStopChanged ( vValue ) { if ( vValue ) { _rinsebackCompleteDialog.open() }} function onRbAdditionalChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} - function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )} } Connections { target: vTreatmentAdjustmentRinseback @@ -95,35 +86,6 @@ // and let them cleared for their own message when each get visible. _endTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text(); _endTreatmentRinseback .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: vTDTreatmentStates.rbInit ? 1 : 0 -// } -// PropertyAnimation { id: _rbStopAnimation -// target: _endTreatmentRinsebackComplete -// property: "opacity" -// duration: 1000 -// to: vTDTreatmentStates.rbStop ? 1 : 0 -// } -// Connections { target: vTDTreatmentStates -// onStateTriggered : { // this property is a TRIGGER and shall be set at the end of the property setters functions list -// _endTreatmentRinsebackInit .visible = vTDTreatmentStates.rbInit -// _endTreatmentRinseback .visible = vTDTreatmentStates.rbRun || vTDTreatmentStates.rbPaused -// _endTreatmentRinsebackComplete .visible = vTDTreatmentStates.rbStop -// _endTreatmentAdditional .visible = vTDTreatmentStates.rbAdditional -// -// } -// onRbInitChanged: _rbInitAnimation.running = true -// onRbStopChanged: _rbStopAnimation.running = true -// } -//