Add DD functional to timer and alarm

Author: SergySanJj

SmartTimer/alertwidget.cpp

@@ -27,6 +27,7 @@ int calculateDuration(const QTime &t)
         return 0;
 }
 
+
 alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::alertwidget)
@@ -123,11 +124,13 @@ void alertwidget::statusChanged(bool stat)
 
 void alertwidget::onTickCheck()
 {
+    if (DDCheck(globalSettings))
+        player->play();
     std::cout << "!alert!" << std::endl;
     alertTick.stop();
     blinkTimer.start(300);
     blinking = true;
-    player->play();
+
     ui->stopButton->show();
     ui->stopButton->setEnabled(true);
 

SmartTimer/globalsettingsdialog.cpp

@@ -1,18 +1,13 @@
 #include "globalsettingsdialog.h"
 #include "ui_globalsettingsdialog.h"
 #include "rangewidget.h"
+#include "widgetsettings.h"
 
 #include <QFile>
 #include <QSlider>
 #include <QHBoxLayout>
 
 
-int elpasedTime(QTime time)
-{
-    return time.hour()*3600*1000+
-                time.minute()*60*1000+
-                time.second()*1000;
-}
 
 GlobalSettingsDialog::GlobalSettingsDialog(GlobalSettings old, QWidget *parent) :
     QDialog(parent),

SmartTimer/timerwidget.cpp

@@ -135,7 +135,8 @@ void TimerWidget::resetTimer()
 
 void TimerWidget::timerExecuted()
 {
-    player->play();
+    if (DDCheck(globalSettings))
+        player->play();
     blinkTimer->start(350);
 
     timer->stop();

SmartTimer/widgetsettings.cpp

@@ -1,9 +1,26 @@
 #include "widgetsettings.h"
 #include <QLineEdit>
+#include <QTime>
 
 void addSounds(QComboBox *soundsCombo)
 {
     soundsCombo->addItem("Standard signal", "qrc:/sounds/sound1.wav");
     soundsCombo->addItem("Bird", "qrc:/sounds/Bird.mp3");
     soundsCombo->addItem("Light", "qrc:/sounds/Light.mp3");
 }
+
+int elpasedTime(QTime time)
+{
+    return time.hour()*3600*1000+
+                time.minute()*60*1000+
+                time.second()*1000;
+}
+
+bool DDCheck(GlobalSettings globalSettings)
+{
+    int currTime = elpasedTime(QTime::currentTime());
+    if (currTime>=globalSettings.DDstart && currTime <= globalSettings.DDend )
+        return false;
+    else
+        return true;
+}

SmartTimer/widgetsettings.h

@@ -41,4 +41,7 @@ struct GlobalSettings
 
 };
 
+bool DDCheck(GlobalSettings globalSettings);
+int elpasedTime(QTime time);
+
 #endif // WIDGETSETTINGS_H