Changeset 2024 in ntrip for trunk

Timestamp:

Nov 25, 2009, 6:38:01 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncpppthread.cpp (modified) (5 diffs)
• bncpppthread.h (modified) (3 diffs)

trunk/BNC/bncpppthread.cpp

@@ -54 +54 @@
   _staID         = staID;
   _isToBeDeleted = false;
+  _data          = 0;
 }
 
@@ -62 +63 @@
     wait();
   }
+  delete _data;
   QMapIterator<QString, t_eph*> it(_eph);
   while (it.hasNext()) {
@@ -93 +95 @@
         return;
       }
-
+      processEpoch();
     }
     catch (...) {
@@ -111 +113 @@
     t_obsInternal* obs = &(pp->_o);
     QByteArray staID = QByteArray(obs->StatID); 
-    cout << "DATA " << obs->GPSWeek << " " << obs->GPSWeeks << " " 
-         << staID.data() << " " 
-         << obs->satSys << obs->satNum << endl;
+    if (staID == _staID) {
+      if (!_data) {
+        _data = new t_data();
+        _data->GPSWeek  = obs->GPSWeek;
+        _data->GPSWeeks = obs->GPSWeeks;
+      }
+      ++_data->numSat;
+      _data->prn[_data->numSat] = 
+          QString("%1%2").arg(obs->satSys).arg(obs->satNum, 2, 10, QChar('0'));
+      _data->C1[_data->numSat] = obs->C1;
+      _data->C2[_data->numSat] = obs->C2;
+      _data->P1[_data->numSat] = obs->P1;
+      _data->P2[_data->numSat] = obs->P2;
+      _data->L1[_data->numSat] = obs->L1;
+      _data->L2[_data->numSat] = obs->L2;
+    }
   }
 }
@@ -161 +176 @@
   }
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncPPPthread::processEpoch() {
+  QMutexLocker locker(&_mutex);
+
+  if (!_data) {
+    return;
+  }
+
+  for (int is = 1; is <= _data->numSat; is++) {
+    cout << is << " " << _data->prn[is].toAscii().data() << " " 
+         << _data->C1[is] << " " << _data->P1[is] << endl;
+  }
+
+  cout << endl;
+  cout.flush();
+
+  delete _data;
+  _data = 0;
+}

trunk/BNC/bncpppthread.h

@@ -32 +32 @@
 #include "RTCM3/ephemeris.h"
 
-struct t_corr {
+#define MAXPRN = 
+
+class t_data {
+ public:
+  static const unsigned MAXOBS = 16;
+  t_data() {numSat = 0;}
+  ~t_data() {}
+  int     GPSWeek;
+  double  GPSWeeks;
+  int     numSat;  
+  QString prn[MAXOBS+1];
+  double  C1[MAXOBS+1];
+  double  C2[MAXOBS+1];
+  double  P1[MAXOBS+1];
+  double  P2[MAXOBS+1];
+  double  L1[MAXOBS+1];
+  double  L2[MAXOBS+1];
+};
+
+class t_corr {
+ public:
   int    iod;
   double dClk;
@@ -63 +83 @@
 
  private:
+  void processEpoch();
   QByteArray             _staID;
   bool                   _isToBeDeleted;
@@ -68 +89 @@
   QMap<QString, t_eph*>  _eph;
   QMap<QString, t_corr*> _corr;
+  t_data*                _data;
 };