Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file Variables.qml - * \author (last) Behrouz NematiPour - * \date (last) 10-Aug-2020 + * \author (last) Peter Lucia + * \date (last) 06-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 09-Oct-2019 * @@ -23,93 +23,107 @@ * which is going to be used in the project. */ QtObject { - readonly property int applicationWidth : 1280 - readonly property int applicationHeight : 800 - readonly property int buttonSpacing : 150 - readonly property int dialogSVGHeight : 50 - readonly property int dialogSVGWidth : 50 - readonly property int dialogSVGIconOffset : 25 - readonly property int headerHeight : 100 + readonly property int applicationWidth : 1280 + readonly property int applicationHeight : 800 + readonly property int buttonSpacing : 150 + readonly property int dialogIconHeight : 50 + readonly property int dialogIconWidth : 50 + readonly property int dialogIconHorizontalOffset : 25 + readonly property int headerHeight : 100 - readonly property int mainMenuHeight : 70 + readonly property int mainMenuHeight : 70 - readonly property int logoWidth : 50 - readonly property int logoHeight : 50 + readonly property int logoWidth : 50 + readonly property int logoHeight : 50 - readonly property int largeArrowWidth : 24 - readonly property int largeArrowHeight : 32 + readonly property int largeArrowWidth : 24 + readonly property int largeArrowHeight : 32 - readonly property int arrowWidth : 12 - readonly property int arrowHeight : 16 + readonly property int arrowWidth : 12 + readonly property int arrowHeight : 16 - readonly property int borderWidth : 2 + readonly property int borderWidth : 2 - readonly property int touchRectWidth : 512 //K:D //425 - readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 45 + readonly property int touchRectWidth : 512 //K:D //425 + readonly property int touchRectHeight : 85 //K:D //70 + readonly property int touchRectRadius : 45 + readonly property int titleBottomPadding : 25 - readonly property int titleBottomPadding : 25 + readonly property int columnSpacing : 25 //K:D //20 - readonly property int columnSpacing : 25 //K:D //20 + readonly property int dialogMargin : mainMenuHeight * 2 + readonly property int dialogWidth : applicationWidth - dialogMargin + readonly property int dialogHeight : applicationHeight - dialogMargin + readonly property int dialogRadius : 10 + readonly property int dialogRadiusHalf : 5 - readonly property int dialogMargin : mainMenuHeight * 2 - readonly property int dialogWidth : applicationWidth - dialogMargin - readonly property int dialogHeight : applicationHeight - dialogMargin - readonly property int dialogRadius : 10 + readonly property int rangeRectMargin : 1 + readonly property int rangeRectRadius : 2 + readonly property int rangeRectTextMargin : 7 + readonly property int rangeMarkerHeight : 60 + readonly property int rangeMarkerHeightMidle : 40 + readonly property int rangeMarkerHeightShort : 20 + readonly property int rangeMarkerWidth : 2 - readonly property int rangeRectMargin : 1 - readonly property int rangeRectRadius : 2 - readonly property int rangeRectTextMargin : 7 - 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 progressbarHeight : 30 - readonly property int progressbarHandler : 35 + readonly property int progressbarFluidHeight : 5 + readonly property int progressbarSmall : 5 + readonly property int progressbarSmallWidth : 600 + readonly property int progressbarRectHeight : 50 + readonly property int progressbarRectWidth : 620 - readonly property int progressbarFluidHeight: 5 - readonly property int progressbarSmall : 5 - readonly property int progressbarSmallWidth : 600 - readonly property int progressbarRectHeight : 50 - readonly property int progressbarRectWidth : 620 + readonly property int sliderTextMargin : 20 + readonly property int treatmentSpacing : 60 - readonly property int sliderTextMargin : 20 - readonly property int cTreatmentSpacing : 60 + readonly property int notificationHeight : 60 + readonly property int notificationIconSize : 36 - readonly property int cTreatmentTableHeight : 800 - readonly property int cTreatmentTableWidth : applicationWidth - 50 - readonly property int cTreatmentMargin : 45 - readonly property int cTreatmentHdrHeight : 130 - readonly property int cTreatmentTblMargin : 20 - readonly property int cTreatmentSubTblHeight: 50 - readonly property int cTreatmentSubTblWidth : 500 + readonly property int backIconDiameter : 17 - readonly property int notificationHeight : 50 - readonly property int notificationIconSize : 36 + readonly property int pauseIconDiameter : 60 + readonly property int topBarMenuHeight : 100 + readonly property int sliderCircleDiameter : 25 - readonly property int backIconDiameter : 17 + readonly property int pressuresProgressbarWidth : 725 + + readonly property int gridSelectionButtonHeight : 100 + readonly property int gridSelectionButtonWidth : 375 - readonly property int pauseIconDiameter : 60 - readonly property int topBarMenuHeight : 100 - readonly property int sliderCircleDiameter : 25 + 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 : 40 + readonly property int createTreatmentSliderHeight : 50 + readonly property int createTreatmentSliderWidth : 750 - readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int silenceIconMargin : 20 - readonly property int notificationBarIconMargin : 10 - readonly property int notificationBarIconHeight : 30 - readonly property int notificationBarIconWidth : 30 + readonly property int silenceIconMargin : 10 + readonly property int notificationBarIconMargin : 10 + readonly property int notificationBarIconHeight : 30 + readonly property int notificationBarIconWidth : 30 - readonly property int settingsOptionWidth : 550 - readonly property int settingsOptionHeight : 100 + readonly property int settingsArrowHeight : 30 + readonly property int settingsArrowWidth : 24 - readonly property int settingsBLEButtonWidth : 300 - readonly property int settingsBLEButtonHeight : 75 + readonly property int settingsBLEListViewWidth : 360 + readonly property int settingsBLEItemRightMargin : 20 + readonly property int settingsBLEButtonWidth : 300 + readonly property int settingsBLEButtonHeight : 85 + readonly property int settingsBLEMargin : 75 + readonly property int settingsBLEListViewMargin : 25 + readonly property int settingsOptionWidth : 550 + readonly property int settingsOptionHeight : 50 // ---------- < PRS > Related Section ---------- // Min/Max @@ -119,18 +133,56 @@ readonly property int bloodFlowResolution : 25 readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 + + // 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 + // ref to Model // arterialLimitLowMin : -300; ///< PRS354 default \ref MAdjustPressuresLimitsReq + readonly property int arterialLimitLowMax : +200; ///< PRS354 const + // - Artrial - Adjust pressure limit range and manufacturing default - High + readonly property int arterialLimitHighMin : -300; ///< PRS355 const + // ref to Model // arterialLimitHighMin : +100; ///< PRS355 default \ref MAdjustPressuresLimitsReq + readonly property int arterialLimitHighMax : +200; ///< 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; + + // - 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 : -100; ///< PRS356 const + // ref to Model // venousLimitLowDef : -100; ///< PRS356 default \ref MAdjustPressuresLimitsReq + readonly property int venousLimitLowMax : +600; ///< PRS356 const + // - Venous - Adjust pressure limit range and manufacturing default - High + readonly property int venousLimitHighMin : +100; ///< PRS357 const + // ref to Model // venousLimitHighDef : +400; ///< PRS357 default \ref MAdjustPressuresLimitsReq + 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; + + readonly property string notSetVariableText : "__" + // Units // - Ultrafiltration - readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") + readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") readonly property string unitTextTreatmentDuration : qsTr("min") // - Flows readonly property string unitTextFlowRate : qsTr("mL/min") // - Vitals readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid - readonly property string unitTextSaline : qsTr("mL") - readonly property string unitTextHeparin : qsTr("mL") - + readonly property string unitTextFluid : qsTr("mL") + readonly property string unitTextSaline : unitTextFluid + readonly property string unitTextHeparin : unitTextFluid + // - Create Treatment + readonly property string unitTextBPMeasurementInterval : qsTr("min") }