Changeset 3206 in ntrip for trunk/BNC/upload/bncrtnetdecoder.cpp

Timestamp:

Mar 30, 2011, 6:20:17 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/upload/bncrtnetdecoder.cpp (modified) (3 diffs)

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -49 +49 @@
 //////////////////////////////////////////////////////////////////////// 
 bncRtnetDecoder::bncRtnetDecoder() {
-}
-
-// Destructor
-//////////////////////////////////////////////////////////////////////// 
-bncRtnetDecoder::~bncRtnetDecoder() {
-  for (int ic = 0; ic < _casters->size(); ic++) {
-    delete _casters->at(ic);
-  }
-  delete _casters;
-}
-
-// Run
-//////////////////////////////////////////////////////////////////////// 
-void bncRtnetDecoder::run() {
-
   bncSettings settings;
 
   // List of upload casters
   // ----------------------
-  _casters = new QVector<bncUploadCaster*>;
   QListIterator<QString> it(settings.value("uploadMountpointsOut").toStringList());
   while (it.hasNext()) {
@@ -75 +59 @@
       int  outPort = hlp[1].toInt();
       bool CoM     = (hlp[5].toInt() == Qt::Checked);
-      _casters->push_back(new bncUploadCaster(hlp[2], hlp[0], outPort,
-                                             hlp[3], hlp[4], CoM,
-                                             hlp[6], "", ""));
+      bncUploadCaster* newCaster = new bncUploadCaster(hlp[2], hlp[0], outPort, 
+                                                       hlp[3], hlp[4], CoM,
+                                                       hlp[6], "", "");
+      newCaster->start();
+      _casters.push_back(newCaster);
     }
   }
+}
 
-  // Endless Loop - Decode
-  // ---------------------
-  while (true) {
-    DecodeInThread();
-    msleep(10);
+// Destructor
+//////////////////////////////////////////////////////////////////////// 
+bncRtnetDecoder::~bncRtnetDecoder() {
+  for (int ic = 0; ic < _casters.size(); ic++) {
+    delete _casters[ic];
   }
 }
@@ -94 +81 @@
   QMutexLocker locker(&_mutex);
   errmsg.clear();
-  _buffer.append(QByteArray(buffer, bufLen));
+  for (int ic = 0; ic < _casters.size(); ic++) {
+    _casters[ic]->decodeRtnetStream(buffer, bufLen, _eph);
+  }
   return success;
 }
 
-// Decode and upload in separate thread
-//////////////////////////////////////////////////////////////////////// 
-void bncRtnetDecoder::DecodeInThread() {
-  QMutexLocker locker(&_mutex);
-
-  // Prepare list of lines with satellite positions in SP3-like format
-  // -----------------------------------------------------------------
-  QStringList lines;
-  int iLast = _buffer.lastIndexOf('\n');
-  if (iLast != -1) {
-    QStringList hlpLines = _buffer.split('\n', QString::SkipEmptyParts);
-    _buffer = _buffer.mid(iLast+1);
-    for (int ii = 0; ii < hlpLines.size(); ii++) {
-      if      (hlpLines[ii].indexOf('*') != -1) {
-        QTextStream in(hlpLines[ii].toAscii());
-        QString hlp;
-        int     year, month, day, hour, min;
-        double  sec;
-        in >> hlp >> year >> month >> day >> hour >> min >> sec;
-        _epoTime.set( year, month, day, hour, min, sec);
-      }
-      else if (_epoTime.valid()) {
-        lines << hlpLines[ii];
-      }
-    }
-  }
-
-  // Satellite positions to be processed
-  // -----------------------------------
-  if (lines.size() > 0) {
-    for (int ic = 0; ic < _casters->size(); ic++) {
-      _casters->at(ic)->uploadClockOrbitBias(_epoTime, _eph, lines);
-    }
-  }
-}
-