Changeset 2387 in ntrip


Ignore:
Timestamp:
Mar 26, 2010, 11:55:55 AM (12 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk/BNC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/RTCM3/RTCM3Decoder.cpp

    r2386 r2387  
    6565// Constructor
    6666////////////////////////////////////////////////////////////////////////////
    67 RTCM3Decoder::RTCM3Decoder(const QString& staID) : GPSDecoder() {
     67RTCM3Decoder::RTCM3Decoder(const QString& staID, bool inputFromFile) :
     68                GPSDecoder() {
     69
     70  _staID           = staID;
     71  _inputFromFile   = inputFromFile;
    6872
    6973  bncSettings settings;
    7074  _checkMountPoint = settings.value("miscMount").toString();
    71   _staID = staID;
    7275
    7376  // Ensure, that the Decoder uses the "old" convention for the data structure for Rinex2. Perlt
     
    118121    if ( _coDecoder->Decode(buffer, bufLen, errmsg) == success ) {
    119122      decoded = true;
    120       if (_mode == unknown) {
    121         /////        _mode = corrections;
     123      if (!_inputFromFile && _mode == unknown) {
     124        _mode = corrections;
    122125      }
    123126    }
     
    340343      }
    341344    }
    342     if (_mode == unknown && decoded) {
    343       ////      _mode = observations;
     345    if (!_inputFromFile && _mode == unknown && decoded) {
     346      _mode = observations;
    344347    }
    345348  }
  • trunk/BNC/RTCM3/RTCM3Decoder.h

    r1807 r2387  
    4141Q_OBJECT
    4242 public:
    43   RTCM3Decoder(const QString& fileName);
     43  RTCM3Decoder(const QString& staID, bool inputFromFile);
    4444  virtual ~RTCM3Decoder();
    4545  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
     
    6767  std::map<std::string, t_ephGPS> _ephList;
    6868  double                 _antXYZ[3];
    69 
     69  bool                   _inputFromFile;
    7070};
    7171
  • trunk/BNC/bncgetthread.cpp

    r2386 r2387  
    307307           _format.indexOf("RTCM 3") != -1 ) {
    308308    emit(newMessage(_staID + ": Get data in RTCM 3.x format", true));
    309     _decoder = new RTCM3Decoder(_staID);
     309    bool inputFromFile = false;
     310    if (_rawInpFile != 0) {
     311      inputFromFile = true;
     312    }
     313    _decoder = new RTCM3Decoder(_staID, inputFromFile);
    310314    connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)),
    311315            this, SIGNAL(newMessage(QByteArray,bool)));
Note: See TracChangeset for help on using the changeset viewer.