Index: denali.pro.user =================================================================== diff -u -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a -r32bc2f04da62ae95a041945b449d2c40465f9308 --- denali.pro.user (.../denali.pro.user) (revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a) +++ denali.pro.user (.../denali.pro.user) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -86,6 +86,311 @@ ProjectExplorer.Project.Target.0 + Qt 5.12.5 (iMX8) + Qt 5.12.5 (iMX8) + {5d6458ef-f917-4aef-a092-c77bbe106149} + 1 + 0 + 0 + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Check for free disk space + + RemoteLinux.CheckForFreeDiskSpaceStep + + + + + / + 5242880 + + + + + true + Kill current application instance + + RemoteLinux.KillAppStep + + + + + + + + + true + Deploy files via rsync + + RemoteLinux.RsyncDeployStep + + + + + + + -av + false + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Remote Linux Host + + DeployToGenericLinux + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 1 + + + denali (on UI Test Board) + RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + 1 + + false + + 3768 + false + true + false + false + true + false + + + :0 + + 1 + + + + ProjectExplorer.Project.Target.1 + Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit @@ -1191,311 +1496,6 @@ - ProjectExplorer.Project.Target.1 - - Qt 5.12.5 (iMX8) - Qt 5.12.5 (iMX8) - {5d6458ef-f917-4aef-a092-c77bbe106149} - 0 - 0 - 0 - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Check for free disk space - - RemoteLinux.CheckForFreeDiskSpaceStep - - - - - / - 5242880 - - - - - true - Kill current application instance - - RemoteLinux.KillAppStep - - - - - - - - - true - Deploy files via rsync - - RemoteLinux.RsyncDeployStep - - - - - - - -av - false - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Remote Linux Host - - DeployToGenericLinux - - 1 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 1 - - - denali (on UI Test Board) - RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro - 1 - - false - - 3768 - false - true - false - false - true - false - - - :0 - - 1 - - - ProjectExplorer.Project.TargetCount 2 Index: denali.qrc =================================================================== diff -u -r12cfad32f345ac72d777f9b97d25bdd4d0848527 -r32bc2f04da62ae95a041945b449d2c40465f9308 --- denali.qrc (.../denali.qrc) (revision 12cfad32f345ac72d777f9b97d25bdd4d0848527) +++ denali.qrc (.../denali.qrc) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -32,6 +32,7 @@ resources/images/Wave-Minus.png resources/images/Wave-Plus.png resources/images/microsd.png + resources/images/check.png sources/gui/qml/components/MainMenu.qml @@ -80,6 +81,7 @@ ConfirmTreatmentTableEntry.qml ProgressLine.qml sources/gui/qml/components/DebugDataColumn.qml + sources/gui/qml/components/CheckListItem.qml qtquickcontrols2.conf Fisheye: Tag 32bc2f04da62ae95a041945b449d2c40465f9308 refers to a dead (removed) revision in file `resources/images/alarm.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 32bc2f04da62ae95a041945b449d2c40465f9308 refers to a dead (removed) revision in file `resources/images/bell-off.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 32bc2f04da62ae95a041945b449d2c40465f9308 refers to a dead (removed) revision in file `resources/images/bell.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: resources/images/check.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/components/CheckListItem.qml =================================================================== diff -u --- sources/gui/qml/components/CheckListItem.qml (revision 0) +++ sources/gui/qml/components/CheckListItem.qml (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -0,0 +1,39 @@ +// Qt +import QtQuick 2.0 + +// Project + +import "qrc:/globals" + +/*! + * \brief A generic checklist item to show the progress of a series of steps + */ +Rectangle { id: _root + property bool completed: false + property alias text: _text.text + height: 50 + width: 350 + color: "transparent" + + Text { id: _text + anchors.left: _root.left + anchors.leftMargin: 20 + anchors.verticalCenter: _root.verticalCenter + text: "Item" + font.pixelSize: Fonts.primingFontSize + color: Colors.textMain + } + + Image { id: _image + anchors.right: _root.right + anchors.rightMargin: 20 + anchors.verticalCenter: _root.verticalCenter + source: "qrc:/images/iCheck" + visible: _root.completed + } + + Line { id: _bottom_line + anchors.bottom: _root.bottom + width: _root.width + } +} Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r32bc2f04da62ae95a041945b449d2c40465f9308 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -66,6 +66,7 @@ readonly property int fontPixelUltrafiltrationAdjustmentConfirmTitle : 40 readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 + readonly property int primingFontSize : 20 readonly property int crTreatmentFontSize : 30 readonly property int crTreatmentTableFontSize : 24 Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r4558369178f85e2e421aacd64127facbf0a1788b -r32bc2f04da62ae95a041945b449d2c40465f9308 --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 4558369178f85e2e421aacd64127facbf0a1788b) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -80,32 +80,42 @@ seconds : vPriming.secondsRemaining } } - - Rectangle { + Column { id: _checklist + spacing: 20 anchors.horizontalCenter: parent.horizontalCenter - color: "transparent" - height: 400 - } - GridLayout { - id: _grid - rows: vPriming.primingStates.length - columns: 1 - anchors.horizontalCenter: parent.horizontalCenter + CheckListItem { id: _checking_installation + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + text: "Checking installation" + completed: vPriming.currentState >= 1 + } - Repeater { - model: vPriming.primingStates - Text { - color: "white" - text: vPriming.primingStates[index]; - } + CheckListItem { id: _creating_dialysate + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + text: "Creating dialysate" + completed: vPriming.currentState >= 2 } + + CheckListItem { id: _priming_lines + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + text: "Priming lines" + completed: vPriming.currentState >= 3 + } } + Text { id: _priming_complete + anchors.horizontalCenter: parent.horizontalCenter + text: "Priming Complete!" + color: vPriming.currentState >= 4 ? Colors.textMain : "transparent" + } + TouchRect { id : _continueRect anchors.horizontalCenter: parent.horizontalCenter text.text: vPriming.continueBtnText - enabled: vPriming.continueEnabled + enabled: vPriming.currentState >= 4 onEnabledChanged: { if (enabled) { borderColor = Colors.primingReady @@ -120,6 +130,13 @@ _root.clickedContinue() } } + + Rectangle { + id: _spacer + height: 75 + width: parent.width + color: "transparent" + } } } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rde876d852632cceca817b180bcbeee3695d0ab5c -r32bc2f04da62ae95a041945b449d2c40465f9308 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision de876d852632cceca817b180bcbeee3695d0ab5c) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -60,7 +60,8 @@ TreatmentHome { id: _treatmentHome onTreatmentStarted : push( _treatmentStart ) - onTreatmentCreated : vTreatmentCreate.onSelectingParameters() +// onTreatmentCreated : vTreatmentCreate.onSelectingParameters() + onTreatmentCreated : push(_treatmentPrime) } TreatmentStart { id: _treatmentStart Index: sources/view/VPriming.h =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r32bc2f04da62ae95a041945b449d2c40465f9308 --- sources/view/VPriming.h (.../VPriming.h) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/view/VPriming.h (.../VPriming.h) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -33,12 +33,7 @@ PROPERTY(quint32 , currentState , 0) PROPERTY(quint32 , secondsRemaining , 0) PROPERTY(quint32 , secondsTotal , 0) - PROPERTY(QStringList, primingStates ,QStringList() - << "Checking installation" - << "Creating dialysate" - << "Priming lines" - << "Priming Complete!") - PROPERTY(bool, continueEnabled, true) // TODO: Update this once priming messaging w/ FW is in place. + PROPERTY(bool , continueEnabled , true) // TODO: Update this once priming messaging w/ FW is in place. QString continueBtnText = "Continue to Treatment"; @@ -59,7 +54,5 @@ void onActionReceive(const PrimingData &data); public slots: QString getContinueBtnText() { return continueBtnText; } - }; - }