Merge pull request #6 from secondYearProjects/dev

Add timeToAlarm to alarm add and change dialogs
secondYearProjects · Nov 7, 2018 · dd3434d · dd3434d
2 parents e2eb54c + 8bba275
commit dd3434d
Show file tree

Hide file tree

Showing 10 changed files with 228 additions and 87 deletions.
diff --git a/SmartTimer/addalarmdialog.cpp b/SmartTimer/addalarmdialog.cpp
@@ -5,10 +5,8 @@
 #include <QFile>
 
 
-static int getMsecs(const QTime& t)
-{
-    return (t.hour()*3600+t.minute()*60+t.second())*1000;
-}
+
+
 
 addAlarmDialog::addAlarmDialog(QWidget *parent) :
     QDialog(parent),
@@ -27,6 +25,8 @@ addAlarmDialog::addAlarmDialog(QWidget *parent) :
 
     connect(ui->createButton,SIGNAL(clicked()),this,SLOT(sendData()));
     connect(ui->cancelButton,SIGNAL(clicked()),this,SLOT(close()));
+    connect(ui->alarmTime,SIGNAL(timeChanged(QTime)),this,SLOT(updateTimeTo(QTime)));
+    updateTimeTo(ui->alarmTime->time());
 }
 
 addAlarmDialog::~addAlarmDialog()
@@ -45,3 +45,8 @@ void addAlarmDialog::sendData()
     emit sendAlarmData(WidgetSettings(getMsecs(ui->alarmTime->time()),ui->alarmName->text(),true,ui->SoundBox->itemData(ui->SoundBox->currentIndex()).toString()));
     this->close();
 }
+
+void addAlarmDialog::updateTimeTo(QTime time)
+{
+    ui->toAlarmLabel->setText(QTime::fromMSecsSinceStartOfDay(calculateDuration(time)).toString(globalSettings.alarmTimeFormat));
+}
diff --git a/SmartTimer/addalarmdialog.h b/SmartTimer/addalarmdialog.h
@@ -20,6 +20,7 @@ class addAlarmDialog : public QDialog
     void updateWidget(GlobalSettings _globalSettings);
 public slots:
     void sendData();
+    void updateTimeTo(QTime time);
 signals:
     void sendAlarmData(WidgetSettings);
 private:

diff --git a/SmartTimer/addalarmdialog.ui b/SmartTimer/addalarmdialog.ui
@@ -213,6 +213,66 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>To alarm:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="toAlarmLabel">
+          <property name="text">
+           <string>TextLabel</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>

diff --git a/SmartTimer/alertwidget.cpp b/SmartTimer/alertwidget.cpp
@@ -1,30 +1,9 @@
 #include "alertwidget.h"
 #include "ui_alertwidget.h"
 #include "changealarmdialog.h"
-
+#include "widgetsettings.h"
 #include <iostream>
 
-int getMsecs(const QTime& t)
-{
-    return (t.hour()*3600+t.minute()*60+t.second())*1000+t.msec();
-}
-
-int calculateDuration(const QTime &t)
-{
-    int alertMsecs = getMsecs(t);
-    int currMsecs = getMsecs(QTime::currentTime());
-
-    if (currMsecs > alertMsecs)
-    {
-        int wholeDay = 3600*24*1000;
-        return (wholeDay+alertMsecs-currMsecs);
-    }
-    if (currMsecs < alertMsecs)
-    {
-        return (alertMsecs-currMsecs);
-    }
-    return 0;
-}
 
 
 alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
@@ -70,8 +49,8 @@ alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
 
     if (Settings.enabled)
     {
-        std::cout << calculateDuration(alertTime) << " "
-                  << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
+        //std::cout << calculateDuration(alertTime) << " "
+        //          << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
         alertTick.start(calculateDuration(alertTime));
     }
 
@@ -102,8 +81,8 @@ void alertwidget::statusChanged(bool stat)
     if (stat)
     {
 
-        std::cout << calculateDuration(alertTime) << " "
-                  << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
+        //std::cout << calculateDuration(alertTime) << " "
+        //          << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
         alertTick.start(calculateDuration(alertTime));
     }
     else
@@ -170,8 +149,8 @@ void alertwidget::stopBlinking()
     ui->stopButton->hide();
     if (Settings.enabled)
     {
-        std::cout << calculateDuration(alertTime) << " "
-                  << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
+        //std::cout << calculateDuration(alertTime) << " "
+        //          << QTime::currentTime().hour() <<":" << QTime::currentTime().minute() << std::endl;
         alertTick.start(calculateDuration(alertTime));
     }
 }

diff --git a/SmartTimer/changealarmdialog.cpp b/SmartTimer/changealarmdialog.cpp
@@ -26,6 +26,8 @@ ChangeAlarmDialog::ChangeAlarmDialog(alertwidget *parent) :
 
     connect(ui->changeButton,SIGNAL(clicked()), this, SLOT(changeAlarm()));
     connect(ui->cancelButton,SIGNAL(clicked()), this, SLOT(close()));
+    connect(ui->time,SIGNAL(timeChanged(QTime)),this,SLOT(updateTimeTo(QTime)));
+    updateTimeTo(ui->time->time());
 }
 
 ChangeAlarmDialog::~ChangeAlarmDialog()
@@ -48,3 +50,10 @@ void ChangeAlarmDialog::changeAlarm()
 
     this->close();
 }
+
+
+
+void ChangeAlarmDialog::updateTimeTo(QTime time)
+{
+    ui->toAlarmLabel->setText(QTime::fromMSecsSinceStartOfDay(calculateDuration(time)).toString(globalSettings.alarmTimeFormat));
+}
diff --git a/SmartTimer/changealarmdialog.h b/SmartTimer/changealarmdialog.h
@@ -21,6 +21,7 @@ class ChangeAlarmDialog : public QDialog
     void updateWidget(GlobalSettings _globalSettings);
 public slots:
     void changeAlarm();
+    void updateTimeTo(QTime time);
 signals:
     void changeAlarmSignal(WidgetSettings settings);