don't refresh if cache period hasn't passed

[evehomescreen] / src / widget.cpp

diff --git a/src/widget.cpp b/src/widget.cpp
index 7302d32..294a6ee 100644 (file)
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -10,6 +10,8 @@
 #include <QtDebug>
 #include <QNetworkConfigurationManager>
 #include <QSettings>
+#include <QTimer>
+#include <QDateTime>
 
 QTM_USE_NAMESPACE
 
@@ -19,7 +21,8 @@ Widget::Widget(QWidget *parent)
     m_training(NULL),
     m_net(new QNetworkConfigurationManager(this)),
     m_skills(new SkillTree(this)),
-    m_model(new EveModel)
+    m_model(new EveModel),
+    m_timer(new QTimer(this))
 {
     setAlignment(Qt::AlignCenter);
     setAttribute(Qt::WA_TranslucentBackground);
@@ -33,6 +36,8 @@ Widget::Widget(QWidget *parent)
     if (c != NULL) {
         loadTraining();
     }
+    m_timer->setSingleShot(true);
+    connect(m_timer,SIGNAL(timeout()),this,SLOT(loadTraining()));
 }
 
 Widget::~Widget()
@@ -64,13 +69,18 @@ void Widget::paintEvent(QPaintEvent *event)
         }
         QRect nameLoc(0,10,150,20);
         p.drawText(nameLoc,Qt::AlignCenter,character->name);
-        if (m_training) {
+        if (m_training && m_training->training) {
             QRect skillTitle(0,110,150,50);
             p.drawText(skillTitle,Qt::AlignCenter|Qt::TextWordWrap,
                        QString("%1 %2").arg(m_skills->skillName(m_training->typeId))
                                        .arg(m_training->level));
             QRect skillLoc(0,155,150,20);
             p.drawText(skillLoc,Qt::AlignCenter,m_training->endTime.toString(Qt::SystemLocaleShortDate));
+        } else {
+
+            QRect skillTitle(0,110,150,50);
+            p.drawText(skillTitle,Qt::AlignCenter|Qt::TextWordWrap,
+                       "No skill in training");
         }
 
     }
@@ -103,10 +113,13 @@ void Widget::loadTraining()
     if (character != NULL) {
 
         qDebug() << "Fetch skills";
-        m_training = new EveSkillTraining(this);
+        if (m_training == NULL) {
+            m_training = new EveSkillTraining(this);
+            connect(m_training,SIGNAL(finished()),this,SLOT(trainingLoaded()));
+        }
         m_training->setAccount(m_settings->model().data());
         m_training->setCharacter(character);
-        connect(m_training,SIGNAL(finished()),this,SLOT(update()));
+
         m_training->fetchInfo();
     }
 }
@@ -126,3 +139,20 @@ void Widget::onlineStateChanged(bool online)
     }
 }
 
+void Widget::trainingLoaded()
+{
+    qDebug() << "Training loaded";
+    if (m_training != NULL && m_training->training) {
+        QDateTime limit = (m_training->cachedUntil > m_training->endTime) ?
+                          m_training->cachedUntil : m_training->endTime;
+        qDebug() << "Next refresh:" << limit.toString(Qt::SystemLocaleShortDate);
+        int interval = 1000 * (m_training->currentTime.secsTo(limit) + 15);
+        //qDebug() << "Timer interval" << interval;
+        if (m_timer->isActive()) {
+            m_timer->stop();
+        }
+        m_timer->setInterval( interval );
+        m_timer->start();
+    }
+    update();
+}