Changeset 9783 in ntrip for trunk/BNC/src/pppRun.cpp


Ignore:
Timestamp:
Jun 27, 2022, 5:09:40 PM (7 weeks ago)
Author:
stuerze
Message:

some changes regarding PPP

File:
1 edited

Legend:

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

    r9709 r9783  
    185185        +  country;
    186186  }
    187   bool v2filenames = settings.value("PPP/v2filenames").toBool();
    188187  QString logFileSkl = settings.value("PPP/logPath").toString();
    189188  int l = logFileSkl.length();
     
    195194      logFileSkl += QDir::separator();
    196195    }
    197     if (!v2filenames) {
    198       logFileSkl = logFileSkl + ID9 + "${V3PROD}" + distStr + ".ppp";
    199     }
    200     else {
    201       logFileSkl = logFileSkl + ID4 + "${GPSWD}" + distStr + ".ppp";
    202     }
     196
     197    logFileSkl = logFileSkl + ID9 + "${V3PROD}" + distStr + ".ppp";
     198
    203199    _logFile = new bncoutf(logFileSkl, intr, sampl);
    204200  }
     
    213209      nmeaFileSkl += QDir::separator();
    214210    }
    215     if (!v2filenames) {
    216       nmeaFileSkl = nmeaFileSkl + ID9 + "${V3PROD}" + distStr + ".nmea";
    217     }
    218     else {
    219       nmeaFileSkl = nmeaFileSkl + ID4 + "${GPSWD}" + distStr + ".nmea";
    220     }
     211    nmeaFileSkl = nmeaFileSkl + ID9 + "${V3PROD}" + distStr + ".nmea";
     212
    221213    _nmeaFile = new bncoutf(nmeaFileSkl, intr, sampl);
    222214  }
     
    230222      snxtroFileSkl += QDir::separator();
    231223    }
    232     if (!v2filenames) {
    233       snxtroFileSkl = snxtroFileSkl + ID9 + "${V3PROD}" + distStr + ".tra";
    234     }
    235     else {
    236       snxtroFileSkl = snxtroFileSkl + ID4 + "${GPSWD}" + distStr + ".tro";
    237     }
     224    snxtroFileSkl = snxtroFileSkl + ID9 + "${V3PROD}" + distStr + ".tra";
    238225    sampl = settings.value("PPP/snxtroSampl").toString().split("sec").first().toInt();
    239226    intr  = settings.value("PPP/snxtroIntr").toString();
     
    350337    // Process the front epoch
    351338    // -----------------------
    352 
    353339    if (_opt->_corrWaitTime == 0 ||
    354340        (_epoData.front()->_time - _lastClkCorrTime) < _opt->_corrWaitTime) {
    355341
    356       if (fabs(_epoData.front()->_time - _lastClkCorrTime) > 60.0) {
     342      if (_opt->_corrWaitTime != 0 && (fabs(_epoData.front()->_time - _lastClkCorrTime) > 60.0)) {
    357343        delete _epoData.front();
    358344        _epoData.pop_front();
     
    563549  if (!_opt->_corrFile.empty()) {
    564550    _corrFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
    565 
    566551    if (_opt->_ionoFile.empty()) {
    567552      connect(_corrFile, SIGNAL(newTec(t_vTec)), this, SLOT(slotNewTec(t_vTec)));
Note: See TracChangeset for help on using the changeset viewer.