Index: sources/gui/qml/components/LabelValue.qml =================================================================== diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080) +++ sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -70,7 +70,7 @@ bottomMargin: 10 } text : _root.unitText - color : topTextColor + color : bottomTextColor font.pixelSize : 22 } } Index: sources/gui/qml/components/TreatmentCompleteButton.qml =================================================================== diff -u -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/components/TreatmentCompleteButton.qml (.../TreatmentCompleteButton.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c) +++ sources/gui/qml/components/TreatmentCompleteButton.qml (.../TreatmentCompleteButton.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -16,7 +16,7 @@ border { width: 10 - color: "#6FC66B" + color: "#60DCFF" } SequentialAnimation on scale { Index: sources/gui/qml/dialogs/EndTreatmentDialog.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -7,8 +7,8 @@ confirmText : qsTr("End Treatment") cancelText : qsTr("Stay On Treatment") - width : 600 - height : 600 + width : Variables.completeDialogWidth + height : Variables.completeDialogHeight backgroundColor : Colors.darkDialogColor messageTextVerticalOffset : Variables.defaultMargin * -1 footerBottomMargin : Variables.defaultMargin * 3 @@ -26,6 +26,17 @@ source : "qrc:/images/iCompleteCheck" } + Text { id: _description + anchors { + top : _iconImage.bottom + topMargin : Variables.defaultMargin * 5 + horizontalCenter: parent.horizontalCenter + } + color : Colors.textMain + font.pixelSize : Fonts.fontPixelNotification + text : qsTr("Stay on treatment if blood sample is required.") + } + Connections { target : vTreatmentAdjustmentEnd function onAdjustmentTriggered ( vValue ) { if ( ! vTreatmentAdjustmentEnd.adjustment_Accepted ) { Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rd4b731494a05087a763afff95b91c675bb417347 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision d4b731494a05087a763afff95b91c675bb417347) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -47,7 +47,6 @@ readonly property color mainTreatmentLighterBlue : "#1F3D5A" readonly property color mainTreatmentOrange : "#FFB836" readonly property color mainTreatmentIsoBlue : "#C3F9FF" - readonly property color mainTreatmentGreen : "#BBFFA3" readonly property color sliderHighlightColor : "orange" readonly property color sliderProgressBorderActive : white @@ -59,7 +58,7 @@ readonly property color alarmDialogGreyText : "#838080" readonly property color dialogShadowColor : "#EAE9E9" readonly property color dialogValueColor : "#385E92" - readonly property color darkDialogColor : "#091E31" + readonly property color darkDialogColor : "#162737" readonly property color backgroundRangeRect : "#2E4F76" readonly property color highlightProgressBar : "#3d8eef" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -128,6 +128,8 @@ readonly property int treatmentFlowsComponentWidth : 150 readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 + readonly property int completeDialogHeight : 600 + readonly property int completeDialogWidth : 800 readonly property int ultrafiltrationProgressBarWidth : 769 readonly property int ultraFiltrationProgressBarHeight : 25 Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rc749ecd5dc413ce091250af652ccba4d96f7a582 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -99,6 +99,7 @@ objectName : "treatmentUltrafiltration" width : cellWidth * 3 height : cellHeight + header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376 onEditClicked : sectionUltrafiltrationClicked() } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -91,7 +91,6 @@ } isDefault : true onClicked : isUFPaused ? _root.resumeClicked() : _root.pauseClicked() - enabled : ! isTreatmentEnd // LEAHI-PRS-376 } TouchRect { id: _editButton @@ -104,7 +103,6 @@ } isDefault : true onClicked : _root.editClicked() - enabled : ! isTreatmentEnd // LEAHI-PRS-376 } TouchRect { id: _isolatedUfButton Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r81aec0b1316a43c46f8c27c773d8f95e695ec273 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -37,9 +37,24 @@ property bool isComplete : ( vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0 ) || vTDTreatmentStates.txEnd - property string notificationText: isComplete ? qsTr("Treatment Complete"): - ! isRunning ? qsTr("Treatment Paused") : - "" + property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0 + property bool isHDFTreatment: vTreatmentCreate.treatmentModality === 1 + property bool isIsoTreatment: vTreatmentCreate.treatmentModality === 2 + + property string notificationText: isComplete ? qsTr("Treatment Complete") : + ! isRunning ? qsTr("Treatment Paused") : + isHDTreatment ? qsTr("HD Time") : + isHDFTreatment ? qsTr("HDF Time") : + isIsoTreatment ? qsTr("Isolated UF Time") : + "" + + property color notificationColor: isComplete ? Colors.statusComplete : + ! isRunning ? Colors.statusTextPaused : + isHDTreatment || + isHDFTreatment || + isIsoTreatment ? Colors.statusTextActive : + "" + property bool editEnabled : ! isTreatmentEnd // LEAHI-PRS-376 color : "transparent" @@ -77,6 +92,7 @@ textWeight : Font.Normal secsPixelSize : 35 secondsLeftMargin : 10 + textColor : _root.isRunning || _root.isComplete ? Colors.offWhite : Colors.mainTreatmentOrange } Item { id: _timeTitleRect @@ -127,15 +143,14 @@ topMargin : Variables.defaultMargin * 2 } - visible : ! _root.isRunning || _root.isComplete height : 25 color : "transparent" imageDiameter : 25 imageTopMargin : 4 imageSource : "qrc:/images/iPauseOrange" - imageVisible : ! _root.isComplete + imageVisible : ! _root.isRunning && ! _root.isComplete text : _root.notificationText - textColor : _root.isComplete ? Colors.mainTreatmentGreen : Colors.mainTreatmentOrange + textColor : _root.notificationColor textfontSize : 26 textfontWeight : Font.Medium } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rd14136d218b5dbc0734f7949b30541d242bcd350 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision d14136d218b5dbc0734f7949b30541d242bcd350) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -32,10 +32,20 @@ readonly property real maximum : vTreatmentUltrafiltration.setVolume readonly property real value : vTreatmentUltrafiltration.volumeRemoved readonly property real paused : vTreatmentUltrafiltration.ufPaused + readonly property real running : vTreatmentUltrafiltration.ufRunning + readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 - readonly property bool isUfCompleted : value >= maximum + readonly property bool isUfCompleted : value >= maximum && maximum > 0 + readonly property string statusText : isUfCompleted ? qsTr ("Ultrafiltration Complete") : + paused ? qsTr ("Ultrafiltration Paused") : + running ? "" : "" + + readonly property color statusColor : isUfCompleted ? Colors.statusTextComplete : + paused ? Colors.statusPaused : + running ? Colors.transparent : Colors.transparent + header.title: qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")" contentArea.anchors.topMargin: Variables.defaultMargin @@ -53,7 +63,7 @@ height : 40 width : contentItem.width * 0.2 - topText : qsTr("UF Volume") + topText : qsTr("UF Volume Goal") topTextFont.pixelSize : topTextFontSize topTextFont.weight : Font.Medium @@ -73,22 +83,47 @@ topTextFont.pixelSize : topTextFontSize topTextFont.weight : Font.Medium - bottomText : vTreatmentUltrafiltration.targetRate.toFixed(Variables.ultrafiltrationPrecision) + bottomText : isTreatmentEnd || _root.isUfCompleted ? qsTr("OFF") : + vTreatmentUltrafiltration.targetRate.toFixed(Variables.ultrafiltrationPrecision) bottomTextFont.pixelSize: bottomTextFontSize bottomTextFont.weight : Font.Normal + bottomTextColor : _root.paused ? Colors.statusTextPaused : Colors.textTextRectLabel leftAlign : true unitText : Variables.unitTextRate bottomTextTopMargin : Variables.defaultMargin } } Column { id: _rightColumn - topPadding : Variables.defaultMargin * 9.5 + topPadding : Variables.defaultMargin + spacing : Variables.defaultMargin * 5 width : contentItem.width height : _root.height + Item { id: _statusArea + width : _rightColumn.width * 0.6 + height : 40 + Rectangle { id: _status + anchors.verticalCenter : parent.verticalCenter + anchors.right : parent.right + color : _root.statusColor + width : _statusText.contentWidth + Variables.defaultMargin * 2 + height : _statusText.contentHeight + Variables.defaultMargin + radius : height + + Text { id: _statusText + anchors.centerIn: parent + font.pixelSize : 18 + font.weight : Font.DemiBold + text : _root.statusText + color : Colors.offWhite + } + } + } + ProgressBar { id: _progressbar enabled : ! isSBInProgress + width : contentItem.width * 0.6 height : 20 @@ -97,7 +132,7 @@ maximum : _root.maximum value : _root.value unitText: Variables.unitVolume - color : Colors.progressBarUltrafiltration + color : _root.paused ? Colors.pauseColor : Colors.progressBarUltrafiltration radius : height showMarker : false @@ -120,7 +155,7 @@ right : parent.right } text : _root.value.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume - color : Colors.white + color : _root.paused ? Colors.statusTextPaused : Colors.offWhite font.pixelSize : 40 font.weight : Font.DemiBold Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -98,7 +98,10 @@ VALUESET(float , dialysateTemp , 0) VALUESET(float , heparinDispensingRate , 0) VALUESET(float , heparinBolusVolume , 0) + VALUESET(quint32 , hdfTreatmentMode , 0) + VALUESET(quint32 , treatmentModality , 0) + VALUESET(QString , patientID ,"") VALUESET(bool , parametersValidated , 0) VALUESET(bool , parametersConfirmed , 0)