Index: sources/gui/qml/compounds/AutoStepController.qml =================================================================== diff -u -rac81e21684bfb1c72b8ef86bfeda04e174e5066e -r628b49d35ec2f39863c4de4956a05f662f6e046a --- sources/gui/qml/compounds/AutoStepController.qml (.../AutoStepController.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e) +++ sources/gui/qml/compounds/AutoStepController.qml (.../AutoStepController.qml) (revision 628b49d35ec2f39863c4de4956a05f662f6e046a) @@ -27,7 +27,6 @@ onClicked : _root.isPlaying = ! _root.isPlaying } - Text { id: _helpText anchors { left : _button.right Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -r628b49d35ec2f39863c4de4956a05f662f6e046a --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 628b49d35ec2f39863c4de4956a05f662f6e046a) @@ -207,4 +207,15 @@ } } } + + Connections { target: vTreatmentAdjustmentVitals + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentVitals.adjustment_Accepted ) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentVitals.adjustment_ReasonText + } + } + } } Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -rac81e21684bfb1c72b8ef86bfeda04e174e5066e -r628b49d35ec2f39863c4de4956a05f662f6e046a --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 628b49d35ec2f39863c4de4956a05f662f6e046a) @@ -33,7 +33,8 @@ header.showVitals : true contentArea.anchors.topMargin : 0 - onVitalsClicked: print("onVitalsClicked") + onVitalsClicked: vSettings.integratedBPCuff ? vTreatmentAdjustmentVitals.doRequest() : + _treatmentAdjustmentVitals.open() contentItem: Column { id: _content spacing : Variables.defaultMargin * 4.5 Index: sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h =================================================================== diff -u -r21ce57716379c74355e4d268097b1b44bb59170c -r628b49d35ec2f39863c4de4956a05f662f6e046a --- sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h (.../MTreatmentAdjustVitalsResponse.h) (revision 21ce57716379c74355e4d268097b1b44bb59170c) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h (.../MTreatmentAdjustVitalsResponse.h) (revision 628b49d35ec2f39863c4de4956a05f662f6e046a) @@ -25,7 +25,7 @@ namespace Model { /*! - * \brief The MAdjustSalineResponse class + * \brief The MAdjustVitalsResponse class * \details The Saline Bolus adjustment response model * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -36,7 +36,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mTarget | * * \sa Data * \sa MAdjustVitalsReq: Vitals Request