Changeset 131 in ntrip for trunk/BNC

Timestamp:

Sep 7, 2006, 9:48:35 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/rtcm3.cpp (modified) (1 diff)
• RTCM3/rtcm3torinex.cpp (modified) (3 diffs)
• RTCM3/rtcm3torinex.h (modified) (1 diff)
• bncrinex.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/rtcm3.cpp

@@ -51 +51 @@
       while(int rr = RTCM3Parser(&_Parser)) {
 
+        if (!_Parser.init) {
+          HandleHeader(&_Parser);
+          _Parser.init = 1;
+        }
+
         if (rr == 2) {
           cerr << "No valid RINEX! All values are modulo 299792.458!\n";

trunk/BNC/RTCM3/rtcm3torinex.cpp

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.cpp,v 1.6 2006/09/02 12:23:05 mervart Exp $
+  $Id: rtcm3torinex.cpp,v 1.7 2006/09/06 16:13:16 mervart Exp $
 
   Program written bei
@@ -66 +66 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.6 $";
-static char datestr[]     = "$Date: 2006/09/02 12:23:05 $";
+static char revisionstr[] = "$Revision: 1.7 $";
+static char datestr[]     = "$Date: 2006/09/06 16:13:16 $";
 static int stop = 0;
 
@@ -740 +740 @@
 
 
+#ifndef NO_RTCM3_MAIN
   for(i = 0; i < hdata.numheaders; ++i)
     printf("%s\n", hdata.data.unnamed[i]);
   printf("                                                            "
   "END OF HEADER\n");
+#endif
 }
 

trunk/BNC/RTCM3/rtcm3torinex.h

@@ -100 +100 @@
 };
 
+void HandleHeader(struct RTCM3ParserData *Parser);
 int RTCM3Parser(struct RTCM3ParserData *handle);
 void HandleByte(struct RTCM3ParserData *Parser, unsigned int byte);

trunk/BNC/bncrinex.cpp

@@ -89 +89 @@
   QDate nextDate;
 
-  if      (intStr == "15 min") {
+////  //// beg test
+////  if (1) {
+////    hlpStr = datTim.toString("_hh_mm_ss");
+////    nextDate = datTim.date();
+////    nextTime = datTim.time().addSecs(10);
+////  } else
+////  //// end test
+  if   (intStr == "15 min") {
     char ch = 'A' + datTim.time().hour();
     hlpStr = ch;
@@ -253 +260 @@
   }
 
-  _out << datTim.toString(" yy MM dd hh mm ss.zzz0000").toAscii().data(); 
+  _out << datTim.toString(" yy MM dd hh mm ss.zzz0000").toAscii().data()
+       << "  " << 0 << setw(3)  << _obs.size();
 
   QListIterator<Observation*> it(_obs); int iSat = 0;