Changeset 5988 in ntrip


Ignore:
Timestamp:
Aug 18, 2014, 8:10:10 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
2 edited

Legend:

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

    r5987 r5988  
    116116  _stopFlag = false;
    117117
     118  QString roverName(_opt->_roverName.c_str());
     119
    118120  QString logFileSkl = settings.value("PPP/logFile").toString();
    119   QString roverName(_opt->_roverName.c_str());
    120   if (logFileSkl.indexOf("${STATION}") == -1) {
    121     logFileSkl = roverName + "_" + logFileSkl;
     121  if (logFileSkl.isEmpty()) {
     122    _logFile = 0;
    122123  }
    123124  else {
    124     logFileSkl.replace("${STATION}", roverName);
    125   }
    126   _logFile = new bncoutf(logFileSkl, "1 day", 0);
     125    if (logFileSkl.indexOf("${STATION}") == -1) {
     126      logFileSkl = roverName + "_" + logFileSkl;
     127    }
     128    else {
     129      logFileSkl.replace("${STATION}", roverName);
     130    }
     131    _logFile = new bncoutf(logFileSkl, "1 day", 0);
     132  }
     133
     134  QString nmeaFileSkl = settings.value("PPP/nmeaFile").toString();
     135  if (nmeaFileSkl.isEmpty()) {
     136    _nmeaFile = 0;
     137  }
     138  else {
     139    if (nmeaFileSkl.indexOf("${STATION}") == -1) {
     140      nmeaFileSkl = roverName + "_" + nmeaFileSkl;
     141    }
     142    else {
     143      nmeaFileSkl.replace("${STATION}", roverName);
     144    }
     145    _nmeaFile = new bncoutf(nmeaFileSkl, "1 day", 0);
     146  }
    127147}
    128148
     
    131151t_pppRun::~t_pppRun() {
    132152  delete _logFile;
     153  delete _nmeaFile;
    133154}
    134155
     
    270291    }
    271292
    272     if (output._epoTime.valid()) {
     293    if (_logFile && output._epoTime.valid()) {
    273294      _logFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(),
    274295                      QString(output._log.c_str()));
  • trunk/BNC/src/PPP/pppRun.h

    r5984 r5988  
    6868  bool          _stopFlag;
    6969  bncoutf*      _logFile;
     70  bncoutf*      _nmeaFile;
    7071};
    7172
Note: See TracChangeset for help on using the changeset viewer.