Index: simulator/plugins/disinfectionstates/interface.ui =================================================================== diff -u -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 -r967521dff94783ce48b50abc8db6bcd67bb501bf --- simulator/plugins/disinfectionstates/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) +++ simulator/plugins/disinfectionstates/interface.ui (.../interface.ui) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) @@ -6,8 +6,8 @@ 0 0 - 726 - 669 + 608 + 731 @@ -59,14 +59,20 @@ - - + + - 320 - 95 + 0 + 200 + + + 16777215 + 200 + + 8 @@ -99,7 +105,7 @@ false - 3 + 8 2 @@ -108,7 +114,7 @@ true - 125 + 330 true @@ -137,9 +143,34 @@ 2 + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + - 0 : DG Disinfec Mode + 3 : Chemical @@ -149,119 +180,100 @@ - DG_DISINFECT_FLUSH + CHEM_DISINFECT_UI_STATE_NOT_RUNNING - Disinfect Flush Mode + Chemical disinfect UI, not running state - DG_DISINFECT_HEAT + CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT - Disinfect Heat Mode + Chemical disinfect UI, flush before disinfect state - DG_DISINFECT_CHEM + CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID - Disinfect Chenical Mode + Chemical disinfect UI, mix water and acid state - - - - - - - 320 - 95 - - - - - 8 - 50 - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - true - - - false - - - 0 - - - 2 - - - true - - - 125 - - - true - - - true - - - 18 - - - 21 - - + - 1 : Flush + CHEM_DISINFECT_UI_STATE_REMOVE_ACID - - + + - Description + Chemical disinfect UI, remove acid state - + + + + CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE + + + + + Chemical disinfect UI, disinfect device state + + + + + CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT + + + + + Chemical disinfect UI, flush after disinfect state + + + + + CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT + + + + + Chemical disinfect UI, cancel disinfect state + + + + + CHEM_DISINFECT_UI_STATE_COMPLETE + + + + + Chemical disinfect UI, complete state + + - + - 350 - 510 + 0 + 200 + + + 16777215 + 200 + + 8 @@ -294,7 +306,7 @@ false - 23 + 8 2 @@ -357,81 +369,6 @@ 7 - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - - - 17 - - - - - 18 - - - - - 19 - - - - - 20 - - - - - 21 - - - - - 22 - - 2 : Heat @@ -444,244 +381,226 @@ - DG_HEAT_DISINFECT_STATE_START + HEAT_DISINFECT_UI_STATE_NOT_RUNNING - Heat disinfect, start mode state + Heat disinfect UI, not running state - DG_HEAT_DISINFECT_STATE_DRAIN_R1 + HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT - Heat disinfect, drain R1 state + Heat disinfect UI, flush before disinfect state - DG_HEAT_DISINFECT_STATE_DRAIN_R2 + HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER - Heat disinfect, drain R2 state + Heat disinfect UI, heat up water state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN + HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE - Heat disinfect, flush drain state + Heat disinfect UI, disinfect device state - DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION + HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE - Heat disinfect, flush circulation state + Heat disinfect UI, cool down device state - DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2 + HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT - Heat disinfect, flush R1 and R2 state + Heat disinfect UI, flush after disinfect state - DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 + HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT - Heat disinfect, flush R2 and drain R1 state + Heat disinfect UI, cancel disinfect state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2 + HEAT_DISINFECT_UI_STATE_COMPLETE - Heat disinfect, flush drain R2 state + Heat disinfect UI, complete state - + + + + + + + 0 + 80 + + + + + 16777215 + 80 + + + + + 8 + 50 + false + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + true + + + false + + + 3 + + + 2 + + + true + + + 125 + + + true + + + true + + + 18 + + + 21 + + - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1 + 0 - - + + - Heat disinfect, flush drain R1 state + 1 - - + + - DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER + 2 - - + + - Heat disinfect, fill with water state + 0 : DG Disinfec Mode - - + + - DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 + Description - - + + - Heat disinfect, disinfect R1 to R2 state + DG_DISINFECT_FLUSH - + - DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER + Disinfect Flush Mode - + - Heat disinfect, fill R2 with hot water state + DG_DISINFECT_HEAT - + - DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 + Disinfect Heat Mode - + - Heat disinfect, disinfect R2 to R1 state + DG_DISINFECT_CHEM - + - DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS + Disinfect Chenical Mode - - - Heat disinfect, cool down heaters state - - - - - DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER - - - - - Heat disinfect, cool down RO filter state - - - - - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 - - - - - Heat disinfect, mix drain R1 state - - - - - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 - - - - - Heat disinfect, mix drain R2 state - - - - - DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2 - - - - - Heat disinfect, rinse R1 to R2 state - - - - - DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 - - - - - Heat disinfect, rinse R2 to R1 and drain R1 state - - - - - DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION - - - - - Heat disinfect, rinse circulation state - - - - - DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH - - - - - Heat disinfect, cancel mode basic path state - - - - - DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH - - - - - Heat disinfect, cancel mode water path state - - - - - DG_HEAT_DISINFECT_STATE_COMPLETE - - - - - Heat disinfect, complete state - - - - + + - 350 - 510 + 0 + 175 + + + 16777215 + 175 + + 8 @@ -714,7 +633,7 @@ false - 0 + 7 2 @@ -737,16 +656,121 @@ 21 + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + - 3 : Chemical + 1 : Flush Description + + + FLUSH_UI_STATE_NOT_RUNNING + + + + + Flush UI, not running state + + + + + FLUSH_UI_STATE_DRAIN_DEVICE + + + + + Flush UI, drain device state + + + + + FLUSH_UI_STATE_FLUSH_RESERVOIRS + + + + + Flush UI, flush reservoirs + + + + + FLUSH_UI_STATE_DRAIN_RESERVOIRS + + + + + Flush UI, drain reservoirs + + + + + FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH + + + + + Flush UI, flush recirculation path + + + + + FLUSH_UI_STATE_CANCEL_FLUSH + + + + + Flush UI, cancel flush state + + + + + FLUSH_UI_STATE_COMPLETE + + + + + Flush UI, complete state + +