Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -r2b0c62ca1a150e1a375ab388be076e17532cb20f -rde099919f262c3429cb0592ef71deb6a16e92892 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision de099919f262c3429cb0592ef71deb6a16e92892) @@ -30,12 +30,12 @@ width : 1000 function confirm() { - vTreatmentCreate.bloodPressureMeasureInterval = _bpMeasurementIntervalControl.value + vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex] vTreatmentVitals.doTimerStart() _root.close() } - onOpened: { _bpMeasurementIntervalControl.value = vTreatmentCreate.bloodPressureMeasureInterval } + onOpened: _bpMeasurementIntervalControl.currentIndex = vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) LabelUnitContainer { id: _bpMeasurementInterval anchors { @@ -53,19 +53,20 @@ unitPixelSize : Fonts.fontPixelContainerUnitSmall titleLeftMargin : Variables.defaultMargin * 2 - contentItem : ValueAdjuster { id: _bpMeasurementIntervalControl - minimum : vTreatmentRanges.bloodPressureMeasureIntervalMin - maximum : vTreatmentRanges.bloodPressureMeasureIntervalMax - step : vTreatmentRanges.bloodPressureMeasureIntervalRes - defaultValue : vTreatmentRanges.bloodPressureMeasureIntervalDef - value : vTreatmentCreate.bloodPressureMeasureInterval - canOff : true - isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet + contentItem : BaseComboBox { id: _bpMeasurementIntervalControl + anchors.rightMargin : Variables.defaultMargin * 2 + anchors.leftMargin : anchors.rightMargin + anchors.topMargin : Variables.defaultMargin / 2 + anchors.bottomMargin: anchors.topMargin + isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet + currentIndex : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) + model : vTreatmentRanges.bloodPressureMeasureInterval + onClear : vTreatmentCreate.bloodPressureMeasureIntervalSet = false + canOff : true - onDidActiveChange : function(vState) { vTreatmentCreate.bloodPressureMeasureIntervalSet = vState } - onDidChange : function(vValue) { + onActivated : { if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } - value = vValue + vTreatmentCreate.bloodPressureMeasureIntervalSet = true } } }