Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rea51c0546c7061d225e7b9d8b754554c65f0d1b1 -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ea51c0546c7061d225e7b9d8b754554c65f0d1b1) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -1,5 +1,4 @@ -/*! - * +/*! * * Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN @@ -41,6 +40,7 @@ readonly property int contentHeight : 50 readonly property int mainMenuHeight : 80 //// ----- @LEAHIZED + readonly property int alarmDialogHeaderHeight : 100 readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -63,7 +63,7 @@ readonly property int touchRectWidth : 512 //K:D //425 readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 15 + readonly property int touchRectRadius : 10 readonly property int titleBottomPadding : 25 @@ -73,7 +73,10 @@ readonly property int dialogWidth : applicationWidth - dialogMargin readonly property int dialogHeight : applicationHeight - dialogMargin readonly property int dialogRadius : 10 + readonly property int alarmDialogRadius : 30 + readonly property int panelBorderWidth : 1 + readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 10 @@ -82,10 +85,11 @@ readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 30 readonly property int rangeMarkerWidth : 2 + readonly property int rangeMarkerWidthMidle : 3 readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 30 - readonly property int progressbarHandlerBorderWidth : 4 + readonly property int progressbarHandler : 40 + readonly property int progressbarHandlerBorderWidth : 3 readonly property int progressbarRectMargin : 0 // default as 0 to avoid progressRect having a thicker border than slider body readonly property int progressbarFluidHeight : 5 @@ -110,12 +114,13 @@ readonly property int pauseIconDiameter : 60 readonly property int arrowIconDiameter : 35 + readonly property int muteIconDiameter : 38 readonly property int headerIconDiameter : 40 readonly property int topBarMenuHeight : 80 //// ----- @LEAHIZED readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 - + readonly property int gridSelectionButtonHeight : 100 readonly property int gridSelectionButtonWidth : 375 @@ -136,11 +141,18 @@ readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 + readonly property int ultrafiltrationHeaderMargin : 50 readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 readonly property int ultraFiltrationProgressBarHeight : 25 readonly property int ultraFiltrationEditSliderHeight : sliderDefaultBodyHeight // to be consistent with other sliders + readonly property int ultrafiltrationButtonWidth : 300 + readonly property int ultrafiltrationButtonHeight : 60 + readonly property int ultrafiltrationButtonBottomMargin : 60 + readonly property int ultrafiltrationRangeMarkerWidth : 4 + readonly property int ultrafiltrationRangeMarkerHandleWidth : 12 + readonly property int ultrafiltrationContentMargin : 200 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 @@ -201,6 +213,15 @@ readonly property int noRejectReason : 0 + readonly property int textBoxRadius : 5 + readonly property int adjustmentDialogWidth : applicationWidth * 0.7 + readonly property int adjustmentDialogHeight : applicationHeight * 0.7 + readonly property int adjustmentHeaderHeight : 120 + readonly property int adjustmentButtonMargin : 30 + + readonly property int defaultButtonHeight : 60 + readonly property int defaultButtonWidth : 244 + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30 @@ -232,6 +253,12 @@ // Dialysate Conductivity readonly property int dialysateCondPrecision : 1 + // Potassium + readonly property int potassiumPrecision : 1 + + // Calcium + readonly property int calciumPrecision : 2 + function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte @@ -256,12 +283,16 @@ readonly property var regExp_PatientID: /[A-Za-z0-9_\-\.]{1,64}/ + readonly property string emptyEntry : "-- --" + readonly property string preTreatmentStepLabelCreate : qsTr("CREATE" ) readonly property string preTreatmentStepLabelConfirm : qsTr("CONFIRM" ) readonly property string preTreatmentStepLabelPriming : qsTr("PRIME" ) readonly property string preTreatmentStepLabelUltrafiltration : qsTr("BEGIN" ) // Units + readonly property string unitTextPotassium : qsTr("K") + readonly property string unitTextCalcium : qsTr("Ca") // - Ultrafiltration readonly property string unitTextUltrafiltrationRate : unitTextFlowRate readonly property string unitTextUltrafiltrationVolume : unitTextVolume