Changeset 3171 in ntrip

Timestamp:

Mar 29, 2011, 4:10:33 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncutils.cpp (modified) (2 diffs)
• bncutils.h (modified) (1 diff)
• upload/bncrtnetdecoder.cpp (modified) (3 diffs)
• upload/bncrtnetdecoder.h (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -319 +319 @@
   else if (_format.indexOf("RTNET") != -1) {
     emit(newMessage(_staID + ": Get data in RTNet format", true));
-    _decoder = new bncRtnetDecoder(_staID);
+    _decoder = new bncRtnetDecoder();
   }
   else {

trunk/BNC/bncutils.cpp

@@ -309 +309 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
+double djul(int jj, int mm, double tt) {
+  int    ii, kk;
+  double  djul ;
+  if( mm <= 2 ) {
+    jj = jj - 1;
+    mm = mm + 12;
+  }  
+  ii   = jj/100;
+  kk   = 2 - ii + ii/4;
+  djul = (365.25*jj - fmod( 365.25*jj, 1.0 )) - 679006.0;
+  djul = djul + floor( 30.6001*(mm + 1) ) + tt + kk;
+  return djul;
+} 
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void jdgp(double tjul, double & second, int & nweek) {
+  double      deltat;
+  deltat = tjul - 44244.0 ;
+  // current gps week
+  nweek = (int) floor(deltat/7.0);
+  // seconds past midnight of last weekend
+  second = (deltat - (nweek)*7.0)*86400.0;
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
 void GPSweekFromDateAndTime(const QDateTime& dateTime, 
                             int& GPSWeek, double& GPSWeeks) {
@@ -321 +348 @@
   GPSWeeks = (weekDay - 1) * 86400.0
              - dateTime.time().msecsTo(QTime()) / 1e3; 
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
+                       double sec, int& GPSWeek, double& GPSWeeks) {
+
+  double mjd = djul(year, month, day);
+
+  jdgp(mjd, GPSWeeks, GPSWeek);
+  GPSWeeks += hour * 3600.0 + min * 60.0 + sec;  
 }
 

trunk/BNC/bncutils.h

@@ -63 +63 @@
                             int& GPSWeek, double& GPSWeeks);
 
+void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
+                       double sec, int& GPSWeek, double& GPSWeeks);
+
 void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
 

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -48 +48 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////// 
-bncRtnetDecoder::bncRtnetDecoder(const QString& fileName) {
-
+bncRtnetDecoder::bncRtnetDecoder() {
   bncSettings settings;
-  QString path = settings.value("rnxPath").toString();
-  expandEnvVar(path);
-
-  if ( path.length() > 0 && path[path.length()-1] != QDir::separator() ) {
-    path += QDir::separator();
-  }
-
-  _fileName = path + fileName;
-
-  _out = 0;
+  _year = 0;
 }
 
@@ -66 +56 @@
 //////////////////////////////////////////////////////////////////////// 
 bncRtnetDecoder::~bncRtnetDecoder() {
-  delete _out;
 }
 
-// Reopen Output File
+// Decode Method
 //////////////////////////////////////////////////////////////////////// 
-void bncRtnetDecoder::reopen() {
-  QDate currDate = currentDateAndTimeGPS().date();
-  if (!_out || _fileDate != currDate) {
-    delete _out;
-    QByteArray fileName = 
-           (_fileName + "_" + currDate.toString("yyMMdd")).toAscii();
-    bncSettings settings;
-    if (Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
-      _out = new ofstream(fileName.data(), ios::out | ios::app);
-    }
-    else {
-      _out = new ofstream(fileName.data());
-    }
-    _fileDate = currDate;
-  }
+void bncRtnetDecoder::readEpochTime(const QString& line) {
+  QTextStream in(line.toAscii());
+  QString hlp;
+  in >> hlp >> _year >> _month >> _day >> _hour >> _min >> _sec;
+  GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
 }
 
@@ -91 +70 @@
 //////////////////////////////////////////////////////////////////////// 
 t_irc bncRtnetDecoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
+
   errmsg.clear();
-  reopen();
-  _out->write(buffer, bufLen);
-  _out->flush();
+
+  _buffer.append(QByteArray(buffer, bufLen));
+
+  int iLast = _buffer.lastIndexOf('\n');
+
+  if (iLast != -1) {
+    QStringList lines = _buffer.split('\n', QString::SkipEmptyParts);
+    _buffer = _buffer.mid(iLast+1);
+    cout << "number of lines = " << lines.size() << endl;
+    for (int ii = 0; ii < lines.size(); ii++) {
+      if (lines[ii].indexOf('*') != -1) {
+        readEpochTime(lines[ii]);
+        cout << "epoch: " << lines[ii].toAscii().data() << endl;
+      }
+      else if (_year != 0) {
+        cout << "pos: " << lines[ii].toAscii().data() << endl;
+      }
+    }
+  }
+
   return success;
 }

trunk/BNC/upload/bncrtnetdecoder.h

@@ -23 +23 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#ifndef INC_BNCRTNETDECODER_H
-#define INC_BNCRTNETDECODER_H
+#ifndef BNCRTNETDECODER_H
+#define BNCRTNETDECODER_H
 
 #include <fstream>
@@ -33 +33 @@
 class bncRtnetDecoder: public GPSDecoder, public bncEphUser {
  public:
-  bncRtnetDecoder(const QString& fileName);
+  bncRtnetDecoder();
   ~bncRtnetDecoder();
   virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
  private:
-  void reopen();
-  QString        _fileName;
-  std::ofstream* _out;
-  QDate          _fileDate;
+  void readEpochTime(const QString& line);
+
+  QString _buffer;
+
+  int    _GPSweek;
+  double _GPSweeks;
+  int    _year;
+  int    _month;
+  int    _day;
+  int    _hour;
+  int    _min;
+  double _sec;
+
+  double _dx;
+  double _dy;
+  double _dz;
+  double _dxr;
+  double _dyr;
+  double _dzr;
+  double _ox;
+  double _oy;
+  double _oz;
+  double _oxr;
+  double _oyr;
+  double _ozr;
+  double _sc;
+  double _scr;
+  double _t0;
 };