Index: sources/gui/qml/components/SDCInfo.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/gui/qml/components/SDCInfo.qml (.../SDCInfo.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/components/SDCInfo.qml (.../SDCInfo.qml) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -28,7 +28,7 @@ right : parent.right verticalCenter : _sdCircle.verticalCenter } - color : Colors.dialogText + color : "grey" font.pixelSize : Fonts.fontPixelTouchAreaTitle } } @@ -69,7 +69,7 @@ top : _progress.bottom topMargin : 10 } - color : Colors.dialogText + color : "grey" font.pixelSize : Fonts.fontPixelTouchAreaTitle text : ("%1 of %2") .arg(("%1 %2 %3") .arg(Variables.sizeConverted( _GuiView.sdAvail, 1000, 3)) .arg(qsTr("Free")).arg(qsTr("MB"))) .arg(("%1 %2") .arg(Variables.sizeConverted( _GuiView.sdTotal, 1000, 3)) .arg(qsTr("MB"))) Index: sources/gui/qml/compounds/SettingsSlider.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/gui/qml/compounds/SettingsSlider.qml (.../SettingsSlider.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/compounds/SettingsSlider.qml (.../SettingsSlider.qml) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -1,7 +1,8 @@ - +// Qml imports import "qrc:/globals" import "qrc:/components" +// Qt import QtQuick 2.12 import QtQuick.Controls 2.15 @@ -18,12 +19,11 @@ readonly property color valueColor : Colors.dialogValueColor readonly property var valueFont : Qt.font ({ pixelSize: 28, weight: Font.DemiBold }) - readonly property int sliderMargins : Variables.defaultMargin * 3.5 - readonly property int hitboxMargins : Variables.defaultMargin * -2 + readonly property int sliderMargins : Variables.defaultMargin * 3.5 // margins added to visible background to make a larger hitbox + readonly property int hitboxMargins : Variables.defaultMargin * -2 // negative margins added to create larger hitbox for touch readonly property int knobDiameter : 20 readonly property int hitboxHeight : 70 - Image { id : _image anchors { left : parent.left @@ -45,9 +45,9 @@ Slider { id: _slider anchors { left : _image.right - leftMargin : _root.hitboxMargins // negative margins added to create larger hitbox for touch + leftMargin : _root.hitboxMargins right : _value.left - rightMargin : _root.hitboxMargins // negative margins added to create larger hitbox for touch + rightMargin : _root.hitboxMargins verticalCenter : parent.verticalCenter } @@ -66,9 +66,9 @@ anchors { verticalCenter : parent.verticalCenter left : parent.left - leftMargin : _root.sliderMargins// margins added to colored background to make a larger hitbox + leftMargin : _root.sliderMargins right : parent.right - rightMargin : _root.sliderMargins // margins added to colored background to make a larger hitbox + rightMargin : _root.sliderMargins } height : 5 // visible height radius : height Index: sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml (.../HeaderbarInformation.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml (.../HeaderbarInformation.qml) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -9,7 +9,6 @@ readonly property int rightColumnWidth : 325 readonly property int leftColumnWidth : 170 readonly property int columnSpacing : Variables.defaultMargin * 3 - readonly property color infoColor : "#2E5E92" readonly property var _dataModel: [ { name: qsTr("OS Version" ) , value: vDevice.osVersion }, @@ -50,7 +49,7 @@ anchors.verticalCenter: parent.verticalCenter Text { id: _name - color : _root.infoColor + color : Colors.dialogText text : modelData.name width : leftColumnWidth font.pixelSize : Fonts.fontPixelDialogText @@ -95,7 +94,7 @@ Text { id: _qrCodeInstructions anchors.bottom : _qrCode.bottom text : qsTr("Customer Service Number: %1\nScan for electronic instructions for use (eIFU)").arg("(123) 456-7890") - color : _root.infoColor + color : Colors.dialogText font.pixelSize : Fonts.fontPixelDialogText } } Index: sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (.../HeaderbarSettings.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (.../HeaderbarSettings.qml) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -1,12 +1,10 @@ - - +// Qml imports import "qrc:/components" import "qrc:/compounds" import "qrc:/globals" - +// Qt import QtQuick 2.12 -//import QtQuick.Controls 2.15 HeaderBarPopup { id: _root Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -55,7 +55,7 @@ readonly property color backgroundUltrafiltrationButton : "#31568F" readonly property color textValueUltrafiltrationButtonFg: "#98aec2" - readonly property color dialogText : "#343434" + readonly property color dialogText : "#2E5E92" readonly property color alarmDialogText : "#343434" readonly property color alarmDialogGreyText : "#838080" readonly property color dialogShadowColor : "#EAE9E9" Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -229,7 +229,7 @@ isConfigsOk = isConfigsOk && !_dryBicabCartridgeSizeOptions .isEmpty(); isConfigsOk = isConfigsOk && !_waterSampleTestResultRequired.isEmpty(); - vitalsInterval(_bloodPressureMeasureInterval.indexOf("30")); + vitalsInterval(_bloodPressureMeasureInterval.indexOf(_vitalsDef)); FROMVARIANT_WITHRETURN ( dialysateTempDef , "Dialysate Temperature" , "Dialysate_Temperature_Def" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateTempMin , "Dialysate Temperature" , "Dialysate_Temperature_Min" , Float , isConfigsOk ); Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -37,6 +37,8 @@ { Q_OBJECT + const QString _vitalsDef = "30"; // LEAHI_PRS_215 + // Real-time properties received from TD from TreatmentRangesData READONLY( quint32 , treatmentRanges_Duration_Min , 0) READONLY( quint32 , treatmentRanges_Duration_Max , 0)