Index: denali.pro.user =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- denali.pro.user (.../denali.pro.user) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ denali.pro.user (.../denali.pro.user) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -1,6 +1,6 @@ - + EnvironmentId Index: resources/settings/instructions/instructions.conf =================================================================== diff -u -rf5498e2cd91de9d120b591a36f871db2e2b80fa7 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- resources/settings/instructions/instructions.conf (.../instructions.conf) (revision f5498e2cd91de9d120b591a36f871db2e2b80fa7) +++ resources/settings/instructions/instructions.conf (.../instructions.conf) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -38,11 +38,6 @@ Insert cartridge using alignment pins Disposables^Cartridge Connection=2.png HD machine door open / HD machine door closed Disposables^Cartridge Connection=3.png -[Disposables^Cartridge Installation] -. Unlock pump track . Lock pump track Disposables^Cartridge Installation=1.png -Insert cartridge using alignment pins Disposables^Cartridge Installation=2.png -HD machine door open / HD machine door closed Disposables^Cartridge Installation=3.png - [Consumables^Consumables Installation] . Unlock pump track . Lock pump track Consumables^Consumables Installation=1.png Insert cartridge using alignment pins Consumables^Consumables Installation=2.png Index: sources/gui/qml/compounds/CheckListView.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -31,6 +31,7 @@ property var stepNames : [] property int completeMargin : 50 property alias completeVisible : _completeText.visible + property alias completeText : _completeText.text property int delegateWidth : Variables.checkListViewItemWidth property int delegateHeight : Variables.checkListViewItemHeight @@ -98,7 +99,7 @@ topMargin : _root.completeMargin horizontalCenter: _root.horizontalCenter } - text : qsTr("Self Test Complete!") + text : qsTr("Complete!") color : Colors.textMain font.pixelSize: Fonts.fontPixelNotification } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -61,7 +61,7 @@ readonly property int fontPixelDurationAdjTime : 28 readonly property int fontPixelStateListText : 20 - readonly property int fontPixelCirclProgressTimeSmall : 22 + readonly property int fontPixelCirclProgressTimeSmall : 32 readonly property int fontPixelCirclProgressTimeNormal : 90 readonly property int fontPixelUltrafiltrationAdjustmentButton : 26 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -79,7 +79,7 @@ readonly property int circleNormalDiameter : 350 readonly property int progressCircleDiameterNormal : circleNormalDiameter - readonly property int progressCircleDiameterSmall : 100 + readonly property int progressCircleDiameterSmall : 150 readonly property int opacityAnimationDuration : 1200 readonly property int sliderTextMargin : 20 Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -35,6 +35,7 @@ property bool instructionBased : false readonly property alias instruction : _instructionLoader.item + property string instructionlocation : "" property var instructionStepNames : [] property var instructionStepImages : [] @@ -50,6 +51,7 @@ readonly property alias checkList : _checkListLoader.item property var checkListStepNames : [] property int checkListCompleteMargin : 50 + property string completeText : "" property bool isComplete : false @@ -109,6 +111,7 @@ bottomMargin : outerVMargin } sourceComponent : InstructionView { id: _instructionView + location : _root.instructionlocation stepNames : _root.instructionStepNames stepImages : _root.instructionStepImages } @@ -143,6 +146,7 @@ height : Variables.checkListViewItemHeight * _root.checkListStepNames.length sourceComponent : CheckListView { id: _checkListView completeVisible : _root.isComplete + completeText : _root.completeText stepNames : _root.checkListStepNames completeMargin : _root.checkListCompleteMargin } @@ -160,11 +164,11 @@ onSettingsChanged : { if ( instructionBased ) { var group = vSettings.groupFormat.arg(header.stepNames[stackStepIndex]).arg(title.text) + // DEBUG : console.debug(" ----- ", group) if ( vSettings.settings[group] !== undefined ) { - console.debug(" 0 ----- ", group, vSettings.settings[group].keys, vSettings.settings[group].values, vSettings.settings[group].location) - instruction.location = vSettings.settings[group].location - instruction.stepNames = vSettings.settings[group].keys - instruction.stepImages = vSettings.settings[group].values + _root.instructionlocation = vSettings.settings[group].location + _root.instructionStepNames = vSettings.settings[group].keys + _root.instructionStepImages = vSettings.settings[group].values } } } Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -43,6 +43,7 @@ header.confirmEnabled : vPreTreatmentStates.selfTestConsumables_complete isComplete : vPreTreatmentStates.selfTestConsumables_complete title.text : qsTr("Consumables Self Test") + completeText : qsTr("Self Test Complete!") // check List hasCheckList : true checkListStepNames : [ Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -39,6 +39,7 @@ header.confirmEnabled : vPreTreatmentStates.selfTestDry_complete isComplete : vPreTreatmentStates.selfTestDry_complete title.text : qsTr("Begin Prime") + completeText : qsTr("Self Test Complete!") // time circle hasTimeCircle : true timeCircleMinimum : 0 @@ -52,6 +53,7 @@ qsTr("Used Cartridge Check" ), qsTr("Occolusion Sensors Check" ), qsTr("Pressure Sensors Check" ), + qsTr("Syringe Pump Check" ), ] } @@ -61,6 +63,7 @@ header.confirmEnabled : _preTreatmentDisposablesPrime.isComplete isComplete : vPreTreatmentStates.recirculate title.text : qsTr("Priming") + completeText : qsTr("Priming Complete!") footer { childrenCount : 1 // only one child is visible at a time children : [ @@ -70,17 +73,18 @@ width : parent.spacing text.text : qsTr("Start Prime") onClicked : _root.startPrimeClicked() - }, - Text { id: _recirculateText - visible : _preTreatmentDisposablesPrime.isComplete - width : parent.spacing - height : _startPrimeButton.height - text : qsTr("Recirculating ... ") - color : Colors.textMain - font.pixelSize : Fonts.fontPixelNotification - horizontalAlignment : Text.AlignHCenter - verticalAlignment : Text.AlignVCenter } + // , // commented out in demo feedback kept if needed to have any other screen later + // Text { id: _recirculateText + // visible : _preTreatmentDisposablesPrime.isComplete + // width : parent.spacing + // height : _startPrimeButton.height + // text : qsTr("Recirculating ... ") + // color : Colors.textMain + // font.pixelSize : Fonts.fontPixelNotification + // horizontalAlignment : Text.AlignHCenter + // verticalAlignment : Text.AlignVCenter + // } ] } // time circle @@ -107,6 +111,7 @@ onSelfTestDry_pressureSensorsSetupEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, true )} onSelfTestDry_pressureSensorsEntered : {} onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, vselfTestDry_pressureSensorsNormal )} + onSelfTestDry_syringePumpEntered : { _preTreatmentDrySelfTest .checkList.setItem(3, vselfTestDry_syringePump )} onSelfTestDry_stoppedEntered : {} onSelfTestDry_completeEntered : {} } Index: sources/view/hd/data/VPreTreatmentStatesData.cpp =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/view/hd/data/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/view/hd/data/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -100,6 +100,7 @@ selfTestDry_pressureSensorsSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE ); selfTestDry_pressureSensors ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_STATE ); selfTestDry_pressureSensorsNormal ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE ); + selfTestDry_syringePump ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE ); selfTestDry_stopped ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_STOPPED_STATE ); selfTestDry_complete ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_COMPLETE_STATE ); } Index: sources/view/hd/data/VPreTreatmentStatesData.h =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/view/hd/data/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/view/hd/data/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -101,6 +101,7 @@ STATE ( bool , selfTestDry_pressureSensorsSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE , Pressure sensors dry self-test setup valves and pump state. STATE ( bool , selfTestDry_pressureSensors , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STATE , Pressure sensors verify pressure readings state. STATE ( bool , selfTestDry_pressureSensorsNormal , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE , Pressure sensors verify normal pressure readings state. + STATE ( bool , selfTestDry_syringePump , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE , Prime syringe pump state STATE ( bool , selfTestDry_stopped , false ) ///< DRY_SELF_TESTS_STOPPED_STATE , Dry self-test stopped state. STATE ( bool , selfTestDry_complete , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE , Dry self-test complete state. Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -44,12 +44,17 @@ { for (const auto &group : _SettingModel.groups()) { QVariantMap variantMap; - qDebug() << " ### " - << _SettingModel.keys (group) - << _SettingModel.values (group); - variantMap["location" ] = _SettingModel.location (group); - variantMap["keys" ] = _SettingModel.keys (group); - variantMap["values" ] = _SettingModel.values (group); + // DEBUG : qDebug() << " ### " + // << _SettingModel.keys (group) + // << _SettingModel.values (group); + QStringList keys = _SettingModel.keys (group); + QVariantList values = _SettingModel.values (group); + QString location= _SettingModel.location (group); + + variantMap["location" ] = location; + variantMap["keys" ] = keys; + variantMap["values" ] = values; + _settings[group] = variantMap; } qDebug() << "Data Ready";