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 {