Changeset 1154 in ntrip for trunk


Ignore:
Timestamp:
Oct 7, 2008, 12:40:28 PM (16 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk/BNC
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/RTCM3/RTCM3coDecoder.cpp

    r1035 r1154  
    8686    QSettings settings;
    8787
    88     QDateTime datTim = QDateTime::currentDateTime().toUTC();
     88    QDateTime datTim = currentDateAndTimeGPS();
    8989
    9090    QString hlpStr = bncRinex::nextEpochStr(datTim,

  • trunk/BNC/bncapp.cpp

    r1044 r1154  
    180180
    181181  if (_logStream) {
    182     *_logStream << QDateTime::currentDateTime().toUTC().toString("yy-MM-dd hh:mm:ss ").toAscii().data();
     182    *_logStream << currentDateAndTimeGPS().toString("yy-MM-dd hh:mm:ss ").toAscii().data();
    183183    *_logStream << msg.data() << endl;
    184184    _logStream->flush();
    … …  
    276276  if (!_ephPath.isEmpty()) {
    277277
    278     QDateTime datTim = QDateTime::currentDateTime().toUTC();
     278    QDateTime datTim = currentDateAndTimeGPS();
    279279
    280280    QString ephFileNameGPS = _ephPath + "BRDC" +
    … …  
    356356        *_ephStreamGPS << line;
    357357       
    358         QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
     358        QString hlp = currentDateAndTimeGPS().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
    359359        *_ephStreamGPS << _pgmName.toAscii().data()
    360360                       << _userName.toAscii().data()
    … …  
    378378        *_ephStreamGPS << line;
    379379         
    380         QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
     380        QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
    381381        *_ephStreamGPS << _pgmName.toAscii().data()
    382382                       << _userName.toAscii().data()
    … …  
    395395        *_ephStreamGlonass << line;
    396396       
    397         QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
     397        QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
    398398        *_ephStreamGlonass << _pgmName.toAscii().data()
    399399                           << _userName.toAscii().data()

  • trunk/BNC/bncrinex.cpp

    r1044 r1154  
    236236  // --------------------
    237237  else {
    238     QDate currDate = QDateTime::currentDateTime().toUTC().date();
     238    QDate currDate = currentDateAndTimeGPS().date();
    239239    if ( !_skeletonDate.isValid() || _skeletonDate != currDate ) {
    240240      if ( downloadSkeleton() == success) {
    … …  
    399399      if      (line.indexOf("PGM / RUN BY / DATE") != -1) {
    400400        if (_rinexVers == 3) {
    401           QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
     401          QString hlp = currentDateAndTimeGPS().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
    402402          _out << _pgmName.toAscii().data() << _userName.toAscii().data()
    403403               << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
    404404        }
    405405        else {
    406           QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
     406          QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
    407407          _out << _pgmName.toAscii().data() << _userName.toAscii().data()
    408408               << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
    … …  
    453453    if (_rinexVers == 3) {
    454454      _out << "     3.00           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
    455       QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
     455      QString hlp = currentDateAndTimeGPS().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
    456456      _out << _pgmName.toAscii().data() << _userName.toAscii().data()
    457457           << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
    … …  
    459459    else {
    460460      _out << "     2.11           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
    461       QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
     461      QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
    462462      _out << _pgmName.toAscii().data() << _userName.toAscii().data()
    463463           << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;

  • trunk/BNC/bncutils.cpp

    r1153 r1154  
    9898        leapsecond;
    9999}
     100
     101QDateTime currentDateAndTimeGPS() {
     102  int    GPSWeek;
     103  double GPSWeeks;
     104  currentGPSWeeks(GPSWeek, GPSWeeks);
     105  return dateAndTimeFromGPSweek(GPSWeek, GPSWeeks);
     106}
     107

  • trunk/BNC/bncutils.h

    r1153 r1154  
    3535void currentGPSWeeks(int& week, double& sec);
    3636
     37QDateTime currentDateAndTimeGPS();
     38
    3739#endif

  • trunk/BNC/bnczerodecoder.cpp

    r934 r1154  
    7171////////////////////////////////////////////////////////////////////////
    7272void bncZeroDecoder::reopen() {
    73   QDate currDate = QDateTime::currentDateTime().toUTC().date();
     73  QDate currDate = currentDateAndTimeGPS().date();
    7474  if (!_out || _fileDate != currDate) {
    7575    delete _out;
Note: See TracChangeset for help on using the changeset viewer.