Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -r73da05e9b761c559cd4d6741e574fc0f40475ebc -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 73da05e9b761c559cd4d6741e574fc0f40475ebc) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -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 { @@ -44,26 +44,33 @@ horizontalCenter: _root.contentItem.horizontalCenter } - text : qsTr("BP Measurement Interval") + text : qsTr("Vitals Interval") unitText : Variables.unitTextDuration valid : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason width : Variables.adjustmentLabelUnitContainerWidth height : Variables.adjustmentLabelUnitContainerHeight - 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 + canOff : true + centerHorizontally : true - onDidActiveChange : function(vState) { vTreatmentCreate.bloodPressureMeasureIntervalSet = vState } - onDidChange : function(vValue) { - if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } - value = vValue + onClear : { + vTreatmentCreate.bloodPressureMeasureIntervalSet = false } + + onActivated : { + if ( ! _bpMeasurementInterval.valid ) { + vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason + } + vTreatmentCreate.bloodPressureMeasureIntervalSet = true + } } }