From 640cc1ddec6fa6e53c8dca212b06b61604e5a6da Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Wed, 8 Apr 2020 19:30:39 +0200 Subject: [PATCH] some more bugfixes --- timemanager/Stopwatch.cpp | 8 ++++---- timemanager/Stopwatch.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/timemanager/Stopwatch.cpp b/timemanager/Stopwatch.cpp index 40b711d9..6c50f0de 100644 --- a/timemanager/Stopwatch.cpp +++ b/timemanager/Stopwatch.cpp @@ -9,7 +9,7 @@ #include Stopwatch::Stopwatch(bool displayOnDestruction, - StopwatchDisplayMode displayMode): + StopwatchDisplayMode displayMode): displayMode(displayMode), displayOnDestruction(displayOnDestruction) { // Measures start time on initialization. Clock::getUptime(&startTime); @@ -32,12 +32,12 @@ seconds_t Stopwatch::stopSeconds() { void Stopwatch::display() { if(displayMode == StopwatchDisplayMode::MILLIS) { info << "Stopwatch: Operation took " << elapsedTime.tv_sec * 1000 + - elapsedTime.tv_usec * 1000 << " milliseconds"; + elapsedTime.tv_usec * 1000 << " milliseconds" << std::endl; } else if(displayMode == StopwatchDisplayMode::SECONDS) { - info <<"Stopwatch: Operation took " << std::setprecision(4) + info <<"Stopwatch: Operation took " << std::setprecision(3) << std::fixed << timevalOperations::toDouble(elapsedTime) - << " seconds"; + << " seconds" << std::endl; } } diff --git a/timemanager/Stopwatch.h b/timemanager/Stopwatch.h index aeb61265..786a9d57 100644 --- a/timemanager/Stopwatch.h +++ b/timemanager/Stopwatch.h @@ -60,9 +60,8 @@ private: timeval startTime {0, 0}; timeval elapsedTime {0, 0}; - bool displayOnDestruction = true; StopwatchDisplayMode displayMode = StopwatchDisplayMode::MILLIS; - + bool displayOnDestruction = true; void stopInternal(); };