Changeset 3525 in ntrip


Ignore:
Timestamp:
Dec 15, 2011, 10:00:46 AM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bncgetthread.cpp

    r3523 r3525  
    141141  }
    142142  else {
    143     _rnx = new bncRinex(_staID, _mountPoint, _format, _latitude,
    144                         _longitude, _nmea, _ntripVersion);
     143    _rnx = new bncRinex(_staID, _mountPoint, _latitude, _longitude,
     144                        _nmea, _ntripVersion);
    145145  }
    146146
     
    519519            _rnx->deepCopy(obs);
    520520          }
    521           _rnx->dumpEpoch(obsTime);
     521          _rnx->dumpEpoch(_format, obsTime);
    522522        }
    523523     
  • trunk/BNC/bncrinex.cpp

    r3344 r3525  
    6666////////////////////////////////////////////////////////////////////////////
    6767bncRinex::bncRinex(const QByteArray& statID, const QUrl& mountPoint,
    68                    const QByteArray& format, const QByteArray& latitude,
    69                    const QByteArray& longitude, const QByteArray& nmea,
    70                    const QByteArray& ntripVersion) {
     68                   const QByteArray& latitude, const QByteArray& longitude,
     69                   const QByteArray& nmea, const QByteArray& ntripVersion) {
    7170
    7271  _statID        = statID;
    7372  _mountPoint    = mountPoint;
    74   _format        = format.left(6);
    7573  _latitude      = latitude;
    7674  _longitude     = longitude;
     
    377375// Write RINEX Header
    378376////////////////////////////////////////////////////////////////////////////
    379 void bncRinex::writeHeader(const QDateTime& datTim,
     377void bncRinex::writeHeader(const QByteArray& format, const QDateTime& datTim,
    380378                           const QDateTime& datTimNom) {
    381379
     
    439437                                "    hh    mm   ss.zzz0000").toAscii().data();
    440438        _out << "     GPS         TIME OF FIRST OBS"    << endl;
    441         QString hlp = (_format + QString(" %1").arg(_mountPoint.host() +
     439        QString hlp = (format.left(6) + QString(" %1").arg(_mountPoint.host() +
    442440                      _mountPoint.path())).leftJustified(60, ' ', true);
    443441        _out << hlp.toAscii().data() << "COMMENT" << endl;
     
    511509                                "    hh    mm   ss.zzz0000").toAscii().data();
    512510    _out << "     GPS         TIME OF FIRST OBS"    << endl;
    513     QString hlp = (_format + QString(" %1").arg(_mountPoint.host() +
     511    QString hlp = (format.left(6) + QString(" %1").arg(_mountPoint.host() +
    514512          _mountPoint.path())).leftJustified(60, ' ', true);
    515513    _out << hlp.toAscii().data() << "COMMENT" << endl;
     
    533531// Write One Epoch into the RINEX File
    534532////////////////////////////////////////////////////////////////////////////
    535 void bncRinex::dumpEpoch(long maxTime) {
     533void bncRinex::dumpEpoch(const QByteArray& format, long maxTime) {
    536534
    537535  // Select observations older than maxTime
     
    570568  // ------------------
    571569  if (!_headerWritten) {
    572     writeHeader(datTim, datTimNom);
     570    writeHeader(format, datTim, datTimNom);
    573571  }
    574572
  • trunk/BNC/bncrinex.h

    r3344 r3525  
    3838 public:
    3939   bncRinex(const QByteArray& statID, const QUrl& mountPoint,
    40             const QByteArray& format, const QByteArray& latitude,
    41             const QByteArray& longitude, const QByteArray& nmea,
    42             const QByteArray& ntripVersion);
     40            const QByteArray& latitude, const QByteArray& longitude,
     41            const QByteArray& nmea, const QByteArray& ntripVersion);
    4342   ~bncRinex();
    4443   void deepCopy(t_obs obs);
    45    void dumpEpoch(long maxTime);
     44   void dumpEpoch(const QByteArray& format, long maxTime);
    4645   void setReconnectFlag(bool flag){_reconnectFlag = flag;}
    4746   static QString nextEpochStr(const QDateTime& datTim,
     
    6463   void resolveFileName(const QDateTime& datTim);
    6564   void readSkeleton();
    66    void writeHeader(const QDateTime& datTim, const QDateTime& datTimNom);
     65   void writeHeader(const QByteArray& format, const QDateTime& datTim,
     66                    const QDateTime& datTimNom);
    6767   void closeFile();
    6868   t_irc downloadSkeleton();
     
    8080   QString       _userName;
    8181   QString       _sklName;
    82    QByteArray    _format;
    8382   QByteArray    _latitude;
    8483   QByteArray    _longitude;
Note: See TracChangeset for help on using the changeset viewer.