Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r31b1e7a5d69f014398827e16286f28515cd60e35 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 31b1e7a5d69f014398827e16286f28515cd60e35) @@ -29,19 +29,14 @@ * \details All the class signal/slot connections are defined here. */ void View::VTreatmentVitals::initConnections() { -// ACTION_RECEIVE_BRIDGE_CONNECTION(_BluetoothInterface, UIBloodPressureData); -// ACTION_VIEW_CONNECTION(AdjustVitalsResponseData); -// ADJUST_VIEW_CONNECTION(AdjustVitalsRequestData ); - connect(this, SIGNAL( intervalChanged (const quint8 &)), this, SLOT(onIntervalChanged ( ))); } void View::VTreatmentVitals::onActionReceive(const TreatmentVitalsData &vData) -// void View::VTreatmentVitals::onActionReceive(const AdjustVitalsResponseData &vData) { - update_rt (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); -// update (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); +// update_rt (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); + update (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); emit didTrigger(vData.mSystolic, vData.mDiastolic, vData.mHeartRate); qDebug() << tr("**************8Vital received,%1,%2,%3") @@ -55,30 +50,7 @@ .arg(vData.mHeartRate)); } - /*! - * \brief View::VTreatmentVitals::onActionReceive - * \details The data handler which gets the data form GuiControl and GuiController will get the data from BtCuff controller. - * \param vData - Vital values - * \note the accepted and reason in this case should be the BtCuff status which may not necessarily comes front BtCuff itself, - * and the intermediate controller like the GuiController or the BtCuffController can report from BtCuff behalf if it is connected or not responsive. - */ -//void View::VTreatmentVitals::onActionReceive(const UIBloodPressureData &vData) -//{ -// // Not used yet. -// // adjustment_Accepted ( vData.mAccepted ); -// // adjustment_Reason ( vData.mReason ); - -// update_rt (vData.mSystolic, vData.mDiastolic, vData.mPulseRate); -// emit didTrigger(vData.mSystolic, vData.mDiastolic, vData.mPulseRate); -// // if the vitals is disabled it means Gui is probably in an incorrect state and is unable to handle the vital information. -// LOG_APPED_UI(tr("Vital received,%1,%2,%3") -// .arg(vData.mSystolic ) -// .arg(vData.mDiastolic) -// .arg(vData.mPulseRate)); -//} - -/*! * \brief View::VTreatmentVitals::doConfirm * \details Append the user measured BP/HR in to the list of the Treatment Log Average data * \param vSystolic - Blood Pressure Systolic @@ -207,11 +179,8 @@ if ( ! _counter_min ) { timerStop(); - AdjustVitalsRequestData mData; - emit didAdjustment(mData); - qDebug() << "****didAdjustment --- AdjustVitalsRequestData" ; - -// emit didTrigger(); + qDebug() << "**** TIME IS UP" ; + emit didTrigger(); } else { _counter_min--;