Index: main.cpp =================================================================== diff -u -r563e34706a5c39070a603725bc021fcdc3424cac -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc --- main.cpp (.../main.cpp) (revision 563e34706a5c39070a603725bc021fcdc3424cac) +++ main.cpp (.../main.cpp) (revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc) @@ -369,7 +369,7 @@ gActiveCANBus = value; } } - + qDebug() << "App can" << gActiveCANBus << gEnableDryDemo; if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc) @@ -116,6 +116,7 @@ } function onVisibleChanged ( vValue ) { + if ( _GuiView.dryDemoMode ) return if ( vValue ) open () else close () } Index: sources/gui/qml/dialogs/DryDemoDialog.qml =================================================================== diff -u -rdfd4fe3e511308ddd0e6ad9f93cc1d980d22e933 -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc --- sources/gui/qml/dialogs/DryDemoDialog.qml (.../DryDemoDialog.qml) (revision dfd4fe3e511308ddd0e6ad9f93cc1d980d22e933) +++ sources/gui/qml/dialogs/DryDemoDialog.qml (.../DryDemoDialog.qml) (revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc) @@ -32,16 +32,15 @@ */ ModalDialog { id: _root - width : 400 + width : 800 height : 700 - //anchors.centerIn: undefined // TODO figure out the anchor right readonly property int rowCount : 12 // Number of buttons that are mapped to commands readonly property int colCount : itemsText.length > rowCount ? Math.ceil(itemsText.length / rowCount) : 1 property var itemsText : [ qsTr("Standby" ), // 0: Standy - qsTr("Creat Treatment" ), // 1: Create Treatment + qsTr("Create Treatment" ), // 1: Create Treatment qsTr("Water Sample" ), // 2: Water sample qsTr("Consumables" ), // 3: Consumables qsTr("Disposables" ), // 4: Disposables @@ -52,6 +51,9 @@ qsTr("Start Treatment" ), // 9: Start treatment qsTr("End Treatment" ), // 10: End treatment qsTr("Disinfection" ), // 11: Disinfection + qsTr("High Priority Alarm" ), // 12: High priority alarm + qsTr("Medium Priority Alarm" ), // 13: Medium priority alarm + qsTr("Low Priority Alarm" ), // 14: Low priority alarm ] function col(idx, gap = 0) { @@ -89,6 +91,7 @@ itemWidth : 325 itemsText : _root.itemsText rowSpacing : 0 + colSpacing : 50 } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -reae47411318bcf48addb424f3c2fedcd4d7b92f5 -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision eae47411318bcf48addb424f3c2fedcd4d7b92f5) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc) @@ -208,7 +208,7 @@ minimum : vTreatmentRanges.treatmentDurationMin maximum : vTreatmentRanges.treatmentDurationMax step : vTreatmentRanges.treatmentDurationRes - defaultValue: _GuiView.dryDemoMode ? 270 : vTreatmentRanges.treatmentDurationDef + defaultValue: _GuiView.dryDemoMode ? 240 : vTreatmentRanges.treatmentDurationDef valid : !vTreatmentCreate.treatmentDurationRejectReason onValueChanged: { // Reset the valid state to allow repositioning to the next invalid parameter Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc) @@ -26,8 +26,12 @@ * \brief Treatment Screen Vitals section */ TouchArea { id: _root - readonly property string bloodSDSeparator: " / " + readonly property string bloodSDSeparator: " / " + readonly property string systolic : _GuiView.dryDemoMode ? 140 : Variables.notSetVariable(vTreatmentVitals.systolic, 2) + readonly property string diastolic : _GuiView.dryDemoMode ? 90 : Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + readonly property string heartRate : _GuiView.dryDemoMode ? 80 : Variables.notSetVariable(vTreatmentVitals.heartRate, 2) + x: 0 y: 0 title: qsTr("VITALS") @@ -40,15 +44,15 @@ labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + label: systolic + bloodSDSeparator + diastolic extra: Variables.unitTextBloodPressure } TextRect { id: _heartBeat labelHeight: 40 labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.heartRate, 2) + label: heartRate extra: Variables.unitTextHeartBeat } }