Changeset 8119 in ntrip


Ignore:
Timestamp:
Apr 28, 2017, 6:20:37 PM (4 months 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccaster.cpp

    r7854 r8119  
    207207             !settings.value("outPort").toString().isEmpty() ) {
    208208          emit( newMessage(QString("%1: Old epoch %2 thrown away")
    209                            .arg(staID.data()).arg(string(obs._time).c_str())
    210                            .toAscii(), true) );
     209                 .arg(staID.data()).arg(string(obs._time).c_str())
     210               .toAscii(), true) );
    211211        }
    212212      }
     
    454454  // (Re-) Start the configuration timer
    455455  // -----------------------------------
     456  if      (settings.value("onTheFlyInterval").toString() == "no") {
     457    return;
     458  }
     459
    456460  int ms = 0;
    457 
    458461  if (_confInterval != -1) {
    459462    ms = 1000 * _confInterval;
     
    462465    QTime currTime = currentDateAndTimeGPS().time();
    463466    QTime nextShotTime;
    464 
    465467    if      (settings.value("onTheFlyInterval").toString() == "1 min") {
    466       _confInterval = 60;
    467       nextShotTime = QTime(currTime.hour(), currTime.minute()+1, 0);
     468          _confInterval = 60;
     469          nextShotTime = QTime(currTime.hour(), currTime.minute()+1, 0);
    468470    }
    469471    else if (settings.value("onTheFlyInterval").toString() == "5 min") {
  • trunk/BNC/src/bncmain.cpp

    r8084 r8119  
    9595      "   logFile          {Logfile, full path [character string]}\n"
    9696      "   rnxAppend        {Append files [integer number: 0=no,2=yes]}\n"
    97       "   onTheFlyInterval {Configuration reload interval [character string: 1 day|1 hour|5 min|1 min]}\n"
     97      "   onTheFlyInterval {Configuration reload interval [character string: no|1 day|1 hour|5 min|1 min]}\n"
    9898      "   autoStart        {Auto start [integer number: 0=no,2=yes]}\n"
    9999      "   rawOutFile       {Raw output file, full path [character string]}\n"
  • trunk/BNC/src/bncsettings.cpp

    r8090 r8119  
    8080    setValue_p("logFile",             "");
    8181    setValue_p("rnxAppend",           "0");
    82     setValue_p("onTheFlyInterval",    "1 day");
     82    setValue_p("onTheFlyInterval",    "no");
    8383    setValue_p("autoStart",           "0");
    8484    setValue_p("rawOutFile",          "");
  • trunk/BNC/src/bncwindow.cpp

    r8099 r8119  
    187187  _onTheFlyComboBox = new QComboBox();
    188188  _onTheFlyComboBox->setEditable(false);
    189   _onTheFlyComboBox->addItems(QString("1 day,1 hour,5 min,1 min").split(","));
     189  _onTheFlyComboBox->addItems(QString("no,1 day,1 hour,5 min,1 min").split(","));
    190190  int ii = _onTheFlyComboBox->findText(settings.value("onTheFlyInterval").toString());
    191191  if (ii != -1) {
     
    12551255  _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>"));
    12561256  _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>"));
    1257   _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>"));
     1257  _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>"));
    12581258  _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>"));
    12591259  _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>"));
Note: See TracChangeset for help on using the changeset viewer.