[StopWatch] Fix rounding issue

Change-Id: I984674bc96f94d7beb05a217984b8b4a32d4bc8d

diff --git a/clock/src/Presenter/StopWatchPresenter.cpp b/clock/src/Presenter/StopWatchPresenter.cpp
index 486ac6c..a0062a4 100644 (file)
--- a/clock/src/Presenter/StopWatchPresenter.cpp
+++ b/clock/src/Presenter/StopWatchPresenter.cpp
@@ -144,12 +144,14 @@ void StopWatchPresenter::TimeUpdateRequest()
 
 StopWatchPresenter::Time StopWatchPresenter::GetTimeStructure(milliseconds time)
 {
+       time = milliseconds((unsigned)std::round((double)time.count() / 10) * 10);
+
        Time ts;
 
        ts.Hour = duration_cast<hours>(time).count() % 100;
        ts.Min = duration_cast<minutes>(time).count() % 60;
        ts.Sec = duration_cast<seconds>(time).count() % 60;
-       ts.Msec = duration_cast<milliseconds>(time).count() % 1000;
+       ts.Msec = duration_cast<milliseconds>(time).count() % 1000 / 10;
 
        return ts;
 }
@@ -159,8 +161,6 @@ std::string StopWatchPresenter::GetTimeString(std::chrono::milliseconds time)
        auto ts = GetTimeStructure(time);
        std::stringstream stringStream;
 
-       ts.Msec = (unsigned)std::round((double)ts.Msec / 10);
-
        if (ts.Hour > 0)
                stringStream << (unsigned)(ts.Hour / 10) << ts.Hour % 10 << ":";
 

diff --git a/clock/src/View/CounterView.cpp b/clock/src/View/CounterView.cpp
index 8eced7c..062f849 100644 (file)
--- a/clock/src/View/CounterView.cpp
+++ b/clock/src/View/CounterView.cpp
@@ -105,8 +105,6 @@ const char *CounterView::GetEdjeFilePath()
 
 void CounterView::DisplayTime(int hour, int min, int sec, int msec)
 {
-       msec /= 10;
-
        std::stringstream text;
        std::stringstream subtext;