Changeset 2031 in ntrip

Timestamp:

Nov 26, 2009, 11:53:49 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpppthread.cpp

@@ -56 +56 @@
   _isToBeDeleted = false;
   _data          = 0;
+  _dataHlp       = 0;
 }
 
@@ -65 +66 @@
   }
   delete _data;
+  delete _dataHlp;
   QMapIterator<QString, t_eph*> it(_eph);
   while (it.hasNext()) {
@@ -115 +117 @@
   t_time tt(obs->GPSWeek, obs->GPSWeeks);
 
-  QString prn = 
+  if      (!_dataHlp) {
+    _dataHlp = new t_data();
+    _dataHlp->tt = tt;
+  }
+  else if (tt != _dataHlp->tt) {
+    _data = _dataHlp;
+    _dataHlp = new t_data();
+    _dataHlp->tt = tt;
+  }
+
+  ++_dataHlp->numSat;
+
+  if (_dataHlp->numSat > t_data::MAXOBS) {
+    cerr << "putNewObs: numSat > MAXOBS\n";
+    exit(1);
+  }
+
+  _dataHlp->prn[_dataHlp->numSat] = 
         QString("%1%2").arg(obs->satSys).arg(obs->satNum, 2, 10, QChar('0'));
-
-  cout << tt.timestr(1) << " " << prn.toAscii().data() << endl;
-  cout.flush();
-
-///  delete _data;
-///  _data = new t_data();
-///
-///    QByteArray staID = QByteArray(obs->StatID); 
-///    if (staID == _staID) {
-///      if (_data->tt.undef()) {
-///      }
-///      ++_data->numSat;
-///      _data->prn[_data->numSat] = 
-///          
-///      _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;
-///    }
-///  }
+      
+  _dataHlp->C1[_dataHlp->numSat] = obs->C1;
+  _dataHlp->C2[_dataHlp->numSat] = obs->C2;
+  _dataHlp->P1[_dataHlp->numSat] = obs->P1;
+  _dataHlp->P2[_dataHlp->numSat] = obs->P2;
+  _dataHlp->L1[_dataHlp->numSat] = obs->L1;
+  _dataHlp->L2[_dataHlp->numSat] = obs->L2;
 }
 

trunk/BNC/bncpppthread.h

@@ -40 +40 @@
 class t_data {
  public:
-  static const unsigned MAXOBS = 56;
+  static const int MAXOBS = 56;
   t_data() {numSat = 0;}
   ~t_data() {}
@@ -96 +96 @@
   QMap<QString, t_corr*> _corr;
   t_data*                _data;
+  t_data*                _dataHlp;
 };