Index: ConfirmTreatmentTableEntry.qml =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -25,18 +25,18 @@ id: _root property var key: "Key" property var value: "Value" - height: Variables.cTreatmentSubTblHeight - width: Variables.cTreatmentSubTblWidth + height: Variables.createTreatmentSubTableHeight + width: Variables.createTreatmentSubTableWidth color: "transparent" Line { id: _line - width: _root.width + Variables.cTreatmentTblMargin + width: _root.width + Variables.createTreatmentTableMargin thickness: 3 color: Colors.backgroundMenu anchors.top: _root.bottom anchors.left: _root.left - anchors.leftMargin: -Variables.cTreatmentTblMargin + anchors.leftMargin: -Variables.createTreatmentTableMargin } Text { @@ -57,7 +57,7 @@ text: value anchors.left: _line.horizontalCenter anchors.verticalCenter: _root.verticalCenter - anchors.leftMargin: 3*Variables.cTreatmentMargin + anchors.leftMargin: 3*Variables.createTreatmentMargin font.pixelSize: Fonts.crTreatmentTableFontSize } Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -24,14 +24,14 @@ Rectangle { id: _root objectName: "ConfirmTreatmentTable" - width: Variables.cTreatmentTableWidth - height: Variables.cTreatmentTableHeight + width: Variables.createTreatmentTableWidth + height: Variables.createTreatmentTableHeight color: Colors.backgroundDialog Rectangle { id: _header width: parent.width - height: Variables.cTreatmentHdrHeight + height: Variables.createTreatmentHeaderHeight color: "transparent" radius: 5 @@ -42,8 +42,8 @@ width: height anchors.top: _header.top anchors.left: _header.left - anchors.topMargin: Variables.cTreatmentMargin - anchors.leftMargin: Variables.cTreatmentMargin + anchors.topMargin: Variables.createTreatmentMargin + anchors.leftMargin: Variables.createTreatmentMargin color: Colors.createTrProfileID radius: 5 @@ -63,13 +63,12 @@ objectName: _root.objectName + "_treatment_profile_name" anchors.bottom: _treatment_profile_id.bottom anchors.left: _treatment_profile_id.right - anchors.topMargin: Variables.cTreatmentMargin + anchors.topMargin: Variables.createTreatmentMargin anchors.leftMargin: 20 text: "New Treatment" color: "white" font.pixelSize: Fonts.crTreatmentFontSize } - } Text { @@ -80,8 +79,7 @@ color: "white" anchors.left: parent.left anchors.top: _header.bottom - anchors.leftMargin: Variables.cTreatmentMargin - + anchors.leftMargin: Variables.createTreatmentMargin } Text { @@ -92,17 +90,16 @@ color: "white" anchors.top: _header.bottom anchors.left: _root.horizontalCenter - } ConfirmTreatmentSubTable { id: _left_table anchors.top: _prescription.bottom anchors.left: _root.left - anchors.leftMargin: Variables.cTreatmentMargin - anchors.topMargin: Variables.cTreatmentTblMargin + anchors.leftMargin: Variables.createTreatmentMargin + anchors.topMargin: Variables.createTreatmentTableMargin anchors.bottom: parent.bottom - width: parent.width - 2*Variables.cTreatmentMargin + width: parent.width - 2*Variables.createTreatmentMargin height: _root.height - _header.height prescriptionKeys: vTreatmentCreate.getPrescriptionParameterNames() prescriptionValues: vTreatmentCreate.getPrescriptionParameterValues() @@ -116,7 +113,5 @@ operatingValues = vTreatmentCreate.getOperatingParameterValues() } } - } - } Index: sources/gui/qml/components/PrimingTimer.qml =================================================================== diff -u -r1d2ab4adce5e88a7e316cad3c75e519704511813 -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/components/PrimingTimer.qml (.../PrimingTimer.qml) (revision 1d2ab4adce5e88a7e316cad3c75e519704511813) +++ sources/gui/qml/components/PrimingTimer.qml (.../PrimingTimer.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -62,10 +62,9 @@ } Image { id: _image - source: "qrc:/images/iCheckCircle" + source: "qrc:/images/iCheck" anchors.centerIn: parent visible: _root.completed } - } Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -40,6 +40,7 @@ property alias isActive: _slider.isActive property alias sliderObjectName: _slider.objectName property alias selectedValueObjectName: _selected_value.objectName + signal pressed() signal released() Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -53,6 +53,7 @@ property alias lowSelectedValueObjectName: _lowSelectedValue.objectName property alias highSliderObjectName: _highSlider.objectName property alias highSelectedValueObjectName: _highSelectedValue.objectName + signal lowSliderPressed() signal lowSliderReleased() signal highSliderPressed() Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -23,115 +23,114 @@ * which is going to be used in the project. */ QtObject { - readonly property int applicationWidth : 1280 - readonly property int applicationHeight : 800 - readonly property int buttonSpacing : 150 - readonly property int dialogIconHeight : 50 - readonly property int dialogIconWidth : 50 - readonly property int dialogIconHorizontalOffset : 25 - readonly property int headerHeight : 100 + readonly property int applicationWidth : 1280 + readonly property int applicationHeight : 800 + readonly property int buttonSpacing : 150 + readonly property int dialogIconHeight : 50 + readonly property int dialogIconWidth : 50 + readonly property int dialogIconHorizontalOffset : 25 + readonly property int headerHeight : 100 - readonly property int mainMenuHeight : 70 + readonly property int mainMenuHeight : 70 - readonly property int logoWidth : 50 - readonly property int logoHeight : 50 + readonly property int logoWidth : 50 + readonly property int logoHeight : 50 - readonly property int largeArrowWidth : 24 - readonly property int largeArrowHeight : 32 + readonly property int largeArrowWidth : 24 + readonly property int largeArrowHeight : 32 - readonly property int arrowWidth : 12 - readonly property int arrowHeight : 16 + readonly property int arrowWidth : 12 + readonly property int arrowHeight : 16 - readonly property int borderWidth : 2 + readonly property int borderWidth : 2 - readonly property int touchRectWidth : 512 //K:D //425 - readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 45 + readonly property int touchRectWidth : 512 //K:D //425 + readonly property int touchRectHeight : 85 //K:D //70 + readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 + readonly property int titleBottomPadding : 25 - readonly property int columnSpacing : 25 //K:D //20 + readonly property int columnSpacing : 25 //K:D //20 - readonly property int dialogMargin : mainMenuHeight * 2 - readonly property int dialogWidth : applicationWidth - dialogMargin - readonly property int dialogHeight : applicationHeight - dialogMargin - readonly property int dialogRadius : 10 + readonly property int dialogMargin : mainMenuHeight * 2 + readonly property int dialogWidth : applicationWidth - dialogMargin + readonly property int dialogHeight : applicationHeight - dialogMargin + readonly property int dialogRadius : 10 - readonly property int rangeRectMargin : 1 - readonly property int rangeRectRadius : 2 - readonly property int rangeRectTextMargin : 7 - readonly property int rangeMarkerHeight : 60 - readonly property int rangeMarkerHeightMidle : 40 - readonly property int rangeMarkerHeightShort : 20 - readonly property int rangeMarkerWidth : 2 + readonly property int rangeRectMargin : 1 + readonly property int rangeRectRadius : 2 + readonly property int rangeRectTextMargin : 7 + readonly property int rangeMarkerHeight : 60 + readonly property int rangeMarkerHeightMidle : 40 + readonly property int rangeMarkerHeightShort : 20 + readonly property int rangeMarkerWidth : 2 - readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 35 + readonly property int progressbarHeight : 30 + readonly property int progressbarHandler : 35 - readonly property int progressbarFluidHeight : 5 - readonly property int progressbarSmall : 5 - readonly property int progressbarSmallWidth : 600 - readonly property int progressbarRectHeight : 50 - readonly property int progressbarRectWidth : 620 + readonly property int progressbarFluidHeight : 5 + readonly property int progressbarSmall : 5 + readonly property int progressbarSmallWidth : 600 + readonly property int progressbarRectHeight : 50 + readonly property int progressbarRectWidth : 620 - readonly property int sliderTextMargin : 20 - readonly property int treatmentSpacing : 60 + readonly property int sliderTextMargin : 20 + readonly property int treatmentSpacing : 60 - // TODO: rename these. - readonly property int cTreatmentTableHeight : 800 - readonly property int cTreatmentTableWidth : applicationWidth - 50 - readonly property int cTreatmentMargin : 45 - readonly property int cTreatmentHdrHeight : 130 - readonly property int cTreatmentTblMargin : 20 - readonly property int cTreatmentSubTblHeight : 50 - readonly property int cTreatmentSubTblWidth : 500 - readonly property int createTreatmentSliderMargin : 25 + readonly property int notificationHeight : 50 + readonly property int notificationIconSize : 36 - readonly property int notificationHeight : 50 - readonly property int notificationIconSize : 36 + readonly property int backIconDiameter : 17 - readonly property int backIconDiameter : 17 + readonly property int pauseIconDiameter : 60 + readonly property int topBarMenuHeight : 100 + readonly property int sliderCircleDiameter : 25 - readonly property int pauseIconDiameter : 60 - readonly property int topBarMenuHeight : 100 - readonly property int sliderCircleDiameter : 25 + readonly property int createTreatmentFlickableDeceleration : 4500 + readonly property int createTreatmentTableHeight : 800 + readonly property int createTreatmentTableWidth : applicationWidth - 50 + readonly property int createTreatmentMargin : 45 + readonly property int createTreatmentHeaderHeight : 130 + readonly property int createTreatmentTableMargin : 20 + readonly property int createTreatmentSubTableHeight : 50 + readonly property int createTreatmentSubTableWidth : 500 + readonly property int createTreatmentSliderMargin : 40 - readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int silenceIconMargin : 20 - readonly property int notificationBarIconMargin : 10 - readonly property int notificationBarIconHeight : 30 - readonly property int notificationBarIconWidth : 30 + readonly property int silenceIconMargin : 20 + readonly property int notificationBarIconMargin : 10 + readonly property int notificationBarIconHeight : 30 + readonly property int notificationBarIconWidth : 30 - readonly property int settingsOptionWidth : 550 - readonly property int settingsOptionHeight : 50 + readonly property int settingsOptionWidth : 550 + readonly property int settingsOptionHeight : 50 // ---------- < PRS > Related Section ---------- // Min/Max - readonly property int bloodFlowMin : 100 - readonly property int bloodFlowMax : 500 + readonly property int bloodFlowMin : 100 + readonly property int bloodFlowMax : 500 // Resolutions - readonly property int bloodFlowResolution : 25 - readonly property int dialysateFlowResolution : 50 - readonly property int durationResolution : 15 // PRS346 + readonly property int bloodFlowResolution : 25 + readonly property int dialysateFlowResolution : 50 + readonly property int durationResolution : 15 // PRS346 // Units // - Ultrafiltration - readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") - readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") - readonly property string unitTextTreatmentDuration : qsTr("min") + readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") + readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") + readonly property string unitTextTreatmentDuration : qsTr("min") // - Flows - readonly property string unitTextFlowRate : qsTr("mL/min") + readonly property string unitTextFlowRate : qsTr("mL/min") // - Vitals - readonly property string unitTextBloodPressure : qsTr("mmHg") - readonly property string unitTextHeartBeat : qsTr("BPM" ) + readonly property string unitTextBloodPressure : qsTr("mmHg") + readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid - readonly property string unitTextSaline : qsTr("mL") - readonly property string unitTextHeparin : qsTr("mL") + readonly property string unitTextSaline : qsTr("mL") + readonly property string unitTextHeparin : qsTr("mL") // - Create Treatment - readonly property string unitTextBPMeasurementInterval : qsTr("min") + readonly property string unitTextBPMeasurementInterval : qsTr("min") } Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -52,6 +52,7 @@ contentWidth: parent.width contentHeight: _column.implicitHeight clip: true + flickDeceleration: Variables.createTreatmentFlickableDeceleration function setInteractive(isInteractive) { _flickable.interactive = isInteractive Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r4d30a4bbefaf43966b88e7f76225bfce0242d889 -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 4d30a4bbefaf43966b88e7f76225bfce0242d889) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -51,6 +51,7 @@ contentWidth: parent.width contentHeight: _column.implicitHeight clip: true + flickDeceleration: Variables.createTreatmentFlickableDeceleration function setInteractive(isInteractive) { _flickable.interactive = isInteractive @@ -513,7 +514,6 @@ _dialysateFlowRate.setValid(false) } - onDuration_ValidationFailed: { _duration.setValid(false) } Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -27,9 +27,10 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root + backgroundRect.color: Colors.backgroundMainMenu + signal clickedBack() signal clickedContinue() - backgroundRect.color: Colors.backgroundMainMenu TopMenuBarCreateTreatment { id: _topMenuBar anchors.top: parent.top @@ -51,6 +52,7 @@ contentWidth: parent.width contentHeight: _column.implicitHeight clip: true + flickDeceleration: Variables.createTreatmentFlickableDeceleration ScrollBar.vertical: ScrollBar { id: _scrollBar anchors.right: _flickable.right @@ -80,12 +82,12 @@ minimum: 0 maximum: vPriming.secondsTotal diameter: 100 - value: vPriming.secondsRemaining + value: vPriming.primingComplete ? vPriming.secondsTotal : vPriming.secondsRemaining PrimingTimer { id: _timeText anchors.centerIn: parent seconds : vPriming.secondsRemaining - completed: vPriming.currentState >= 4 + completed: vPriming.primingComplete } } @@ -97,28 +99,28 @@ anchors.horizontalCenter: parent.horizontalCenter color: "transparent" text: "Checking installation" - completed: vPriming.currentState >= 1 + completed: vPriming.checkingInstallationComplete } CheckListItem { id: _creating_dialysate anchors.horizontalCenter: parent.horizontalCenter color: "transparent" text: "Creating dialysate" - completed: vPriming.currentState >= 2 + completed: vPriming.creatingDialysateComplete } CheckListItem { id: _priming_lines anchors.horizontalCenter: parent.horizontalCenter color: "transparent" text: "Priming lines" - completed: vPriming.currentState >= 3 + completed: vPriming.primingLinesComplete } } Text { id: _priming_complete anchors.horizontalCenter: parent.horizontalCenter text: "Priming Complete!" - color: vPriming.currentState >= 4 ? Colors.textMain : "transparent" + color: vPriming.primingComplete ? Colors.textMain : "transparent" font.pixelSize: Fonts.primingFontSize } Index: sources/view/VPriming.cpp =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/view/VPriming.cpp (.../VPriming.cpp) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/view/VPriming.cpp (.../VPriming.cpp) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -36,27 +36,30 @@ PrimingStates state = static_cast(currentState()); switch (state) { + case STARTING: + checkingInstallationComplete(false); + creatingDialysateComplete(false); + checkingInstallationComplete(false); + primingLinesComplete(false); + primingComplete(false); +// TODO: Uncomment once FW supports priming +// continueEnabled(false); +// emit continueBtnTextChanged(); case CHECKING_INSTALLATION: + break; case CREATING_DIALYSATE: + checkingInstallationComplete(true); + break; case PRIMING_LINES: - { - continueBtnText = "CONTINUE TO TREATMENT"; -// continueEnabled(false); // TODO: Uncomment once FW supports priming - emit continueBtnTextChanged(); + creatingDialysateComplete(true); break; - } case PRIMING_COMPLETE: - { - continueBtnText = "CONTINUE TO TREATMENT"; + primingLinesComplete(true); + primingComplete(true); continueEnabled(true); emit continueBtnTextChanged(); break; - } default: - { break; - } } - - } Index: sources/view/VPriming.h =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/view/VPriming.h (.../VPriming.h) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/view/VPriming.h (.../VPriming.h) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -30,29 +30,34 @@ VPriming(QObject *parent = NULL); private: - PROPERTY(quint32 , currentState , 0) - PROPERTY(quint32 , secondsRemaining , 0) - PROPERTY(quint32 , secondsTotal , 0) - PROPERTY(bool , continueEnabled , true) // TODO: Set to False when FW supports priming + PROPERTY(bool , checkingInstallationComplete , false) + PROPERTY(bool , creatingDialysateComplete , false) + PROPERTY(bool , primingLinesComplete , false) + PROPERTY(bool , primingComplete , false) + PROPERTY(quint32 , currentState , 0) + PROPERTY(quint32 , secondsRemaining , 0) + PROPERTY(quint32 , secondsTotal , 0) + PROPERTY(bool , continueEnabled , true) // TODO: Set to False when FW supports priming - QString continueBtnText = "Continue to Treatment"; - - - Q_PROPERTY(QString continueBtnText READ getContinueBtnText NOTIFY continueBtnTextChanged) - enum PrimingStates { - CHECKING_INSTALLATION = 0, + STARTING = 0, + CHECKING_INSTALLATION, CREATING_DIALYSATE, PRIMING_LINES, PRIMING_COMPLETE }; + QString continueBtnText = "CONTINUE TO TREATMENT"; + + Q_PROPERTY(QString continueBtnText READ getContinueBtnText NOTIFY continueBtnTextChanged) + signals: void continueBtnTextChanged(); private slots: void onActionReceive(const PrimingData &data); public slots: QString getContinueBtnText() { return continueBtnText; } + quint32 getStateCheckingInstallation() { return static_cast(CHECKING_INSTALLATION); } }; }