Changeset 366 in ntrip for trunk/BNC/bncrinex.cpp

Timestamp:

Jan 17, 2007, 4:17:20 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncrinex.cpp (modified) (10 diffs)

trunk/BNC/bncrinex.cpp

@@ -62 +62 @@
 ////////////////////////////////////////////////////////////////////////////
 bncRinex::bncRinex(const char* StatID, const QUrl& mountPoint, 
-                   const QByteArray& format) {
+                   const QByteArray& format, const QByteArray& latitude,
+                   const QByteArray& longitude, const QByteArray& nmea) {
   _statID        = StatID;
   _mountPoint    = mountPoint;
   _format        = format.left(6);
+  _latitude      = latitude;
+  _longitude     = longitude;
+  _nmea          = nmea;
   _headerWritten = false;
 
@@ -145 +149 @@
       const int timeOut = 10*1000;
       QString msg;
-      QTcpSocket* socket = bncGetThread::request(url, timeOut, msg);
+      QByteArray _latitude;
+      QByteArray _longitude;
+      QByteArray _nmea;
+      QTcpSocket* socket = bncGetThread::request(url, _latitude, _longitude, _nmea, timeOut, msg);
 
       if (socket) {
@@ -154 +161 @@
             line.chop(1);
             if (line.indexOf("RINEX VERSION") != -1) {
-              _headerLines.append("     2.10           OBSERVATION DATA"
+              _headerLines.append("     2.11           OBSERVATION DATA"
                                   "    M (MIXED)"
                                   "           RINEX VERSION / TYPE");
@@ -294 +301 @@
 
   QSettings settings;
-//  double lat, lon;
-//  int vrsstream = 0;
-//  lat = settings.value("approxLat", 0).toDouble();
-//  lon = settings.value("approxLon", 0).toDouble();
-//  if ((lat != 0.0) && (lon != 0.0)) {vrsstream=1;}
 
   // Open the Output File
@@ -332 +334 @@
       }
       else if (line.indexOf("# / TYPES OF OBSERV") != -1) {
-        _out << "     5    C1    P1    P2    L1    L2"
-                "                        # / TYPES OF OBSERV"  << endl;
+        _out << "     6    C1    C2    P1    P2    L1    L2"
+                "                  # / TYPES OF OBSERV"  << endl;
       }
       else if (line.indexOf("TIME OF FIRST OBS") != -1) {
@@ -342 +344 @@
                       _mountPoint.path())).leftJustified(60, ' ', true);
         _out << hlp.toAscii().data() << "COMMENT" << endl;
-//        hlp = QString("Approx VRS Position %1%2").arg(lat, -20, 'f', 4).arg(lon, -20, 'f', 4);
-//        _out << hlp.toAscii().data() << "COMMENT" << endl;
       }
       else {
@@ -357 +357 @@
     double antennaNEU[3]; antennaNEU[0] = antennaNEU[1] = antennaNEU[2] = 0.0;
     
-    _out << "     2.10           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
+    _out << "     2.11           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
     QString hlp = QDate::currentDate().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
     _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
@@ -380 +380 @@
          << "                  "                                     << "ANTENNA: DELTA H/E/N" << endl;
     _out << "     1     1                                                WAVELENGTH FACT L1/2" << endl;
-    _out << "     5    C1    P1    P2    L1    L2                        # / TYPES OF OBSERV"  << endl;
+    _out << "     6    C1    C2    P1    P2    L1    L2                  # / TYPES OF OBSERV"  << endl;
         _out << datTim.toString("  yyyy    MM    dd"
                                 "    hh    mm   ss.zzz0000").toAscii().data();
@@ -387 +387 @@
           _mountPoint.path())).leftJustified(60, ' ', true);
     _out << hlp.toAscii().data() << "COMMENT" << endl;
-//    hlp = QString("Approx VRS Position %1%2").arg(lat, -20, 'f', 4).arg(lon, -20, 'f', 4);
-//    _out << hlp.toAscii().data() << "COMMENT" << endl;
+
+    if (_nmea == "VRS") {
+    hlp = ("VRS LAT=" + _latitude + " " + "LONG=" + _longitude).leftJustified(60, ' ',true);
+    _out << hlp.toAscii().data() << "COMMENT" << endl; }
+
     _out << "                                                            END OF HEADER"        << endl;
   }
@@ -469 +472 @@
     char snr = ' ';
     _out << setw(14) << setprecision(3) << ob->C1 << lli << snr;
+    _out << setw(14) << setprecision(3) << ob->C2 << lli << snr;
     _out << setw(14) << setprecision(3) << ob->P1 << lli << snr;
     _out << setw(14) << setprecision(3) << ob->P2 << lli << snr; 
     _out << setw(14) << setprecision(3) << ob->L1 << lli 
-         << setw(1) << ob->SNR1;
+         << setw(1) << ob->SNR1 << endl;
     _out << setw(14) << setprecision(3) << ob->L2 << lli
          << setw(1) << ob->SNR2;