Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -30,7 +30,8 @@ width : 750 x : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 : Math.round((Variables.applicationWidth - width) / 2) - notification.visible: vTreatmentVitals.lastRead + notification.textfontSize: 20 + notification.visible: vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText property string notificationTextString: qsTr("Interval:" ) + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) @@ -44,24 +45,27 @@ _bphrEntry.heartRate = vHeartRate ? vHeartRate : "" } + function confirm() { + vTreatmentVitals.doConfirm( + _bphrEntry.systolic , + _bphrEntry.diastolic , + _bphrEntry.heartRate + ) + _headerBar.vitalsRecorded() + } + onOpened: { - notificationText = notificationTextString + notificationText = vTreatmentAdjustmentVitals.adjustment_ReasonText ? qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) : + notificationTextString vTreatmentVitals.doTimerStop() - - vTreatmentAdjustmentVitals.doRequest() ///REMOVE ONLY FOR TESTING MESSAGE } onClosed: vTreatmentVitals.doTimerStart() onConfirmClicked: { numPad.hide() _root.close() - vTreatmentVitals.doConfirm( - _bphrEntry.systolic , - _bphrEntry.diastolic , - _bphrEntry.heartRate - ) - _headerBar.vitalsRecorded() + _root.confirm() } onCloseClicked: { @@ -76,11 +80,9 @@ Connections { target: vTreatmentVitals function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { print(("%1 / %2 -- %3").arg(vSystolic).arg(vDiastolic).arg(vHeartRate)) - _root.update ( vSystolic, vDiastolic, vHeartRate ) // vitals recorded if ( vSystolic && vDiastolic && vHeartRate ) { - print("**** vitalsRecorded ") _headerBar.vitalsRecorded() } else { @@ -92,13 +94,16 @@ Connections { target: vTreatmentAdjustmentVitals function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { - // read data - print("**** vTreatmentAdjustmentVitals.adjustment_Accepte ") - + // on accepted read vital data and populate + _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) + _root.confirm() + vTreatmentVitals.doTimerStart() } else { - notificationText = qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) - if ( vTreatmentVitals.enableDialog ) { _root.open () } + // on rejected prompt user to enter vitals manually + if ( vTreatmentVitals.enableDialog ) { + _root.open () + } } } } Index: sources/model/td/data/treatment/MTreatmentVitalsData.cpp =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/model/td/data/treatment/MTreatmentVitalsData.cpp (.../MTreatmentVitalsData.cpp) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/model/td/data/treatment/MTreatmentVitalsData.cpp (.../MTreatmentVitalsData.cpp) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -31,6 +31,8 @@ if ( ! GetValue(vByteArray, index, _data.mDiastolic )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeartRate )) goto lError; + qDebug() << "***** MTreatmentVitals::fromByteArray: " << _data.mSystolic.value <<_data.mDiastolic.value <<_data.mHeartRate.value; + return true ; lError: Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -20,9 +20,8 @@ // Project #include "GuiController.h" #include "TreatmentLog.h" -//#include "BluetoothInterface.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentVitals) +VIEW_DEF_CLASS(VTreatmentVitals) /*! * \brief Connection Initializer @@ -31,19 +30,13 @@ void View::VTreatmentVitals::initConnections() { connect(this, SIGNAL( intervalChanged (const quint8 &)), this, SLOT(onIntervalChanged ( ))); + ACTION_RECEIVE_BRIDGE_CONNECTION( Gui::_GuiController, TreatmentVitalsData); } void View::VTreatmentVitals::onActionReceive(const TreatmentVitalsData &vData) { -// update_rt (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); - update (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); - emit didTrigger(vData.mSystolic, vData.mDiastolic, vData.mHeartRate); + update_rt (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); - qDebug() << tr("**************Vital received,%1,%2,%3") - .arg(vData.mSystolic ) - .arg(vData.mDiastolic) - .arg(vData.mHeartRate); - LOG_APPED_UI(tr("Vital received,%1,%2,%3") .arg(vData.mSystolic ) .arg(vData.mDiastolic) @@ -60,9 +53,6 @@ void View::VTreatmentVitals::doConfirm( quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate) { - adjustment_Accepted ( true ); - adjustment_Reason ( 0 ); - update(vSystolic, vDiastolic, vHeartRate); treatmentLog(); LOG_APPED_UI(tr("Vital Confirmed,%1,%2,%3") @@ -179,7 +169,6 @@ if ( ! _counter_min ) { timerStop(); - qDebug() << "**** TIME IS UP" ; emit didTrigger(); } else { Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -18,10 +18,7 @@ // Project #include "main.h" // Doxygen : do not remove -//#include "MTreatmentAdjustVitalsResponse.h" -//#include "MUIBloodPressureData.h" #include "MTreatmentVitalsData.h" - #include "VAdjustmentResponseBase.h" namespace View { @@ -33,7 +30,7 @@ * \sa Model::TreatmentLogAvrgeData * */ -class VTreatmentVitals : public VAdjustmentResponseBase { +class VTreatmentVitals : public QObject { Q_OBJECT // friends @@ -56,7 +53,6 @@ CONSTANT( quint16 , heartRateMin , 40) CONSTANT( quint16 , heartRateMax , 180) - // timer PROPERTY( bool , enableDialog , 0) // enable the vital Dialog being triggered (pre-treatment is screen not a dialog) PROPERTY( quint8 , interval , 1) // show the vital screen in min @@ -79,9 +75,9 @@ PROPERTY( quint8 , min_left , 0) PROPERTY( quint8 , sec_left , 0) -// VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, UIBloodPressureData) -// VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, AdjustVitalsResponseData) +// VIEW_DEC_CLASS(VTreatmentVitals) VIEW_DEC(VTreatmentVitals, TreatmentVitalsData) +// VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, TreatmentVitalsData) void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); void update_rt (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp =================================================================== diff -u -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp (.../VTreatmentAdjustmentVitals.cpp) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp (.../VTreatmentAdjustmentVitals.cpp) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -29,7 +29,7 @@ { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - qDebug() << __FUNCTION__ << adjustment_Accepted << adjustment_Reason; + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustment ( true );