Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r4e035c96c971fb8ec19fb030d9120046697b6e71 -rdcb88e63735118d1f11b2234752485b7cd71fd57 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision dcb88e63735118d1f11b2234752485b7cd71fd57) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file Variables.qml * \author (last) Behrouz NematiPour - * \date (last) 18-Jan-2022 + * \date (last) 14-Mar-2023 * \author (original) Behrouz NematiPour * \date (original) 09-Oct-2019 * @@ -32,6 +32,7 @@ readonly property int dialogIconWidth : 50 readonly property int dialogIconHorizontalOffset : 25 readonly property int headerHeight : 100 + readonly property int headerButtonsMargin : 35 readonly property int mainMenuHeight : 70 @@ -65,16 +66,21 @@ readonly property int dialogHeight : applicationHeight - dialogMargin readonly property int dialogRadius : 5 + readonly property real sliderDefaultRoundTickMarkDiameter : 5 + readonly property real sliderCreateTreatmentHeight : 15 + readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 7 + readonly property int rangeRectBorderWidth : 2 readonly property int rangeMarkerHeight : 60 readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 20 readonly property int rangeMarkerWidth : 2 readonly property int progressbarHeight : 30 readonly property int progressbarHandler : 35 + readonly property int progressbarHandlerBorderWidth : 4 readonly property int progressbarFluidHeight : 5 readonly property int progressbarSmall : 5 @@ -88,15 +94,14 @@ readonly property int opacityAnimationDuration : 1200 readonly property int sliderTextMargin : 20 - readonly property int treatmentSpacing : 60 + readonly property int treatmentSpacing : 80 // 60 readonly property int notificationHeight : 60 readonly property int notificationIconDiameter : 36 readonly property int checkListViewItemWidth : 350 readonly property int checkListViewItemHeight : 60 - readonly property int pauseIconDiameter : 60 readonly property int topBarMenuHeight : 100 readonly property int sliderCircleDiameter : 30 @@ -115,7 +120,7 @@ readonly property int createTreatmentSubTableHeight : 50 readonly property int createTreatmentSubTableWidth : 500 readonly property int createTreatmentSliderMargin : 40 - readonly property int createTreatmentSliderHeight : 50 + readonly property int createTreatmentSliderHeight : 65 readonly property int createTreatmentSliderWidth : 750 readonly property int ultrafiltrationProgressbarWidth : 880 @@ -139,10 +144,40 @@ readonly property int settingsInputWidth : 225 readonly property int settingsNotificationMargin : 10 + readonly property int settingsContentSidesMargin : headerButtonsMargin + readonly property int settingsContentBottomMargin : mainMenuHeight + // Alarm Bar height + notificationHeight + // notification Bar height + minVGap // Min Gap to give content the min border readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 + readonly property int screenGridAreaWidth : 400 + readonly property int screenGridAreaHeightRow1 : 170 + readonly property int screenGridAreaHeightRow2 : 225 + readonly property int screenGridAreaHeightRow3 : 200 + + readonly property int screenGridLeftColumnX : 40 + readonly property int screenGridRightColumnX : applicationWidth - screenGridLeftColumnX - screenGridAreaWidth + + readonly property int screenGridRow1Y : 100 + readonly property int screenGridRow2Y : 290 // 320 + readonly property int screenGridRow3Y : 540 // 570 + + readonly property int screenGridLineLength : 450 + readonly property int screenGridLeftLinesX : 0 + readonly property int screenGridRightLinesX : applicationWidth - screenGridLineLength + readonly property int screenGridRow1LineY : 275 + readonly property int screenGridRow2LineY : 525 + + readonly property int sliderAdjustButtonBorderWidth : 2 + readonly property int sliderAdjustButtonSpacing : 20 + readonly property int sliderAdjustButtonDiameter : 50 + readonly property int sliderAdjustButtonLeftMargin : 30 + + readonly property int circleButtonDefaultDiameter : 45 + + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30 @@ -163,35 +198,19 @@ // Heparin readonly property int heparinPrecision : 1 - // Inline Blood Pressures - // - Artrial - // - Artrial - Entire pressure value range - readonly property int arterialValueMin : -400; ///< PRS362 const - readonly property int arterialValueMax : +600; ///< PRS362 const - // - Artrial - Adjust pressure limit range and manufacturing default - Low - readonly property int arterialLimitLowMin : -300; ///< PRS354 const - readonly property int arterialLimitLowMax : -30; ///< PRS354 const - // - Artrial - Adjust pressure limit range and manufacturing default - High - readonly property int arterialLimitHighMin : -270; ///< PRS355 const - readonly property int arterialLimitHighMax : 0; ///< PRS355 const - // - Artrial - Adjust pressure limit resolution - readonly property int arterialLimitStep : +10; ///< PRS354,PRS355 // has to be the same since it's on the same line scale - readonly property int arterialLimitGap : +30; + // Saline + readonly property int salinePrecision : 1 - // - Venous - // - Venous - Entire pressure value range - readonly property int venousValueMin : -100; ///< PRS361 const - readonly property int venousValueMax : +700; ///< PRS361 const - // - Venous - Adjust pressure limit range and manufacturing default - Low - readonly property int venousLimitLowMin : +20; ///< PRS356 const - readonly property int venousLimitLowMax : +570; ///< PRS356 const - // - Venous - Adjust pressure limit range and manufacturing default - High - readonly property int venousLimitHighMin : +50; ///< PRS357 const - readonly property int venousLimitHighMax : +600; ///< PRS357 const - // - Venous - Adjust pressure limit resolution - readonly property int venousLimitStep : +10; ///< PRS356,PRS357 // has to be the same since it's on the same line scale - readonly property int venousLimitGap : +30; + // Dialysate Temperature + readonly property int dialysateTempPrecision : 1 + function sizeConverted(vSize, vSizePowers, vRound = 2) { + return ( vSize + / vSizePowers // convert from byte to Giga byte + / 1000) // round to 1000 + .toFixed(vRound) // round to 1 floating point + } + function notSetVariable(vVariable, vLength, vChar) { let notSetVariableText = "_" //"‑" //"-" if (vLength === 0 ) notSetVariableText = ""