Merge pull request #2 from MeshAndrey/AlarmWidget-Time-Count

Alarm widget time count

Author: MeshAndrey

SimpleTimerApp.pro

@@ -9,6 +9,7 @@ CONFIG += c++11
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
+    src/TimeUtils.cpp \
     src/main.cpp \
     src/MainWindow.cpp \
     src/widgets/AlarmWidget.cpp \
@@ -17,6 +18,7 @@ SOURCES += \
 
 HEADERS += \
     src/MainWindow.h \
+    src/TimeUtils.h \
     src/widgets/AlarmWidget.h \
     src/widgets/InputWidget.h \
     src/widgets/TimerWidget.h

src/TimeUtils.cpp

@@ -0,0 +1,53 @@
+#include "TimeUtils.h"
+
+
+int TimeUtils::round(const int value)
+{
+    if (value == 0)
+        return value; // zero
+    if ((value >= 1000) && (value % 1000 == 0))
+        return value; // already round
+
+    if (((value % 1000) > 500) && ((value % 1000) <= 999))
+    {
+        return (value - (value % 1000) + 1000);
+    }
+    else if (((value % 1000) >= 1) && ((value % 1000) <= 500))
+    {
+        return (value - (value % 1000));
+    }
+
+    return value;
+}
+
+QString TimeUtils::convertToReadable(const int value)
+{
+    if (value < 0)
+        return "Error value";
+
+    const int h = value / (1000 * 60 * 60);                                 // hours
+    const int m = (value - (h  * 1000 * 60 * 60)) / (1000 * 60);            // minutes
+    const int s = (value - (h  * 1000 * 60 * 60) - (m * 1000 * 60)) / 1000; // seconds
+
+    if (h > 0)
+        return QString("%1:%2:%3").arg(makeTimeString(QString::number(h)),
+                                       makeTimeString(QString::number(m)),
+                                       makeTimeString(QString::number(s)));
+
+    if (m > 0)
+        return QString("%1:%2").arg(makeTimeString(QString::number(m)),
+                                    makeTimeString(QString::number(s)));
+
+    if (s > 0)
+        return makeTimeString(QString::number(s));
+
+    return "00";
+}
+
+QString TimeUtils::makeTimeString(QString time) // don't know how to name this shit
+{
+    if (time.isEmpty())
+        return time;
+
+    return time.length() == 2 ? time : time.prepend("0");
+}

src/TimeUtils.h

@@ -0,0 +1,17 @@
+#ifndef TIMEUTILS_H
+#define TIMEUTILS_H
+
+#include <QString>
+
+class TimeUtils
+{
+private:
+    TimeUtils() {};
+
+public:
+    static int round(const int value);
+    static QString convertToReadable(const int value);
+    static QString makeTimeString(QString time);
+};
+
+#endif // TIMEUTILS_H

src/widgets/AlarmWidget.cpp

@@ -2,6 +2,7 @@
 #include "InputWidget.h"
 #include "TimerWidget.h"
 #include "../MainWindow.h"
+#include "../TimeUtils.h"
 
 AlarmWidget::AlarmWidget(QString name, int timerValue, QWidget *parent) : QWidget(parent)
 {
@@ -12,6 +13,11 @@ AlarmWidget::AlarmWidget(QString name, int timerValue, QWidget *parent) : QWidge
     initLayout();
     initConnections();
 
+    updateTimer.setInterval(1 * 1000);
+    elapsedTimer.start();
+
+    updateTimer.start();
+
     alarmSound = new QSound(":/sounds/mixkit-urgent-simple-tone-loop-2976.wav");
     alarmSound->setLoops(QSound::Infinite);
     alarmSound->play();
@@ -21,6 +27,7 @@ void AlarmWidget::initWidgets()
 {
     repeatButton = new QPushButton("Repeat");
     stopButton   = new QPushButton("Stop");
+    timeLabel    = new QLabel;
 }
 
 void AlarmWidget::initLayout()
@@ -33,6 +40,7 @@ void AlarmWidget::initLayout()
 
     centralLayout->addWidget(new QLabel(name),              0, Qt::AlignCenter);
     centralLayout->addWidget(new QLabel("Time is expired"), 0, Qt::AlignCenter);
+    centralLayout->addWidget(timeLabel,                     0, Qt::AlignCenter);
     centralLayout->addLayout(buttonLayout);
 
     QPalette pal = QPalette();
@@ -49,6 +57,8 @@ void AlarmWidget::initConnections()
             this,         &AlarmWidget::stopButtonClicked);
     connect(repeatButton, &QPushButton::clicked,
             this,         &AlarmWidget::repeatButtonClicked);
+    connect(&updateTimer, &QTimer::timeout,
+            this,         &AlarmWidget::updateTimerTimeout);
 }
 
 void AlarmWidget::stopButtonClicked()
@@ -69,3 +79,9 @@ void AlarmWidget::repeatButtonClicked()
                                               this->timerValue,
                                               static_cast<QWidget*>(this->parent())));
 }
+
+void AlarmWidget::updateTimerTimeout()
+{
+    timeLabel->setText(TimeUtils::convertToReadable(
+                       TimeUtils::round(elapsedTimer.elapsed())).prepend("-- "));
+}

src/widgets/AlarmWidget.h

@@ -11,22 +11,27 @@ class AlarmWidget : public QWidget
     Q_OBJECT
 private:
     int timerValue = 0;
+
     QString name;
-    QPushButton *stopButton = nullptr,
+    QPushButton *stopButton   = nullptr,
                 *repeatButton = nullptr;
+    QLabel *timeLabel = nullptr;
     QSound *alarmSound = nullptr;
 
+    QElapsedTimer elapsedTimer;
+    QTimer updateTimer;
+
     void initWidgets();
     void initLayout();
     void initConnections();
+
 public:
     explicit AlarmWidget(QString name, int timerValue, QWidget *parent = nullptr);
 
 private slots:
     void stopButtonClicked();
     void repeatButtonClicked();
-signals:
-
+    void updateTimerTimeout();
 };
 
 #endif // ALARMWIDGET_H

src/widgets/TimerWidget.cpp

@@ -2,6 +2,7 @@
 #include "AlarmWidget.h"
 #include "InputWidget.h"
 #include "../MainWindow.h"
+#include "../TimeUtils.h"
 
 TimerWidget::TimerWidget(QString name, int timerValue, QWidget *parent) : QWidget(parent)
 {
@@ -20,7 +21,8 @@ TimerWidget::TimerWidget(QString name, int timerValue, QWidget *parent) : QWidge
     timer->start();
     updateTimer->start();
 
-    remainingTimeLabel->setText(convertToReadable(round(timerValue)));
+    remainingTimeLabel->setText(TimeUtils::convertToReadable(
+                                TimeUtils::round(timerValue)));
 }
 
 void TimerWidget::initWidgets()
@@ -115,58 +117,8 @@ void TimerWidget::timerTimeout()
 void TimerWidget::updateTimerTimeout()
 {
     if (timer->isActive())
-        remainingTimeLabel->setText(convertToReadable(round(timer->remainingTime())));
-}
-
-int TimerWidget::round(const int value)
-{
-    if (value == 0)
-        return value; // zero
-    if ((value >= 1000) && (value % 1000 == 0))
-        return value; // already round
-
-    if (((value % 1000) > 500) && ((value % 1000) <= 999))
-    {
-        return (value - (value % 1000) + 1000);
-    }
-    else if (((value % 1000) >= 1) && ((value % 1000) <= 500))
-    {
-        return (value - (value % 1000));
-    }
-
-    return value;
-}
-
-QString TimerWidget::convertToReadable(const int value)
-{
-    if (value < 0)
-        return "Error value";
-
-    const int h = value / (1000 * 60 * 60);                                 // hours
-    const int m = (value - (h  * 1000 * 60 * 60)) / (1000 * 60);            // minutes
-    const int s = (value - (h  * 1000 * 60 * 60) - (m * 1000 * 60)) / 1000; // seconds
-
-    if (h > 0)
-        return QString("%1:%2:%3").arg(makeTimeString(QString::number(h)),
-                                       makeTimeString(QString::number(m)),
-                                       makeTimeString(QString::number(s)));
-
-    if (m > 0)
-        return QString("%1:%2").arg(makeTimeString(QString::number(m)),
-                                    makeTimeString(QString::number(s)));
-
-    if (s > 0)
-        return makeTimeString(QString::number(s));
-
-    return "00";
-}
-
-QString TimerWidget::makeTimeString(QString time) // don't know how to name this shit
-{
-    if (time.isEmpty())
-        return time;
-
-    return time.length() == 2 ? time : time.prepend("0");
+        remainingTimeLabel->setText(TimeUtils::convertToReadable(
+                                    TimeUtils::round(timer->remainingTime())));
 }
 
 void TimerWidget::showMessageBox(const QString message)

src/widgets/TimerWidget.h

@@ -23,10 +23,6 @@ class TimerWidget : public QWidget
     void initConnections();
     void showMessageBox(const QString message);
 
-    int round(const int value);
-    QString convertToReadable(const int value);
-    QString makeTimeString(QString time);
-
 private slots:
     void pauseResumeButtonCLicked();
     void stopButtonClicked();
@@ -35,9 +31,6 @@ private slots:
 
 public:
     explicit TimerWidget(QString name, int timerValue, QWidget *parent = nullptr);
-
-signals:
-
 };
 
 #endif // TIMERWIDGET_H