/[projects]/infoscreen/mainview.cpp
ViewVC logotype

Diff of /infoscreen/mainview.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 874 by torben, Tue Jun 22 20:30:17 2010 UTC revision 882 by torben, Thu Jun 24 07:57:56 2010 UTC
# Line 16  Line 16 
16  #include "videoview.h"  #include "videoview.h"
17    
18  #include "httpwrapper.h"  #include "httpwrapper.h"
19    #include "screenmanager.h"
20    
21    
22    
# Line 28  MainView::MainView(QWidget* parent) Line 29  MainView::MainView(QWidget* parent)
29          xmlUrl = url + "?screen_id=" + screenid;          xmlUrl = url + "?screen_id=" + screenid;
30          qDebug() << "Starting XML mode";          qDebug() << "Starting XML mode";
31          qDebug() << "xmlUrl" << xmlUrl;          qDebug() << "xmlUrl" << xmlUrl;
32            qDebug() << "xmlInterval" << xmlInterval/(60*1000);
33      }      }
34    
35      if (currentMode == ModeSimpleWeb){      if (currentMode == ModeSimpleWeb){
# Line 71  MainView::MainView(QWidget* parent) Line 73  MainView::MainView(QWidget* parent)
73          web->start(url,screenid);          web->start(url,screenid);
74      }      }
75    
76        if (enableScreenManager) {
77            screenManager = new ScreenManager(screenManagerOn, screenManagerOff);
78        } else {
79            qDebug() << "ScreenManager is disabled";
80        }
81    
82    
83      qDebug() << "Starting timer...";      qDebug() << "Starting timer...";
84      timer = new QTimer(this);      timer = new QTimer(this);
# Line 97  void MainView::loadSettings() Line 105  void MainView::loadSettings()
105          exit(1);          exit(1);
106      }      }
107    
108        enableScreenManager = settings->value("enablescreenmanager").toBool();
109        if (enableScreenManager) {
110            screenManagerOn = settings->value("screenmanager_on").toTime();
111            screenManagerOff = settings->value("screenmanager_off").toTime();
112        }
113    
114        xmlInterval = settings->value("xmlinterval", 30).toInt();
115        xmlInterval = (xmlInterval * 60 * 1000); //convert to milliseconds
116    
117    
118      if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {      if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {
119          url = settings->value("url").toString();          url = settings->value("url").toString();
# Line 134  void MainView::keyPressEvent ( QKeyEvent Line 151  void MainView::keyPressEvent ( QKeyEvent
151    
152  void MainView::onTimer()  void MainView::onTimer()
153  {  {
154      screenManager.timerTick();      if (enableScreenManager == true) {
155            screenManager->timerTick();
156        }
157    
158      if (currentMode == ModeXml) {      if (currentMode == ModeXml) {
159          readXml();          readXml();
# Line 196  void MainView::readLocalFiles() Line 215  void MainView::readLocalFiles()
215    
216  bool MainView::readXml()  bool MainView::readXml()
217  {  {
218      const int TIMEOUT = 30*60*1000; // 30 minutter      if ( lastXml.isNull() || lastXml.elapsed() > xmlInterval) {
219      if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {          qDebug() << "Reading XML";
220    
221    
222          bool res = xmlHandler.readXml( xmlUrl );          bool res = xmlHandler.readXml( xmlUrl );
# Line 270  void MainView::switchScreens() Line 289  void MainView::switchScreens()
289              }              }
290    
291          } else {          } else {
             qDebug() << "no screen";  
292              errorInfoScreen("Der er ingen information at vise");              errorInfoScreen("Der er ingen information at vise");
293          }          }
294          lastScreenSwitch = QTime::currentTime();          lastScreenSwitch = QTime::currentTime();
Legend:
Removed from v.874  
changed lines
  Added in v.882
  ViewVC Help
Powered by ViewVC 1.1.20