Changeset 421 in ntrip for trunk/BNC

Timestamp:

Mar 28, 2007, 2:22:58 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncrinex.cpp (modified) (2 diffs)
• bncrinex.h (modified) (1 diff)

trunk/BNC/bncrinex.cpp

@@ -140 +140 @@
 
     if (socket) {
-      _skeletonLines.clear();
+      _headerLines.clear();
+      bool firstLineRead = false;
       while (true) {
         if (socket->canReadLine()) {
-          _skeletonLines.append( socket->readLine() );
           irc = success;
+          QString line = socket->readLine();
+          line.chop(1);
+          if (line.indexOf("RINEX VERSION") != -1) {
+            _headerLines.append("     2.11           OBSERVATION DATA"
+                                "    M (MIXED)"
+                                "           RINEX VERSION / TYPE");
+            _headerLines.append("PGM / RUN BY / DATE");
+            firstLineRead = true;
+          }
+          else if (firstLineRead) {
+            if (line.indexOf("END OF HEADER") != -1) {
+              _headerLines.append("# / TYPES OF OBSERV");
+              _headerLines.append(
+                    QString("     1     1").leftJustified(60, ' ', true) +
+                    "WAVELENGTH FACT L1/2");
+              _headerLines.append("TIME OF FIRST OBS");
+              _headerLines.append( line );
+              break;
+            }
+            else {
+              _headerLines.append( line );
+            }
+          }
         }
         else {
@@ -188 +211 @@
       if ( downloadSkeleton() == success) {
         _skeletonDate = currDate;
-      }
-    }
-    bool firstLineRead = false;
-    QStringListIterator it(_skeletonLines);
-    while (it.hasNext()) {
-      QString line = it.next();
-      line.chop(1);
-      if (line.indexOf("RINEX VERSION") != -1) {
-        _headerLines.append("     2.11           OBSERVATION DATA"
-                            "    M (MIXED)"
-                            "           RINEX VERSION / TYPE");
-        _headerLines.append("PGM / RUN BY / DATE");
-        firstLineRead = true;
-      }
-      else if (firstLineRead) {
-        if (line.indexOf("END OF HEADER") != -1) {
-          _headerLines.append("# / TYPES OF OBSERV");
-          _headerLines.append(
-                QString("     1     1").leftJustified(60, ' ', true) +
-                "WAVELENGTH FACT L1/2");
-          _headerLines.append("TIME OF FIRST OBS");
-          _headerLines.append( line );
-          break;
-        }
-        else {
-          _headerLines.append( line );
-        }
       }
     }

trunk/BNC/bncrinex.h

@@ -71 +71 @@
    QByteArray          _nmea;
    bool                _reconnectFlag;
-   QStringList         _skeletonLines;
    QDate               _skeletonDate;
 };