Index: sources/gui/qml/main.qml =================================================================== diff -u -r31b1e7a5d69f014398827e16286f28515cd60e35 -r736a7be958ca343f17b50e9e0d85cd395e8037e7 --- sources/gui/qml/main.qml (.../main.qml) (revision 31b1e7a5d69f014398827e16286f28515cd60e35) +++ sources/gui/qml/main.qml (.../main.qml) (revision 736a7be958ca343f17b50e9e0d85cd395e8037e7) @@ -181,7 +181,7 @@ VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentVitals { id: vTreatmentVitals -// interval : vTreatmentCreate.bloodPressureMeasureInterval // TESTING FOR 1 MIN TIMER -- REVERT FOR CR + 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 : { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rc1358f289cb0b96fb75b9ae67659d8a550262f78 -r736a7be958ca343f17b50e9e0d85cd395e8037e7 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 736a7be958ca343f17b50e9e0d85cd395e8037e7) @@ -78,16 +78,8 @@ } Connections { target: vTreatmentVitals - function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { - print(("%1 / %2 -- %3").arg(vSystolic).arg(vDiastolic).arg(vHeartRate)) - - // vitals recorded - if ( vSystolic && vDiastolic && vHeartRate ) { - _headerBar.vitalsRecorded() - } - else { - vTreatmentAdjustmentVitals.doRequest() - } + function onDidTrigger () { + vTreatmentAdjustmentVitals.doRequest() } } @@ -99,8 +91,7 @@ _root.confirm() vTreatmentVitals.doTimerStart() } - else { - // on rejected prompt user to enter vitals manually + else { // on rejected prompt user to enter vitals manually if ( vTreatmentVitals.enableDialog ) { _root.open () } Index: sources/model/td/data/treatment/MTreatmentVitalsData.cpp =================================================================== diff -u -rc1358f289cb0b96fb75b9ae67659d8a550262f78 -r736a7be958ca343f17b50e9e0d85cd395e8037e7 --- sources/model/td/data/treatment/MTreatmentVitalsData.cpp (.../MTreatmentVitalsData.cpp) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) +++ sources/model/td/data/treatment/MTreatmentVitalsData.cpp (.../MTreatmentVitalsData.cpp) (revision 736a7be958ca343f17b50e9e0d85cd395e8037e7) @@ -31,8 +31,6 @@ 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 -rc1358f289cb0b96fb75b9ae67659d8a550262f78 -r736a7be958ca343f17b50e9e0d85cd395e8037e7 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 736a7be958ca343f17b50e9e0d85cd395e8037e7) @@ -112,10 +112,6 @@ systolic ( vSystolic ); diastolic ( vDiastolic ); heartRate ( vHeartRate ); - - // *** 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); } /*! @@ -157,7 +153,7 @@ if ( ! _timerId ) return; // No timer started or failed starting if ( ! _interval ) return; // if interval is 0/OFF return - /* DEBUG:*/ qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; + // DEBUG: qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; _counter_sec++; min_left(_counter_min ); @@ -179,7 +175,7 @@ void View::VTreatmentVitals::onIntervalChanged() { - /* DEBUG: */qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; + // DEBUG: qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; if ( _interval ) timerReset(); else timerStop (); // Timer stop is resetting timer too. } @@ -193,12 +189,11 @@ { if ( _timerId ) killTimer(_timerId); // this typically should not happen. if ( ! _interval ) return; // if interval is 0/OFF return - /* DEBUG:*/ qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; + // DEBUG: qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; timerReset(); _timerId = startTimer(1000); // 1 sec interval which will used as 1 min in timerEvent (easier to debug) } - void View::VTreatmentVitals::timerReset() { if ( _interval ) { @@ -209,7 +204,7 @@ _counter_min = 0; } _counter_sec = 0; - /* DEBUG: */qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; + // DEBUG: qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; } /*! @@ -219,7 +214,7 @@ void View::VTreatmentVitals::timerStop() { if ( ! _timerId ) return; // No timer started or failed starting - /*DEBUG:*/ qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; + // DEBUG: qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; killTimer(_timerId); _timerId = 0; timerReset(); Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rc1358f289cb0b96fb75b9ae67659d8a550262f78 -r736a7be958ca343f17b50e9e0d85cd395e8037e7 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 736a7be958ca343f17b50e9e0d85cd395e8037e7) @@ -40,10 +40,6 @@ int _counter_sec = 0; int _counter_min = 0; - // The property adjustment_Triggered has to be always true - // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustment , 0) - // Vitals data // constant range variables / units / ... CONSTANT( quint16 , systolicMin , 60) @@ -55,7 +51,7 @@ // 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 + PROPERTY( quint8 , interval , 0) // show the vital screen in min // timestamp PROPERTY( quint64 , epoch , 0) @@ -110,7 +106,7 @@ * \brief didTrigger * \details the signal to trigger the Gui to notify the user for the vitals measurement */ - void didTrigger(quint16 vSystolic = 0, quint16 vDiastolic = 0, quint16 vHeartRate = 0); + void didTrigger(); /*! * \brief didAdjustment