Index: denali.pro.user =================================================================== diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -r42c029b1704455433cb095d2e76dcd540c1f0046 --- denali.pro.user (.../denali.pro.user) (revision ac23b968f565c2beeb153ca2d554b8f868634512) +++ denali.pro.user (.../denali.pro.user) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/components/EntryDialog.qml =================================================================== diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -r42c029b1704455433cb095d2e76dcd540c1f0046 --- sources/gui/qml/components/EntryDialog.qml (.../EntryDialog.qml) (revision ac23b968f565c2beeb153ca2d554b8f868634512) +++ sources/gui/qml/components/EntryDialog.qml (.../EntryDialog.qml) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -69,7 +69,6 @@ } onAutoHideCancelChanged: { - console.log("Auto Hide Cancel", _root.autoHideCancel) if ( _root.autoHideCancel ) { _autoHideAnimation.stop() _root.autoHideCancel = false Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r42c029b1704455433cb095d2e76dcd540c1f0046 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -100,7 +100,7 @@ objectName : "_disinfectHeat" header.stepNames : [ _root.disinfectTitle , _root.heatTitle ] title.text : _root.heatTitle - hasTimeCircle : true + hasTimeCircle : false timeCircleMinimum : 0 timeCircleMaximum : vDisinfectDGData.heatTimeTotal timeCircleProgressValue : vDisinfectDGData.heatTimeElapsed @@ -110,11 +110,13 @@ isComplete : vDisinfectStates.heatComplete completeText : qsTr("Heat Disinfection Complete!") checkListStepNames : [ - qsTr("Pre-Disinfect Flush" ), - qsTr("Heating Up the Fluid" ), - qsTr("Heat Disinfect" ), - qsTr("Cooling Down" ), - qsTr("Post-Disinfect Flush" ), + qsTr("Pre-Disinfect Flush" ), + qsTr("Heating Up the Fluid" ), + qsTr("Heat Disinfect Reservoir 1" ), + qsTr("Heat Disinfect Transition Hot Water" ), + qsTr("Heat Disinfect Reservoir 2" ), + qsTr("Cooling Down" ), + qsTr("Post-Disinfect Flush" ), ] } @@ -162,9 +164,11 @@ onHeatNotRunningEntered : { } onHeatFlushBeforeDisinfectEntered : { _disinfectHeat .checkList.setItem(0, vheatFlushBeforeDisinfect )} onHeatWaterHeatUpEntered : { _disinfectHeat .checkList.setItem(1, vheatWaterHeatUp )} - onHeatDisinfectEntered : { _disinfectHeat .checkList.setItem(2, vheatDisinfect )} - onHeatDeviceCoolDownEntered : { _disinfectHeat .checkList.setItem(3, vheatDeviceCoolDown )} - onHeatFlushAfterDisinfectEntered : { _disinfectHeat .checkList.setItem(4, vheatFlushAfterDisinfect )} + onHeatDisinfectR1Entered : { _disinfectHeat .checkList.setItem(2, vheatDisinfectR1 )} + onHeatTransitionHotWaterEntered : { _disinfectHeat .checkList.setItem(3, vheatTransitionHotWater )} + onHeatDisinfectR2Entered : { _disinfectHeat .checkList.setItem(4, vheatDisinfectR2 )} + onHeatDeviceCoolDownEntered : { _disinfectHeat .checkList.setItem(5, vheatDeviceCoolDown )} + onHeatFlushAfterDisinfectEntered : { _disinfectHeat .checkList.setItem(6, vheatFlushAfterDisinfect )} onHeatCancelEntered : { } onHeatCompleteEntered : { } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r1585eedd8c283bd36522ff7afe99ad99b0997a93 -r42c029b1704455433cb095d2e76dcd540c1f0046 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 1585eedd8c283bd36522ff7afe99ad99b0997a93) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -87,7 +87,7 @@ EntryDialog { id: _vitalEntry titleText : qsTr("VITALS") autoHide : true - autoHideDuration : 2 * 60000 + autoHideDuration : 1 * 60000 confirmEnabled : _bphrEntry.isValid onConfirmClicked : { vTreatmentVitals.doConfirm( @@ -100,8 +100,6 @@ BPHREntry { id : _bphrEntry contentRectHeight : _vitalEntry.contentRect.height onClicked : { - console.log("clicked") - _vitalEntry.autoHideCancel = true } } Index: sources/view/dg/data/disinfect/VDisinfectStatesData.cpp =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r42c029b1704455433cb095d2e76dcd540c1f0046 --- sources/view/dg/data/disinfect/VDisinfectStatesData.cpp (.../VDisinfectStatesData.cpp) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ sources/view/dg/data/disinfect/VDisinfectStatesData.cpp (.../VDisinfectStatesData.cpp) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -51,7 +51,9 @@ heatNotRunning ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_NOT_RUNNING ); heatFlushBeforeDisinfect ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT ); heatWaterHeatUp ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER ); - heatDisinfect ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE ); + heatDisinfectR1 ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1 ); + heatTransitionHotWater ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER ); + heatDisinfectR2 ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2 ); heatDeviceCoolDown ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE ); heatFlushAfterDisinfect ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT ); heatCancel ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT ); Index: sources/view/dg/data/disinfect/VDisinfectStatesData.h =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r42c029b1704455433cb095d2e76dcd540c1f0046 --- sources/view/dg/data/disinfect/VDisinfectStatesData.h (.../VDisinfectStatesData.h) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ sources/view/dg/data/disinfect/VDisinfectStatesData.h (.../VDisinfectStatesData.h) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -63,7 +63,9 @@ STATE ( bool , heatNotRunning , false ) ///< HEAT_DISINFECT_UI_STATE_NOT_RUNNING , Heat disinfect UI , not running state STATE ( bool , heatFlushBeforeDisinfect , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT , Heat disinfect UI , flush before disinfect state STATE ( bool , heatWaterHeatUp , false ) ///< HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER , Heat disinfect UI , heat up water state - STATE ( bool , heatDisinfect , false ) ///< HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE , Heat disinfect UI , disinfect device state + STATE ( bool , heatDisinfectR1 , false ) ///< HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1 , Heat disinfect UI , disinfect reservoir 1 state + STATE ( bool , heatTransitionHotWater , false ) ///< HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER , Heat disinfect UI , transition hot water state + STATE ( bool , heatDisinfectR2 , false ) ///< HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2 , Heat disinfect UI , disinfect reservoir 2 state STATE ( bool , heatDeviceCoolDown , false ) ///< HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE , Heat disinfect UI , cool down device state STATE ( bool , heatFlushAfterDisinfect , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT , Heat disinfect UI , flush after disinfect state STATE ( bool , heatCancel , false ) ///< HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT , Heat disinfect UI , cancel disinfect state