Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -rcdd3b6d52a0e49da5be195b2cd0b139ab323add6 -re81cebefb7bc95553f32e6ba505706683f9c12b4 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision cdd3b6d52a0e49da5be195b2cd0b139ab323add6) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision e81cebefb7bc95553f32e6ba505706683f9c12b4) @@ -24,7 +24,7 @@ * \brief Denali project ProgressBar */ RangeRect { id: _root - property real value : _progressRect.value + property alias value : _progressRect.value property real step : 1 property bool stepSnap : false @@ -57,8 +57,6 @@ signal handleSelected() signal sliderSelected() - onValueChanged: _progressRect.value = value - function incrementValue (vInStepSegments) { updateValue(vInStepSegments, true) } @@ -86,7 +84,7 @@ // Update the slider's visual value _progressRect.previousSliderValue = newValue // for comparison purposes - _progressRect.value = newValue // visual value + _progressRect.value = newValue // visual value // update slider value with rounded new value update(newValue) @@ -102,8 +100,6 @@ } } - onEnabledChanged: _progressRect.value = minimum // reset the visual progress bar - onIsActiveChanged: { setActiveVisuals(isActive) @@ -114,7 +110,7 @@ if(!isActive) { _root.value = inActiveZero ? 0 : minimum } else { - _root.value = _progressRect.value = minimum + _root.value = minimum } activeChanged() // emit Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -re12570fc8c5e8a16e27875635daee81422ea3abb -re81cebefb7bc95553f32e6ba505706683f9c12b4 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e12570fc8c5e8a16e27875635daee81422ea3abb) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e81cebefb7bc95553f32e6ba505706683f9c12b4) @@ -221,7 +221,7 @@ if(!valid) { vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason } - vTreatmentCreate.heparinDispensingRate = value + vTreatmentCreate.heparinDispensingRate = _heparinDispensingRateSwitch.checked ? value : 0 } // ToDo: create a component for Switch, // ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property @@ -301,7 +301,7 @@ if(!valid) { vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason } - vTreatmentCreate.heparinBolusVolume = value + vTreatmentCreate.heparinBolusVolume = _heparinBolusVolumeSwitch.checked ? value : 0 } // ToDo: create a component for this, @@ -740,7 +740,7 @@ if(!valid) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } - vTreatmentCreate.bloodPressureMeasureInterval = value + vTreatmentCreate.bloodPressureMeasureInterval = _bloodPressureIntervalSwitch.checked ? value : 0 } // ToDo: create a component for this,