Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rea51c0546c7061d225e7b9d8b754554c65f0d1b1 -r9048646630717f980a852df54349805ba63773e0 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ea51c0546c7061d225e7b9d8b754554c65f0d1b1) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 9048646630717f980a852df54349805ba63773e0) @@ -41,6 +41,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 +64,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,6 +74,7 @@ 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 rangeRectMargin : 1 readonly property int rangeRectRadius : 2 @@ -110,28 +112,15 @@ 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 topBarMenuHeight : 100 //// ----- @LEAHIZED readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 + readonly property int numPadHeight : 675 + readonly property int numPadWidth : 525 - readonly property int gridSelectionButtonHeight : 100 - readonly property int gridSelectionButtonWidth : 375 - - 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 : sliderDefaultBodyHeight - readonly property int createTreatmentSliderHeight : 65 - readonly property int createTreatmentSliderWidth : 750 - readonly property int createTreatmentSwitchYDisplacement : 15 - readonly property int treatmentFlowsComponentWidth : 150 readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 @@ -194,13 +183,26 @@ readonly property int sliderAdjustButtonRightMargin : 50 readonly property int sliderAdjustPressAndHoldRefreshRate : 250 + readonly property int adjustmentLabelUnitContainerHeight : 75 + readonly property int adjustmentLabelUnitContainerWidth : 720 + readonly property real sliderDefaultRoundTickMarkDiameter : 5 readonly property int sliderDefaultBodyHeight : 15 readonly property int circleButtonDefaultDiameter : 45 readonly property int noRejectReason : 0 + readonly property int textBoxRadius : 5 + readonly property int textBoxBorderWidth : 2 + 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 +234,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 @@ -255,13 +263,16 @@ // otherwise an extra RegExpValidator object will always created here. 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