Changeset 8119 in ntrip for trunk/BNC

Timestamp:

Apr 28, 2017, 6:20:37 PM (8 years ago)

Author:

stuerze

Message:

minor changes to switch of the re-read functionlality as it is requitred in command line mode

Location:

trunk/BNC/src

Files:

• bnccaster.cpp (modified) (3 diffs)
• bncmain.cpp (modified) (1 diff)
• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (2 diffs)

trunk/BNC/src/bnccaster.cpp

@@ -207 +207 @@
              !settings.value("outPort").toString().isEmpty() ) {
           emit( newMessage(QString("%1: Old epoch %2 thrown away")
-                           .arg(staID.data()).arg(string(obs._time).c_str())
-                           .toAscii(), true) );
+                 .arg(staID.data()).arg(string(obs._time).c_str())
+               .toAscii(), true) );
         }
       }
@@ -454 +454 @@
   // (Re-) Start the configuration timer
   // -----------------------------------
+  if      (settings.value("onTheFlyInterval").toString() == "no") {
+    return;
+  }
+
   int ms = 0;
-
   if (_confInterval != -1) {
     ms = 1000 * _confInterval;
@@ -462 +465 @@
     QTime currTime = currentDateAndTimeGPS().time();
     QTime nextShotTime;
-
     if      (settings.value("onTheFlyInterval").toString() == "1 min") {
-      _confInterval = 60;
-      nextShotTime = QTime(currTime.hour(), currTime.minute()+1, 0);
+          _confInterval = 60;
+          nextShotTime = QTime(currTime.hour(), currTime.minute()+1, 0);
     }
     else if (settings.value("onTheFlyInterval").toString() == "5 min") {

trunk/BNC/src/bncmain.cpp

@@ -95 +95 @@
       "   logFile          {Logfile, full path [character string]}\n"
       "   rnxAppend        {Append files [integer number: 0=no,2=yes]}\n"
-      "   onTheFlyInterval {Configuration reload interval [character string: 1 day|1 hour|5 min|1 min]}\n"
+      "   onTheFlyInterval {Configuration reload interval [character string: no|1 day|1 hour|5 min|1 min]}\n"
       "   autoStart        {Auto start [integer number: 0=no,2=yes]}\n"
       "   rawOutFile       {Raw output file, full path [character string]}\n"

trunk/BNC/src/bncsettings.cpp

@@ -80 +80 @@
     setValue_p("logFile",             "");
     setValue_p("rnxAppend",           "0");
-    setValue_p("onTheFlyInterval",    "1 day");
+    setValue_p("onTheFlyInterval",    "no");
     setValue_p("autoStart",           "0");
     setValue_p("rawOutFile",          "");

trunk/BNC/src/bncwindow.cpp

@@ -187 +187 @@
   _onTheFlyComboBox = new QComboBox();
   _onTheFlyComboBox->setEditable(false);
-  _onTheFlyComboBox->addItems(QString("1 day,1 hour,5 min,1 min").split(","));
+  _onTheFlyComboBox->addItems(QString("no,1 day,1 hour,5 min,1 min").split(","));
   int ii = _onTheFlyComboBox->findText(settings.value("onTheFlyInterval").toString());
   if (ii != -1) {
@@ -1255 +1255 @@
   _logFileLineEdit->setWhatsThis(tr("<p>Records of BNC's activities are shown in the 'Log' tab on the bottom of this window. They can be saved into a file when a valid path for that is specified in the 'Logfile (full path)' field.</p><p>The logfile name will automatically be extended by a string '_YYMMDD' carrying the current date. <i>[key: logFile]</i></p>"));
   _rnxAppendCheckBox->setWhatsThis(tr("<p>When BNC is started, new files are created by default and file content already available under the same name will be overwritten. However, users might want to append already existing files following a regular restart or a crash of BNC or its platform.</p><p>Tick 'Append files' to continue with existing files and keep what has been recorded so far. <i>[key: rnxAppend]</i></p>"));
-  _onTheFlyComboBox->setWhatsThis(tr("<p>When operating BNC online in 'no window' mode, some configuration parameters can be changed on-the-fly without interrupting the running process. For that BNC rereads parts of its configuration in pre-defined intervals.<p></p>Select '1 min', '5 min', '1 hour', or '1 day' to force BNC to reread its configuration every full minute, five minutes, hour, or day and let in between edited configuration options become effective on-the-fly without terminating uninvolved threads.</p><p>Note that when operating BNC in window mode, on-the-fly changeable configuration options become effective immediately via button 'Save & Reread Configuration'. <i>[key: onTheFlyInterval]</i></p>"));
+  _onTheFlyComboBox->setWhatsThis(tr("<p>When operating BNC online in 'no window' mode, some configuration parameters can be changed on-the-fly without interrupting the running process. For that BNC rereads parts of its configuration in pre-defined intervals. The default entry is 'no' that means the reread function is switched of. <p></p>Select '1 min', '5 min', '1 hour', or '1 day' to force BNC to reread its configuration every full minute, five minutes, hour, or day and let in between edited configuration options become effective on-the-fly without terminating uninvolved threads.</p><p>Note that when operating BNC in window mode, on-the-fly changeable configuration options become effective immediately via button 'Save & Reread Configuration'. <i>[key: onTheFlyInterval]</i></p>"));
   _autoStartCheckBox->setWhatsThis(tr("<p>Tick 'Auto start' for auto-start of BNC at startup time in window mode with preassigned processing options. <i>[key: autoStart]</i></p>"));
   _rawOutFileLineEdit->setWhatsThis(tr("<p>Save all data coming in through various streams in the received order and format in one file.</p><p>This option is primarily meant for debugging purposes. <i>[key: rawOutFile]</i></p>"));