Index: denali.pro.user =================================================================== diff -u -r5626bf604947efe5a80c9ca51802aab1a70a6939 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- denali.pro.user (.../denali.pro.user) (revision 5626bf604947efe5a80c9ca51802aab1a70a6939) +++ denali.pro.user (.../denali.pro.user) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1018,7 +1018,7 @@ Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Project/application/denali.pro /home/denali/Project/application/denali.pro - + -0 -u false false Index: denali.qrc =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- denali.qrc (.../denali.qrc) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ denali.qrc (.../denali.qrc) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -20,6 +20,8 @@ resources/images/Close.png resources/images/Back.png resources/images/Pause.png + resources/images/Resume.png + resources/images/PauseGray.png sources/gui/qml/components/MainMenu.qml @@ -82,5 +84,6 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml Index: resources/images/PauseGray.png =================================================================== diff -u Binary files differ Index: resources/images/Resume.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -26,8 +26,11 @@ Dialog { id : _root property bool autoHide : false property int autoHideDuration : 1000 - property alias notificationText : _notification.text + property string notificationText : "" + // TEST : Debug Code + property alias notification: _notification + width : Variables.dialogWidth height : Variables.dialogHeight @@ -68,5 +71,7 @@ } } - NotificationBar { id: _notification } + NotificationBar { id: _notification + text: _root.notificationText + } } Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -21,10 +21,13 @@ import "qrc:/globals" Rectangle { id: _root - objectName: "NotificationBar" + objectName: "NotificationBar" // SquishQt + + property alias imageSource : _image.source property alias text : _text.text property int level : 0 + visible : _text.text height : Variables.notificationHeight @@ -36,14 +39,21 @@ right : parent.right } - Text { id: _text - color : Colors.textNotificationNoneFg - anchors.fill : parent - font.pixelSize : Fonts.fontPixelNotification - horizontalAlignment : Text.AlignHCenter - verticalAlignment : Text.AlignVCenter + Row { + anchors.centerIn: parent + spacing: 10 + Image { id: _image + anchors.verticalCenter: parent.verticalCenter + width : Variables.notificationIconSize + height: Variables.notificationIconSize + } + Text { id: _text + color : Colors.textNotificationNoneFg + font.pixelSize : Fonts.fontPixelNotification + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + } } - onLevelChanged: { switch (level) { case GuiActions.ALARM_PRIORITY_HIGH: Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -23,6 +23,8 @@ * \brief Denali project ProgressBar */ RangeRect { id: _root + signal progressClicked() + property alias value : _progressRect.value property alias color : _progressRect.color @@ -47,13 +49,13 @@ // to order the parent object (ProgressBar) Components // in the child(ProgressBarEx) ProgressRect { id: _progressRect - z: 1 // Main ProgressBar Rect, z order in the gui - minimum : _root.minimum - maximum : _root.maximum - value : _root.value + z : 1 // Main ProgressBar Rect, z order in the gui + minimum : _root.minimum + maximum : _root.maximum + value : _root.value - color : Colors.highlightProgressBar - + color : Colors.highlightProgressBar + onClicked : progressClicked() } RangeMarker { id: _marker Index: sources/gui/qml/components/ProgressBarEx.qml =================================================================== diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf) +++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -23,6 +23,8 @@ * \brief Denali project ProgressBar */ ProgressBar { id: _root + signal extraClicked() + property alias valueEx : _progressRectEx.value minimum : 0 @@ -44,5 +46,6 @@ color : Colors.highlightMedProgressBar maxText.visible: visible margin : 0 + onClicked: extraClicked() } } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -66,6 +66,7 @@ readonly property int sliderTextMargin : 20 readonly property int notificationHeight : 60 + readonly property int notificationIconSize : 36 readonly property int backIconDiameter : 17 Index: sources/gui/qml/main.qml =================================================================== diff -u -r95c671ab7037af055db551456a719ff67bf10262 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/main.qml (.../main.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) +++ sources/gui/qml/main.qml (.../main.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -146,9 +146,9 @@ _treatmentStack.visible = true } onItemPressed: { - _treatmentStack .visible = vIndex == 0; - _mansagerStack .visible = vIndex == 1; - _settingsStack .visible = vIndex == 2; + _treatmentStack.visible = vIndex == 0; + _mansagerStack .visible = vIndex == 1; + _settingsStack .visible = vIndex == 2; } } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -85,5 +85,22 @@ TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart onCloseClicked : close() + onPauseClicked : { + close() + _treatmentAdjustmentUltrafiltrationPaused.open() + } } + TreatmentAdjustmentUltrafiltrationPaused { id: _treatmentAdjustmentUltrafiltrationPaused + onCloseClicked : close() + onEditClicked : { + // navigate to the Edit Dialog + close() + } + onResumeClicked : { + // send HD resume and if accepted close() + // not accepted show error in notification + close() + } + } + } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r9ec7a27375189ad75f0bef142cd6beb386db0955 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 9ec7a27375189ad75f0bef142cd6beb386db0955) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -53,7 +53,7 @@ spacing: 65 anchors.centerIn: parent TimeText { id: _currentTimeText - seconds: vTreatmentTime.time_Remaining + seconds: vTreatmentTime.time_Elapsed secondsVisible: true textPixelSize: Fonts.fontPixelDurationCurTime anchors.horizontalCenter: parent.horizontalCenter Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (revision 0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -0,0 +1,113 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file TreatmentAdjustmentUltrafiltrationStart.qml + * \date 2020/05/11 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief TreatmentAdjustmentUltrafiltrationStart.qml is the screen + * To adjust the treatment duration + */ +TreatmentAdjustmentBase { id: _root + + signal editClicked() + signal resumeClicked() + + confirmVisible: false + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") + notification { + text: qsTr("Ultrafiltration is paused.") + imageSource: "qrc:/images/iPauseGray" + } + + ProgressBarEx { id: _progressbarex + width : 880 + height : Variables.progressbarHeight + anchors { + top: parent.top + topMargin: 250 + horizontalCenter: parent.horizontalCenter + } + minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min.toFixed(2) + maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) + // TEST : it has to be bound to MeasUFVol to get the actual values from pumps + // but since we have none in testing code bound to the refUFVal which + // is the calculated/expected volume. + //// value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); + value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2); + valueEx : 0 + } + + TouchRect { id: _editButton + width: 530 + height: 95 + anchors { + top: parent.top + topMargin: 350 + horizontalCenter: parent.horizontalCenter + } + + backgroundColor: Colors.backgroundButtonSelect + + text { + text: qsTr("EDIT ULTRAFILTRATION VOLUME") + font.weight: Font.DemiBold + font.pixelSize: 26 //Fonts.fontPixelBack + } + onClicked: editClicked() + } + + TouchRect { id: _resumeButton + width: 530 + height: 95 + anchors { + top: _editButton.bottom + topMargin: 20 + horizontalCenter: parent.horizontalCenter + } + + borderColor: Colors.borderDisableButton + + Image { id: _image + anchors { + verticalCenter: _resumeButton.verticalCenter + left : _resumeButton.left + leftMargin : 50 + } + + width : Variables.pauseIconDiameter + height: Variables.pauseIconDiameter + source: "qrc:/images/iResume" + } + + text { + text: qsTr("RESUME ULTRAFILTRATION") + font.weight: Font.DemiBold + font.pixelSize: 26 //Fonts.fontPixelBack + anchors { + centerIn: null // disable the parent anchor + verticalCenter: _resumeButton.verticalCenter + left: _image.right + leftMargin: 25 + } + } + onClicked: resumeClicked() + } +} Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -26,6 +26,8 @@ * To adjust the treatment duration */ TreatmentAdjustmentBase { id: _root + signal pauseClicked() + confirmVisible: false titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") @@ -48,6 +50,8 @@ } TouchRect { id: _pauseButton + onClicked: _root.pauseClicked() + width: 530 height: 95 anchors { Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -47,10 +47,11 @@ height : Variables.progressbarHeight minimum : 0 // seems should always be 0 valueEx : 0 - onClicked: { - _root.clicked() - } + onClicked : _root.clicked() + onProgressClicked : _root.clicked() + onExtraClicked : _root.clicked() + // TEST : it has to be bound to MeasUFVol to get the actual values from pumps // but since we have none in testing code bound to the refUFVal which // is the calculated/expected volume. Index: sources/model/mpoweroff.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r17f0906011de9c97c0950c1ba0ea627a1411bc2e --- sources/model/mpoweroff.cpp (.../mpoweroff.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/model/mpoweroff.cpp (.../mpoweroff.cpp) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) @@ -34,7 +34,6 @@ void MPowerOff::fromByteArray(const QByteArray &vByteArray) { int index = 0; // message data start position Types::getValue<>(vByteArray, index, _data.mStatus ); - } MPowerOff::Data MPowerOff::data() const {