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

Diff of /infoscreen/mainview.cpp

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

revision 875 by torben, Tue Jun 22 20:43:13 2010 UTC revision 882 by torben, Thu Jun 24 07:57:56 2010 UTC
# Line 29  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 73  MainView::MainView(QWidget* parent) Line 74  MainView::MainView(QWidget* parent)
74      }      }
75    
76      if (enableScreenManager) {      if (enableScreenManager) {
77          screenManager = new ScreenManager();          screenManager = new ScreenManager(screenManagerOn, screenManagerOff);
78      } else {      } else {
79          qDebug() << "ScreenManager is disabled";          qDebug() << "ScreenManager is disabled";
80      }      }
# Line 104  void MainView::loadSettings() Line 105  void MainView::loadSettings()
105          exit(1);          exit(1);
106      }      }
107    
108      enableScreenManager = settings->value("enableScreenManager").toBool();      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) {
# Line 207  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 );
Legend:
Removed from v.875  
changed lines
  Added in v.882
  ViewVC Help
Powered by ViewVC 1.1.20