Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -rd0ae5a039ca37630c0911e1f9041b93b980e0431 -r533c771015857845302bcbc58b411ecef2d6ec79 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision d0ae5a039ca37630c0911e1f9041b93b980e0431) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 533c771015857845302bcbc58b411ecef2d6ec79) @@ -160,28 +160,28 @@ var maxDiff = Math.abs(maxValue - value) if ( minDiff === maxDiff ) { if ( curHandler === RangeSlider.HandlerOption.Max ) { - if ( value < maxValueLowerBound ) return - if ( value > maxValueUpperBound ) return + if ( value < maxValueLowerBound ) { maxValue = maxValueLowerBound; return } + if ( value > maxValueUpperBound ) { maxValue = maxValueUpperBound; return } maxValue = value } else { curHandler = RangeSlider.HandlerOption.Min - if ( value < minValueLowerBound ) return - if ( value > minValueUpperBound ) return + if ( value < minValueLowerBound ) { minValue = minValueLowerBound; return } + if ( value > minValueUpperBound ) { minValue = minValueUpperBound; return } minValue = value } } else { if ( minDiff < maxDiff ) { curHandler = RangeSlider.HandlerOption.Min - if ( value < minValueLowerBound ) return - if ( value > minValueUpperBound ) return + if ( value < minValueLowerBound ) { minValue = minValueLowerBound; return } + if ( value > minValueUpperBound ) { minValue = minValueUpperBound; return } minValue = value } else { curHandler = RangeSlider.HandlerOption.Max - if ( value < maxValueLowerBound ) return - if ( value > maxValueUpperBound ) return + if ( value < maxValueLowerBound ) { maxValue = maxValueLowerBound; return } + if ( value > maxValueUpperBound ) { maxValue = maxValueUpperBound; return } maxValue = value } } Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -rb0a485af0bb3c3fd48c5ba8a2f59706d2aff0e75 -r533c771015857845302bcbc58b411ecef2d6ec79 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision b0a485af0bb3c3fd48c5ba8a2f59706d2aff0e75) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 533c771015857845302bcbc58b411ecef2d6ec79) @@ -31,18 +31,36 @@ * It contains of label for the Arterial/Venous and the unit next to it on top left. * And on the left side a RangeBar on top of a RangeSlider that are layed out in a Column. * The RangeSlider and RangeBar are connected and RangeSlider change affects RangeBar min/max. + \verbatim + m__imum : 0 100 + rangebar : ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ + limitGap : ┌─────────────────────────────────────────────┐ + rangeslider : └──────(──────@───)───────────────────────────────(─────────@──────────)──────────┘ + m__imumMargin : └────┘ │ │ │ │ │ │ └───────────┘ + lowerBoundMin : ────────────┘ │ │ │ │ │ + lowerBound : ───────────────────┘ │ │ │ │ + lowerBoundMax : ───────────────────────┘ │ │ │ + upperBoundMin : ───────────────────────────────────────────────────────┘ │ │ + upperBound : ─────────────────────────────────────────────────────────────────┘ │ + upperBoundMax : ────────────────────────────────────────────────────────────────────────────┘ + \endverbatim */ Row { id: _root + property real minimum : 0 ///< the minimum value of the range (adjustable slider might be different regarding the minimumMargin) + property real minimumMargin : 0 ///< the margin of the adjustable minimum value from the minimm + property real lowerBoundMin : 0 ///< the adjutable lowerband minimum acceptable value + property real lowerBound : 0 ///< + property real lowerBoundMax : 0 ///< the adjutable lowerband maximum acceptable value + property real upperBoundMin : 0 ///< the adjutable upperband minimum acceptable value + property real upperBound : 0 ///< + property real upperBoundMax : 0 ///< the adjutable upperband maximum acceptable value + property real maximumMargin : 0 ///< + property real maximum : 0 ///< + property real value : 0 ///< + property real step : 10 ///< + property int limitGap : 0 - property real minimum : 0 - property real minimumMargin : 0 - property real lowerBound : 0 - property real upperBound : 0 - property real maximumMargin : 0 - property real maximum : 0 - property real value : 0 - property real step : 10 - property bool ticksVisible : false + property bool ticksVisible : false ///< property string titleText : "" property string titleUnit : Variables.unitTextBloodPressure @@ -117,12 +135,12 @@ } RangeSlider { id: _pressureSlider anchors { - top : _pressureRangeBar.top - topMargin: sliderTopMargin - left : _pressureRect.left - leftMargin: _pressureRangeBar.minDiff - right: _pressureRect.right - rightMargin: _pressureRangeBar.maxDiff + top : _pressureRangeBar.top + topMargin : sliderTopMargin + left : _pressureRect.left + leftMargin : _pressureRangeBar.minDiff + right : _pressureRect.right + rightMargin : _pressureRangeBar.maxDiff } height : 5 @@ -148,10 +166,22 @@ color: "white" } + // **** Ranges vvvv minimum : _root.minimum + _pressureRect.minMargin - minValue: _root.lowerBound - maxValue: _root.upperBound + + minValueLowerBound : _root.lowerBoundMin + minValue : _root.lowerBound + minValueUpperBound : _root.lowerBoundMax + + maxValueLowerBound : _root.upperBoundMin + maxValue : _root.upperBound + maxValueUpperBound : _root.upperBoundMax + maximum : _root.maximum - _pressureRect.maxMargin + + gapValue: _root.limitGap + // **** Ranges ^^^^ + unit : Variables.unitTextBloodPressure step : _root.step ticks : _root.ticksVisible Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 -r533c771015857845302bcbc58b411ecef2d6ec79 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 533c771015857845302bcbc58b411ecef2d6ec79) @@ -113,34 +113,38 @@ // Inline Blood Pressures // - Artrial // - Artrial - Entire pressure value range - readonly property int arterialValueMin : -400; // PRS362 const - readonly property int arterialValueMax : +600; // PRS362 const + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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)") @@ -152,9 +156,9 @@ 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") - } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 -r533c771015857845302bcbc58b411ecef2d6ec79 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 533c771015857845302bcbc58b411ecef2d6ec79) @@ -35,14 +35,14 @@ property alias arterialPressureUpperBound : _arterialPressure.upperBound property alias arterialPressureMaximum : _arterialPressure.maximum property alias arterialPressureValue : _arterialPressure.value - property real arterialPressureStep : 10 + property real arterialPressureStep : Variables.arterialLimitStep property alias venousPressureMinimum : _venousPressure.minimum property alias venousPressureLowerBound : _venousPressure.lowerBound property alias venousPressureUpperBound : _venousPressure.upperBound property alias venousPressureMaximum : _venousPressure.maximum property alias venousPressureValue : _venousPressure.value - property real venousPressureStep : 10 + property real venousPressureStep : Variables.venousLimitStep readonly property int textWidth : 200 @@ -57,8 +57,13 @@ progressColor : Colors.pressuresArterialBar minimumMargin : Math.abs(Variables.arterialValueMin - Variables.arterialLimitLowMin ) + lowerBoundMin : Variables.arterialLimitLowMin + lowerBoundMax : Variables.arterialLimitLowMax + upperBoundMin : Variables.arterialLimitHighMin + upperBoundMax : Variables.arterialLimitHighMax maximumMargin : Math.abs(Variables.arterialValueMax - Variables.arterialLimitHighMax) - step: arterialPressureStep + limitGap : Variables.arterialLimitGap + step : arterialPressureStep } Line { @@ -73,8 +78,13 @@ progressColor : Colors.pressuresVenousBar minimumMargin : Math.abs(Variables.venousValueMin - Variables.venousLimitLowMin ) + lowerBoundMin : Variables.venousLimitLowMin + lowerBoundMax : Variables.venousLimitLowMax + upperBoundMin : Variables.venousLimitHighMin + upperBoundMax : Variables.venousLimitHighMax maximumMargin : Math.abs(Variables.venousValueMax - Variables.venousLimitHighMax) - step: venousPressureStep + limitGap : Variables.venousLimitGap + step : venousPressureStep } } } Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r533c771015857845302bcbc58b411ecef2d6ec79 --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 533c771015857845302bcbc58b411ecef2d6ec79) @@ -32,7 +32,7 @@ property int rowTextSpacing : 10 property int volumeTextWidth : 60 - property string unit : "" + property string unit : Variables.unitTextFluid property alias valueTarget : _fluidTarget .value property alias valueCumulative : _cumulativeValue .value property alias valueDelivered : _fluidProgressBar .value