Changeset 5206 in ntrip for trunk

Timestamp:

Jun 11, 2013, 3:24:07 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (2 diffs)
• RTCM3/RTCM3Decoder.h (modified) (1 diff)
• bnccore.cpp (modified) (4 diffs)
• bnccore.h (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -76 +76 @@
   connect(this, SIGNAL(newGPSEph(gpsephemeris*)), 
           BNC_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
-  connect(this, SIGNAL(newGlonassEph(glonassephemeris*)), 
-          BNC_CORE, SLOT(slotNewGlonassEph(glonassephemeris*)));
+  connect(this, SIGNAL(newGlonassEph(glonassephemeris*, const QString&)), 
+          BNC_CORE, SLOT(slotNewGlonassEph(glonassephemeris*, const QString&)));
   connect(this, SIGNAL(newGalileoEph(galileoephemeris*)), 
           BNC_CORE, SLOT(slotNewGalileoEph(galileoephemeris*)));
@@ -359 +359 @@
           else if (rr == 1020) {
             decoded = true;
-            emit newGlonassEph(new glonassephemeris(parser.ephemerisGLONASS));
+            emit newGlonassEph(new glonassephemeris(parser.ephemerisGLONASS), _staID);
           }
 

trunk/BNC/src/RTCM3/RTCM3Decoder.h

@@ -49 +49 @@
   void newMessage(QByteArray msg,bool showOnScreen);
   void newGPSEph(gpsephemeris* gpseph);
-  void newGlonassEph(glonassephemeris* glonasseph);
+  void newGlonassEph(glonassephemeris* glonasseph, const QString& staID);
   void newGalileoEph(galileoephemeris* galileoeph);
 

trunk/BNC/src/bnccore.cpp

@@ -249 +249 @@
 // New Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::slotNewGlonassEph(glonassephemeris* glonasseph) {
+void t_bncCore::slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID) {
 
   QMutexLocker locker(&_mutex);
@@ -285 +285 @@
     delete *ee;
     *ee = glonasseph;
-    printGlonassEph(glonasseph, true);
+    printGlonassEph(glonasseph, true, staID);
   }
   else {
-    printGlonassEph(glonasseph, false);
+    printGlonassEph(glonasseph, false, staID);
     delete glonasseph;
   }
@@ -515 +515 @@
 // Print One Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile) {
+void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID) {
 
   t_ephGlo eph;
@@ -522 +522 @@
   QString strV2 = eph.toString(2.11);
   QString strV3 = eph.toString(3.01);
+
+  //// beg test Dirk
+  //// cout << staID.toAscii().data() << endl
+  ////      << strV3.toAscii().data() << endl;
+  //// end test Dirk
 
   printOutput(printFile, _ephStreamGlonass, strV2, strV3);

trunk/BNC/src/bnccore.h

@@ -70 +70 @@
     void slotMessage(QByteArray msg, bool showOnScreen);
     void slotNewGPSEph(gpsephemeris* gpseph);
-    void slotNewGlonassEph(glonassephemeris* glonasseph);
+    void slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID);
     void slotNewGalileoEph(galileoephemeris* galileoeph);
     void slotNewCorrLine(QString line, QString staID, bncTime coTime);
@@ -88 +88 @@
     void printEphHeader();
     void printGPSEph(gpsephemeris* ep, bool printFile);
-    void printGlonassEph(glonassephemeris* ep, bool printFile);
+    void printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID);
     void printGalileoEph(galileoephemeris* ep, bool printFile);
     void printOutput(bool printFile, QTextStream* stream,