Index: sources/ApplicationPost.cpp =================================================================== diff -u -r6560ad50ac175b928d076c1e3d325c936db82adc -re1c454bcf26e1f4dd9aaffe05daeca138eb743b3 --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 6560ad50ac175b928d076c1e3d325c936db82adc) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision e1c454bcf26e1f4dd9aaffe05daeca138eb743b3) @@ -233,7 +233,7 @@ { QDate currentDate = QDate::currentDate(); bool ok = currentDate.year() >= _yearMinimum; - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_INVALID_YEAR); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_INVALID_YEAR); emit didYearCheck(ok); return ok; } Index: sources/ApplicationPost.h =================================================================== diff -u -r6560ad50ac175b928d076c1e3d325c936db82adc -re1c454bcf26e1f4dd9aaffe05daeca138eb743b3 --- sources/ApplicationPost.h (.../ApplicationPost.h) (revision 6560ad50ac175b928d076c1e3d325c936db82adc) +++ sources/ApplicationPost.h (.../ApplicationPost.h) (revision e1c454bcf26e1f4dd9aaffe05daeca138eb743b3) @@ -84,7 +84,7 @@ bool _isCloudSync = false ; // HIGH: : ALARM_ID_UI_POST_FAILURE_CLOUDSYNC bool _isEthernet = false ; // HIGH: : ALARM_ID_UI_POST_FAILURE_ETHERNET : this is not a Fault and not required the application to stop. bool _isSound = false ; // HIGH: : ALARM_ID_UI_POST_FAILURE_SOUND : this is not a Fault and not required the application to stop. - bool _isYearCheck = false ; // HIGH: : ALARM_ID_UI_POST_FAILURE_INVALID_YEAR + bool _isYearCheck = false ; // HIGH: : ALARM_ID_HD_UI_POST_FAILURE_INVALID_YEAR bool _isDone = false ; bool checkShaSum (); Index: sources/gui/qml/main.qml =================================================================== diff -u -r7fe4da5003605202da8bd782f1827deb3dac0e32 -re1c454bcf26e1f4dd9aaffe05daeca138eb743b3 --- sources/gui/qml/main.qml (.../main.qml) (revision 7fe4da5003605202da8bd782f1827deb3dac0e32) +++ sources/gui/qml/main.qml (.../main.qml) (revision e1c454bcf26e1f4dd9aaffe05daeca138eb743b3) @@ -338,19 +338,18 @@ color : Colors.textMain anchors { top : parent.top - right : _testDateTime.left - rightMargin : 50 + left : parent.left + leftMargin : 900 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom height : 15 - text : "Vital Timer: " + vTreatmentVitals.debug_min_left + " : " + vTreatmentVitals.debug_sec_left + text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left font.pixelSize: 14 } Text { // TEST : Current Date/Time - id: _testDateTime color : Colors.textMain anchors { top : parent.top Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r7fe4da5003605202da8bd782f1827deb3dac0e32 -re1c454bcf26e1f4dd9aaffe05daeca138eb743b3 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 7fe4da5003605202da8bd782f1827deb3dac0e32) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision e1c454bcf26e1f4dd9aaffe05daeca138eb743b3) @@ -177,8 +177,8 @@ // DEBUG: qDebug() << __FUNCTION__ << _counter_sec << _counter_min << _interval << _timerId; _counter_sec++; - debug_min_left(_counter_min ); - debug_sec_left(60 - _counter_sec); + min_left(_counter_min ); + sec_left(60 - _counter_sec); if ( _counter_sec % 60 ) return; // only check every minute @@ -190,8 +190,6 @@ _counter_min--; _counter_sec = 0; } - - } void View::VTreatmentVitals::onIntervalChanged() Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -r7fe4da5003605202da8bd782f1827deb3dac0e32 -re1c454bcf26e1f4dd9aaffe05daeca138eb743b3 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 7fe4da5003605202da8bd782f1827deb3dac0e32) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision e1c454bcf26e1f4dd9aaffe05daeca138eb743b3) @@ -75,8 +75,8 @@ PROPERTY( quint16 , heartRate_rt , 0) // For Debugging purposes - PROPERTY( quint8 , debug_min_left , 0) - PROPERTY( quint8 , debug_sec_left , 0) + PROPERTY( quint8 , min_left , 0) + PROPERTY( quint8 , sec_left , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, UIBloodPressureData)