Changeset 3187 in ntrip for trunk/BNC/upload

Timestamp:

Mar 29, 2011, 9:05:21 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

• bncrtnetdecoder.cpp (modified) (3 diffs)
• bncrtnetdecoder.h (modified) (1 diff)
• bncuploadcaster.cpp (modified) (1 diff)
• bncuploadcaster.h (modified) (1 diff)

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -54 +54 @@
   // List of upload casters
   // ----------------------
-
+  QListIterator<QString> it(settings.value("uploadMountpointsOut").toStringList());
+  while (it.hasNext()) {
+    QStringList hlp = it.next().split(",");
+    if (hlp.size() > 6) {
+      int  outPort = hlp[1].toInt();
+      bool CoM     = (hlp[5].toInt() == Qt::Checked);
+      _caster.push_back(new bncUploadCaster(hlp[2], hlp[0], outPort,
+                                            hlp[3], hlp[4], CoM,
+                                            hlp[6], "", ""));
+    }
+  }
 }
 
@@ -60 +70 @@
 //////////////////////////////////////////////////////////////////////// 
 bncRtnetDecoder::~bncRtnetDecoder() {
+  for (int ic = 0; ic < _caster.size(); ic++) {
+    delete _caster[ic];
+  }
 }
 
@@ -101 +114 @@
   if (lines.size() > 0) {
     for (int ic = 0; ic < _caster.size(); ic++) {
-      _caster.at(ic)->uploadClockOrbitBias(_epoTime, _eph, lines);
+      _caster[ic]->uploadClockOrbitBias(_epoTime, _eph, lines);
     }
   }

trunk/BNC/upload/bncrtnetdecoder.h

@@ -40 +40 @@
  private:
   void readEpochTime(const QString& line);
-  QList<bncUploadCaster*> _caster;
-  QString                 _buffer;
-  bncTime                 _epoTime;
+  QVector<bncUploadCaster*> _caster;
+  QString                   _buffer;
+  bncTime                   _epoTime;
 };
 

trunk/BNC/upload/bncuploadcaster.cpp

@@ -31 +31 @@
                                  const QString& password, 
                                  const QString& crdTrafo, bool  CoM, 
+                                 const QString& sp3FileName,
                                  const QString& rnxFileName,
-                                 const QString& sp3FileName,
                                  const QString& outFileName) {
 

trunk/BNC/upload/bncuploadcaster.h

@@ -17 +17 @@
                   const QString& password, 
                   const QString& crdTrafo, bool  CoM, 
+                  const QString& sp3FileName,
                   const QString& rnxFileName,
-                  const QString& sp3FileName,
                   const QString& outFileName);
   virtual ~bncUploadCaster();