Index: denali.qrc
===================================================================
diff -u -r5e1966a8b22d556e9c0c08533f84c6894127b248 -rd6231fa108bd5854e6c34f1c713872e5b8d6767d
--- denali.qrc (.../denali.qrc) (revision 5e1966a8b22d556e9c0c08533f84c6894127b248)
+++ denali.qrc (.../denali.qrc) (revision d6231fa108bd5854e6c34f1c713872e5b8d6767d)
@@ -60,6 +60,7 @@
resources/images/Omron-bp7000.png
resources/images/chevron-left.png
resources/images/chevron-right.png
+ resources/images/DenaliDevice.png
sources/gui/qml/components/MainMenu.qml
Index: resources/images/DenaliDevice.png
===================================================================
diff -u
Binary files differ
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r7c86f3854db9ad02d95681203198d75a0d65c9fa -rd6231fa108bd5854e6c34f1c713872e5b8d6767d
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7c86f3854db9ad02d95681203198d75a0d65c9fa)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision d6231fa108bd5854e6c34f1c713872e5b8d6767d)
@@ -41,6 +41,7 @@
readonly property int minVGap2 : 30
readonly property int logoDiameter : 50
+ readonly property int denaliDeviceDiameter : 350 // 475
readonly property int iconsDiameter : 25
Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r8172c6aa4187be26aa9c0e73a130bc6183ad10dd -rd6231fa108bd5854e6c34f1c713872e5b8d6767d
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 8172c6aa4187be26aa9c0e73a130bc6183ad10dd)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision d6231fa108bd5854e6c34f1c713872e5b8d6767d)
@@ -20,6 +20,7 @@
// Qml imports
import "qrc:/globals"
import "qrc:/components"
+import "qrc:/compounds"
import "qrc:/pages/disinfect"
/*!
* \brief the post treatment prime stack screen
@@ -36,49 +37,61 @@
readonly property string heatTitle : qsTr("Heat Disinfect")
readonly property string chemicalTitle : qsTr("Chemical Disinfect")
readonly property string chemFlushTitle : qsTr("Chemical Flush")
+ readonly property string roPermeateTitle: qsTr("RO Permeate Sample")
- function doDisinfectBack () {
- vDisinfectAdjustDisinfect .doDisinfectClear ()
- page ( _disinfectHome )
- }
- function doDisinfectConfirm () {
- vDisinfectAdjustDisinfect .doDisinfectConfirm ()
- }
- function doDisinfectFlush () {
- vDisinfectAdjustDisinfect .doDisinfectFlush ()
- page( _disinfectFlush )
- }
- function doDisinfectHeat () {
- vDisinfectAdjustDisinfect .doDisinfectHeat ()
- page( _disinfectHeat )
- }
- function doDisinfectChemical() {
- vDisinfectAdjustDisinfect .doDisinfectChemical()
- page( _disinfectChemical )
- }
- function doDisinfectChemFlush() {
- vDisinfectAdjustDisinfect .doDisinfectChemFlush()
- page( _disinfectChemFlush )
- }
- function doDisplayReasonText(vPage) {
+ function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )}
+ function doDisinfectHeat () { vDisinfectAdjustDisinfect.doDisinfectHeat (); page( _disinfectHeat )}
+ function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )}
+ function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )}
+ function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate(); page( _disinfectROPermeate )}
+
+ function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page ( _disinfectHome )}
+ function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); }
+
+ function doDisplayReasonText (vPage) {
if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" }
else { vPage.reasonText = vDisinfectAdjustDisinfect.text() }
}
+ property var doDisinfects : [
+ doDisinfectFlush ,
+ doDisinfectHeat ,
+ doDisinfectChemical ,
+ doDisinfectChemFlush ,
+ doDisinfectROPermeate,
+ ]
+
DisinfectBase { id : _disinfectHome
objectName : "_disinfectHome"
property int stackStepIndex : 0
header.stepNames : [ _root.disinfectTitle ]
title.text : _root.disinfectTitle
- footer.childrenWidth : 300
- footer.children: [
- TouchRect { text.text: _root.flushTitle ; onClicked: { doDisinfectFlush () } },
- TouchRect { text.text: _root.heatTitle ; onClicked: { doDisinfectHeat () } },
- TouchRect { text.text: _root.chemicalTitle ; onClicked: { doDisinfectChemical () } },
- TouchRect { text.text: _root.chemFlushTitle ; onClicked: { doDisinfectChemFlush () } }
- ]
- instructionBased : true
+ TouchGrid {
+ width : parent.width / 2
+ colCount : 1
+ colSpacing : 0
+ // rowCount : itemsText
+ itemsText : [
+ _root.flushTitle ,
+ _root.heatTitle ,
+ _root.chemicalTitle ,
+ _root.chemFlushTitle ,
+ _root.roPermeateTitle,
+ ]
+ onItemClicked: {
+ doDisinfects[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 () }
}
@@ -127,17 +140,29 @@
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 ()
+ }
+
// ----- Navigation
Connections { target: vHDOperationMode
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_DisinfectStartHeatTriggered ( vValue ) { doDisplayReasonText( _disinfectHeat )}
- function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )}
+ function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )}
+ function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )}
+ function onAdjustment_DisinfectStartHeatTriggered ( vValue ) { doDisplayReasonText( _disinfectHeat )}
+ function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )}
+ function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate)}
}
onVisibleChanged: {
Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
===================================================================
diff -u -r8172c6aa4187be26aa9c0e73a130bc6183ad10dd -rd6231fa108bd5854e6c34f1c713872e5b8d6767d
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 8172c6aa4187be26aa9c0e73a130bc6183ad10dd)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision d6231fa108bd5854e6c34f1c713872e5b8d6767d)
@@ -62,11 +62,12 @@
// *** has to be the last to let the information to be set and then emit the signal ***
// *** otherwise will use the Previous values before being set. ***
switch ( _data.mState ) {
- case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break;
- case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE : adjustment_DisinfectStartHeat (true); break;
- case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break;
- case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush(true); break;
- default: break;
+ case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break;
+ case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE : adjustment_DisinfectStartHeat (true); break;
+ case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break;
+ case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush (true); break;
+ case GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate (true); break;
+ default: break;
}
}
@@ -139,6 +140,15 @@
_data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE;
}
+/*!
+ * \brief View::VDisinfectAdjustDisinfect::doDisinfectROPermeate
+ * \details the invocable slot to send user's Disinfect RO Permeate Request
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate()
+{
+ _data.mState = GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE;
+}
+
void View::VDisinfectAdjustDisinfect::doDisinfectConfirm()
{
emit didAdjustment(_data);
Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
===================================================================
diff -u -r8172c6aa4187be26aa9c0e73a130bc6183ad10dd -rd6231fa108bd5854e6c34f1c713872e5b8d6767d
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 8172c6aa4187be26aa9c0e73a130bc6183ad10dd)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision d6231fa108bd5854e6c34f1c713872e5b8d6767d)
@@ -42,11 +42,12 @@
AdjustDisinfectStartRequestData _data;
- TRIGGER ( bool , adjustment_DisinfectMode , 0)
- TRIGGER ( bool , adjustment_DisinfectStartFlush , 0)
- TRIGGER ( bool , adjustment_DisinfectStartHeat , 0)
- TRIGGER ( bool , adjustment_DisinfectStartChemical , 0)
- TRIGGER ( bool , adjustment_DisinfectStartChemFlush, 0)
+ TRIGGER ( bool , adjustment_DisinfectMode , 0)
+ TRIGGER ( bool , adjustment_DisinfectStartFlush , 0)
+ TRIGGER ( bool , adjustment_DisinfectStartHeat , 0)
+ TRIGGER ( bool , adjustment_DisinfectStartChemical , 0)
+ TRIGGER ( bool , adjustment_DisinfectStartChemFlush , 0)
+ TRIGGER ( bool , adjustment_DisinfectStartROPermeate , 0)
PROPERTY( bool , hasCancel , 0)
@@ -63,6 +64,7 @@
void doDisinfectHeat ();
void doDisinfectChemical ();
void doDisinfectChemFlush ();
+ void doDisinfectROPermeate ();
void doDisinfectConfirm ();
signals: