Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -rcca603facdefb2879d5defb8fd335a978bd63cf5 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision cca603facdefb2879d5defb8fd335a978bd63cf5) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -26,151 +26,151 @@ * \brief the post treatment prime stack screen */ StackItem { id: _root - objectName: "_DisinfectStack" +// objectName: "_DisinfectStack" - stackView.initialItem : null +// stackView.initialItem : null - property int stackStepIndex : 1 +// property int stackStepIndex : 1 - readonly property string disinfectTitle : qsTr("Disinfection") - readonly property string flushTitle : qsTr("Water Flush") - readonly property string heatActiveTitle : qsTr("Heat Disinfect with Active Cool") - readonly property string chemicalTitle : qsTr("Chemical Disinfect") - readonly property string chemFlushTitle : qsTr("Chemical Flush") - readonly property string roPermeateTitle : qsTr("RO Permeate Sample") - readonly property string heatPassiveTitle: qsTr("Heat Disinfect") +// readonly property string disinfectTitle : qsTr("Disinfection") +// readonly property string flushTitle : qsTr("Water Flush") +// readonly property string heatActiveTitle : qsTr("Heat Disinfect with Active Cool") +// readonly property string chemicalTitle : qsTr("Chemical Disinfect") +// readonly property string chemFlushTitle : qsTr("Chemical Flush") +// readonly property string roPermeateTitle : qsTr("RO Permeate Sample") +// readonly property string heatPassiveTitle: qsTr("Heat Disinfect") - function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )} - function doDisinfectHeatActiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatActiveCool (); page( _disinfectHeatActiveCool )} - function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )} - function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )} - function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate (); page( _disinfectROPermeate )} - function doDisinfectHeatPassiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatPassiveCool (); page( _disinfectHeatPassiveCool )} +// function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )} +// function doDisinfectHeatActiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatActiveCool (); page( _disinfectHeatActiveCool )} +// function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )} +// function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )} +// function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate (); page( _disinfectROPermeate )} +// function doDisinfectHeatPassiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatPassiveCool (); page( _disinfectHeatPassiveCool )} - function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page( _disinfectHome )} - function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); } +// function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page( _disinfectHome )} +// function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); } - function doDisplayReasonText (vPage) { - if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } - else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } - } +// function doDisplayReasonText (vPage) { +// if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } +// else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } +// } - DisinfectBase { id : _disinfectHome - objectName : "_disinfectHome" - property int stackStepIndex : 0 - header.stepNames : [ _root.disinfectTitle ] - title.text : _root.disinfectTitle +// DisinfectBase { id : _disinfectHome +// objectName : "_disinfectHome" +// property int stackStepIndex : 0 +// header.stepNames : [ _root.disinfectTitle ] +// title.text : _root.disinfectTitle - TouchGrid { - width : parent.width / 2 - itemWidth : 400 - colCount : 1 - colSpacing : 0 - itemsText : [ _root.flushTitle , _root.heatActiveTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , _root.heatPassiveTitle ] - onItemClicked : [ doDisinfectFlush , doDisinfectHeatActiveCool , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , doDisinfectHeatPassiveCool][vIndex]() - } - Image { id: _denaliDeviceImage - anchors.right : parent.right - anchors.verticalCenter : parent.verticalCenter - anchors.rightMargin : Variables.minVGap2 * 4 - fillMode : Image.PreserveAspectFit - width : Variables.denaliDeviceDiameter - height : Variables.denaliDeviceDiameter - source : "qrc:/images/iDenaliDevice" - } - header.backVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. - onBackClicked : { vDisinfectAdjustDisinfect .doDisinfectCancel () } - } +// TouchGrid { +// width : parent.width / 2 +// itemWidth : 400 +// colCount : 1 +// colSpacing : 0 +// itemsText : [ _root.flushTitle , _root.heatActiveTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , _root.heatPassiveTitle ] +// onItemClicked : [ doDisinfectFlush , doDisinfectHeatActiveCool , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , doDisinfectHeatPassiveCool][vIndex]() +// } +// Image { id: _denaliDeviceImage +// anchors.right : parent.right +// anchors.verticalCenter : parent.verticalCenter +// anchors.rightMargin : Variables.minVGap2 * 4 +// fillMode : Image.PreserveAspectFit +// width : Variables.denaliDeviceDiameter +// height : Variables.denaliDeviceDiameter +// source : "qrc:/images/iDenaliDevice" +// } +// header.backVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. +// onBackClicked : { vDisinfectAdjustDisinfect .doDisinfectCancel () } +// } - DisinfectBase { id : _disinfectFlush - objectName : "_disinfectFlush" - header.stepNames : [ _root.disinfectTitle , _root.flushTitle ] - title.text : _root.flushTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectFlush +// objectName : "_disinfectFlush" +// header.stepNames : [ _root.disinfectTitle , _root.flushTitle ] +// title.text : _root.flushTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectHeatActiveCool - objectName : "_disinfectHeatActiveCool" - header.stepLineLength : 200 - header.stepNames : [ _root.disinfectTitle , _root.heatActiveTitle ] - title.text : _root.heatActiveTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectHeatActiveCool +// objectName : "_disinfectHeatActiveCool" +// header.stepLineLength : 200 +// header.stepNames : [ _root.disinfectTitle , _root.heatActiveTitle ] +// title.text : _root.heatActiveTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectChemical - objectName : "_disinfectChemical" - header.stepNames : [ _root.disinfectTitle , _root.chemicalTitle ] - title.text : _root.chemicalTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectChemical +// objectName : "_disinfectChemical" +// header.stepNames : [ _root.disinfectTitle , _root.chemicalTitle ] +// title.text : _root.chemicalTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectChemFlush - objectName : "_disinfectChemFlush" - header.stepNames : [ _root.disinfectTitle , _root.chemFlushTitle ] - title.text : _root.chemFlushTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectChemFlush +// objectName : "_disinfectChemFlush" +// header.stepNames : [ _root.disinfectTitle , _root.chemFlushTitle ] +// title.text : _root.chemFlushTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectROPermeate - objectName : "_disinfectROPermeate" - header.stepNames : [ _root.disinfectTitle , _root.roPermeateTitle ] - title.text : _root.roPermeateTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectROPermeate +// objectName : "_disinfectROPermeate" +// header.stepNames : [ _root.disinfectTitle , _root.roPermeateTitle ] +// title.text : _root.roPermeateTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectHeatPassiveCool - objectName : "_disinfectHeatPassiveCool" - header.stepNames : [ _root.disinfectTitle , _root.heatPassiveTitle ] - title.text : _root.heatPassiveTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectHeatPassiveCool +// objectName : "_disinfectHeatPassiveCool" +// header.stepNames : [ _root.disinfectTitle , _root.heatPassiveTitle ] +// title.text : _root.heatPassiveTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } // ----- Navigation - Connections { target: vTDOpMode - function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem - } +// Connections { target: vTDOpMode +// function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem +// } - // ----- Responses - Connections { target: vDisinfectAdjustDisinfect - function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} - function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} - function onAdjustment_DisinfectStartHeatActiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatActiveCool )} - function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} - function onAdjustment_DisinfectStartChemFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectChemFlush )} - function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate )} - function onAdjustment_DisinfectStartHeatPassiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatPassiveCool)} - } +// // ----- Responses +// Connections { target: vDisinfectAdjustDisinfect +// function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} +// function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} +// function onAdjustment_DisinfectStartHeatActiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatActiveCool )} +// function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} +// function onAdjustment_DisinfectStartChemFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectChemFlush )} +// function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate )} +// function onAdjustment_DisinfectStartHeatPassiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatPassiveCool)} +// } - onVisibleChanged: { - if (visible) { - _mainMenu.hidden = true - } - else { - stackView.initialItem = null - } - } +// onVisibleChanged: { +// if (visible) { +// _mainMenu.hidden = true +// } +// else { +// stackView.initialItem = null +// } +// } }