Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c -r1a46e7e1fd9da0fcfa8359a194610c55adfff04f --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 1a46e7e1fd9da0fcfa8359a194610c55adfff04f) @@ -143,13 +143,14 @@ } } - Connections { target: _acidConcentrateAdjustment - function onAccepted () { - vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.find(_acidConcentrateAdjustment.adjustment) - _acidConcentrateComboBox.currentIndex = vTreatmentCreate.acidConcentrate - vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateValues[vTreatmentCreate.acidConcentrate] - } - } + // TODO Phase 2 +// Connections { target: _acidConcentrateAdjustment +// function onAccepted () { +// vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.find(_acidConcentrateAdjustment.adjustment) +// _acidConcentrateComboBox.currentIndex = vTreatmentCreate.acidConcentrate +// vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateValues[vTreatmentCreate.acidConcentrate] +// } +// } HeparinRxAdjustment { id: _heparinRxAdjustment; editingEnabled: _root.editingEnabled } @@ -270,84 +271,4 @@ } } - - - - -// LabelUnitContainer { id: _duration -// text : qsTr("Duration") -// unitText : Variables.unitTextDuration -// valid : ! vTreatmentCreate.treatmentDurationRejectReason - -// contentItem : ValueAdjuster { id: _durationControl -// editable : _root.editingEnabled -// minimum : vTreatmentRanges.treatmentDurationMin -// maximum : vTreatmentRanges.treatmentDurationMax -// step : vTreatmentRanges.treatmentDurationRes -// defaultValue : vTreatmentRanges.treatmentDurationDef -// value : vTreatmentCreate.treatmentDuration -// isActive : vTreatmentCreate.treatmentDurationSet -// onDidActiveChange: function(vState) { vTreatmentCreate.treatmentDurationSet = vState } -// onDidChange : function(vValue) { -// if ( ! _duration.valid ) { vTreatmentCreate.treatmentDurationRejectReason = Variables.noRejectReason } -// vTreatmentCreate.treatmentDuration = vValue - -// // set heparin time to clear when set -// if ( _heparinDeliveryDurationControl.enabled ) { _heparinDeliveryDurationControl.clear() } -// } -// } -// } - - - -// LabelUnitContainer { id: _bpMeasurementInterval -// text : qsTr("Vitals Interval") -// unitText : Variables.unitTextDuration -// valid : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason - -// contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl -// editable : _root.editingEnabled -// isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet -// defaultValue : vTreatmentRanges.vitalsInterval -// value : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) -// model : vTreatmentRanges.bloodPressureMeasureInterval -// canOff : true - -// onDidActiveChange: function(vState) { vTreatmentCreate.bloodPressureMeasureIntervalSet = vState } - -// onDidChange : function(vValue) { -// if ( ! _bpMeasurementInterval.valid ) { -// vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason -// } - -// vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[vValue] -// vTreatmentCreate.bloodPressureMeasureIntervalSet = true -// } -// } -// } - - - -// LabelUnitContainer { id: _fluidBolusVolume -// text : qsTr("Fluid Bolus Volume") -// unitText : Variables.unitTextFluid -// valid : ! vTreatmentCreate.fluidBolusVolumeRejectReason - -// contentItem : ValueAdjuster { id: _fluidBolusVolumeControl -// editable : _root.editingEnabled -// minimum : vTreatmentRanges.salineBolusVolumeMin -// maximum : vTreatmentRanges.salineBolusVolumeMax -// step : vTreatmentRanges.salineBolusVolumeRes -// defaultValue : vTreatmentRanges.salineBolusVolumeDef -// value : vTreatmentCreate.fluidBolusVolume -// isActive : vTreatmentCreate.fluidBolusVolumeSet -// onDidActiveChange: function(vState) { vTreatmentCreate.fluidBolusVolumeSet = vState } -// onDidChange : function(vValue) { -// if ( ! _fluidBolusVolume.valid ) { vTreatmentCreate.fluidBolusVolumeRejectReason = Variables.noRejectReason } -// vTreatmentCreate.fluidBolusVolume = vValue -// } -// } -// } -// } - }