Index: sources/gui/qml/main.qml =================================================================== diff -u -rcc7aae88f15228ff37b840946818692e444718bf -r83d2e1a9625c2035214bf6604d1603736877dab8 --- sources/gui/qml/main.qml (.../main.qml) (revision cc7aae88f15228ff37b840946818692e444718bf) +++ sources/gui/qml/main.qml (.../main.qml) (revision 83d2e1a9625c2035214bf6604d1603736877dab8) @@ -124,6 +124,7 @@ import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 import VTreatmentAdjustmentSaline 0.1 +import VTreatmentAdjustmentVitals 0.1 import VTreatmentAdjustmentHeparin 0.1 import VTreatmentAdjustmentRinseback 0.1 import VTreatmentAdjustmentRecirculate 0.1 @@ -142,6 +143,7 @@ import "qrc:/globals" import "qrc:/pages" import "qrc:/pages/treatment" +import "qrc:/pages/treatment/adjustments" import "qrc:/pages/settings" import "qrc:/components" import "qrc:/dialogs" @@ -191,16 +193,12 @@ VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentVitals { id: vTreatmentVitals - interval : vTreatmentCreate.bloodPressureMeasureInterval - enableDialog: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment - // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. - onEnableDialogChanged : { - if ( vTreatmentVitals.enableDialog ) { - vTreatmentVitals.doTimerStart() - } - else { - vTreatmentVitals.doTimerStop() - } + interval : vTreatmentCreate.bloodPressureMeasureInterval + canStartInterval: vTreatmentCreate.parametersConfirmed + enableBPCuff : true // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff + onCanStartIntervalChanged : { + if ( vTreatmentVitals.canStartInterval ) { vTreatmentVitals.doTimerStart() } + else { vTreatmentVitals.doTimerStop() } } } @@ -275,6 +273,7 @@ VTreatmentRanges { id: vTreatmentRanges } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } + VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } @@ -360,6 +359,7 @@ HeaderbarStorage { id: _headerbarStorage } HeaderbarSettings { id: _headerbarSettings } HeaderbarInformation { id: _headerbarInformation } + TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } LockDialog { id: _lockDialog } AlarmItem { id: _alarmItem ; z: 996 } PowerItem { id: _powerItem ; z: 997 }