Changeset 6608 in ntrip


Ignore:
Timestamp:
Feb 20, 2015, 3:57:46 PM (7 years ago)
Author:
stuerze
Message:

preparation for sinex tro

Location:
trunk/BNC/src
Files:
5 edited

Legend:

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

    r6046 r6608  
    125125  _nmeaFile = settings.value("PPP/nmeaFile").toString();
    126126  _nmeaPort = settings.value("PPP/nmeaPort").toInt();
     127  _snxtroFile = settings.value("PPP/snxtroFile").toString();
    127128
    128129  _realTime = false;
  • trunk/BNC/src/pppMain.h

    r6046 r6608  
    2222  QString  _logFile;
    2323  QString  _nmeaFile;
     24  QString  _snxtroFile;
    2425  int      _nmeaPort;
    2526  bool     _running;
  • trunk/BNC/src/pppRun.cpp

    r6568 r6608  
    149149    _nmeaFile = new bncoutf(nmeaFileSkl, "1 day", 0);
    150150  }
    151 }
     151
     152  QString snxtroFileSkl = settings.value("PPP/snxtroFile").toString();
     153  if (snxtroFileSkl.isEmpty()) {
     154    _snxtroFile = 0;
     155  }
     156  else {
     157    if (snxtroFileSkl.indexOf("${STATION}") == -1) {
     158      snxtroFileSkl = snxtroFileSkl + "_" + roverName;
     159    }
     160    else {
     161      snxtroFileSkl.replace("${STATION}", roverName);
     162    }
     163    _snxtroFile = new bncoutf(snxtroFileSkl, "1 day", 0);
     164  }
     165}
     166
     167
    152168
    153169// Destructor
     
    156172  delete _logFile;
    157173  delete _nmeaFile;
     174  delete _snxtroFile;
    158175}
    159176
     
    274291      emit newNMEAstr(staID, rmcStr.toAscii());
    275292      emit newNMEAstr(staID, ggaStr.toAscii());
     293    }
     294
     295    if (_snxtroFile && output._epoTime.valid()) {
     296     // _snxtroFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(),QString("TEST"));
    276297    }
    277298
  • trunk/BNC/src/pppRun.h

    r6478 r6608  
    7272  bncoutf*               _logFile;
    7373  bncoutf*               _nmeaFile;
     74  bncoutf*               _snxtroFile;
    7475};
    7576
  • trunk/BNC/src/pppWidgets.cpp

    r6607 r6608  
    195195  _nmeaFile   ->setText(settings.value(_nmeaFile   ->objectName()).toString());
    196196  _nmeaPort   ->setText(settings.value(_nmeaPort   ->objectName()).toString());
     197  _snxtroFile ->setText(settings.value(_snxtroFile ->objectName()).toString());
    197198  _sigmaC1    ->setText(settings.value(_sigmaC1    ->objectName()).toString());
    198199  _sigmaL1    ->setText(settings.value(_sigmaL1    ->objectName()).toString());
     
    261262  settings.setValue(_nmeaFile    ->objectName(), _nmeaFile    ->text());
    262263  settings.setValue(_nmeaPort    ->objectName(), _nmeaPort    ->text());
     264  settings.setValue(_snxtroFile  ->objectName(), _snxtroFile  ->text());
    263265  settings.setValue(_lcGPS       ->objectName(), _lcGPS       ->currentText());
    264266  settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());
Note: See TracChangeset for help on using the changeset viewer.