Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r510ea07f96362a18f9961f41b5b91740df075c1f -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 510ea07f96362a18f9961f41b5b91740df075c1f) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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) Peter Lucia * \date (last) 06-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 09-Oct-2019 - * + * */ // Qt @@ -88,18 +88,19 @@ readonly property int sliderCircleDiameter : 25 readonly property int pressuresProgressbarWidth : 725 - + readonly property int gridSelectionButtonHeight : 100 readonly property int gridSelectionButtonWidth : 375 + readonly property int informationTableHeight : 800 + readonly property int informationTableWidth : applicationWidth - 50 + readonly property int informationTableMargin : 45 + readonly property int informationSubTableHeight : 50 + readonly property int informationSubTableWidth : 500 + readonly property int informationTableEntryMargin : 20 + readonly property int informationTableHeaderHeight : 130 + 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 @@ -113,22 +114,46 @@ readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30 + readonly property int settingsArrowHeight : 30 + readonly property int settingsArrowWidth : 24 + readonly property int settingsButtonWidth : 300 + readonly property int settingsButtonHeight : 85 + readonly property int settingsMargin : 75 + readonly property int settingsSpacing : 20 + readonly property int settingsInputWidth : 225 + readonly property int settingsNotificationMargin : 10 + 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 settingsBLEButtonWidth : settingsButtonWidth + readonly property int settingsBLEButtonHeight : settingsButtonHeight + readonly property int settingsBLEMargin : settingsMargin readonly property int settingsBLEListViewMargin : 25 readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 + readonly property int settingsWIFIButtonWidth : settingsButtonWidth + readonly property int settingsWIFIButtonHeight : settingsButtonHeight + readonly property int settingsWIFIMargin : settingsMargin + readonly property int settingsWIFIInputWidth : settingsInputWidth + readonly property int settingsWIFISpacing : settingsSpacing + readonly property int settingsWIFINetworkHeight : 85 + readonly property int settingsWIFINetworkWidth : 375 + readonly property int settingsWIFINetworksWidth : settingsWIFINetworkWidth + 50 + readonly property int settingsWIFIBottomMargin : 15 + + readonly property int rinsebackIconDiameterDefault : 85 + readonly property int rinsebackIconDiameterResumePause : 110 readonly property int vitalsTopMargin : 30 readonly property int vitalsLeftMargin : 50 readonly property int textInputWidth : 350 readonly property int textInputHeight : 50 readonly property int textInputLineWidth : 100 + readonly property int settingsDateTimeSetMargin : settingsMargin + readonly property int settingsDateTimeSetSpacing : settingsSpacing + readonly property int settingsDateTimeSetInputWidth : settingsInputWidth // ---------- < PRS > Related Section ---------- // Min/Max @@ -138,6 +163,8 @@ readonly property int bloodFlowResolution : 25 readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 + // Precision + readonly property int ultrafiltrationPrecision : 3 // Inline Blood Pressures // - Artrial @@ -146,12 +173,10 @@ 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 + readonly property int arterialLimitLowMax : 0; ///< 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 + 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; @@ -161,12 +186,10 @@ 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 venousLimitLowMin : +20; ///< PRS356 const 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 venousLimitHighMin : +20; ///< 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 @@ -181,6 +204,11 @@ readonly property string notSetVariableText : "__" + 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 // - Ultrafiltration readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") @@ -192,9 +220,9 @@ readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid - readonly property string unitTextFluid : qsTr("mL") - readonly property string unitTextSaline : unitTextFluid - readonly property string unitTextHeparin : unitTextFluid + readonly property string unitTextFluid : qsTr("mL") + readonly property string unitTextSaline : unitTextFluid + readonly property string unitTextHeparin : unitTextFluid // - Create Treatment - readonly property string unitTextBPMeasurementInterval : qsTr("min") + readonly property string unitTextBPMeasurementInterval : qsTr("min") }