Changeset 5066 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Mar 30, 2013, 11:31:00 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (3 diffs)
• RTCM3coDecoder.cpp (modified) (1 diff)
• ephemeris.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -75 +75 @@
 
   connect(this, SIGNAL(newGPSEph(gpsephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)));
+          PGM_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
   connect(this, SIGNAL(newGlonassEph(glonassephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGlonassEph(glonassephemeris*)));
+          PGM_CORE, SLOT(slotNewGlonassEph(glonassephemeris*)));
   connect(this, SIGNAL(newGalileoEph(galileoephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGalileoEph(galileoephemeris*)));
+          PGM_CORE, SLOT(slotNewGalileoEph(galileoephemeris*)));
 
   // Mode can be either observations or corrections
@@ -149 +149 @@
   // Get Glonass Slot Numbers from Global Array
   // ------------------------------------------
-  bncApp* app = (bncApp*) qApp;
-  app->getGlonassSlotNums(parser.GLOFreq);
+  PGM_CORE->getGlonassSlotNums(parser.GLOFreq);
 
   // Remaining part decodes the Observations
@@ -378 +377 @@
 
   if (decoded) {
-    app->storeGlonassSlotNums(parser.GLOFreq);
+    PGM_CORE->storeGlonassSlotNums(parser.GLOFreq);
     return success;
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -73 +73 @@
 
   connect(this, SIGNAL(newCorrLine(QString, QString, long)), 
-          (bncApp*) qApp, SLOT(slotNewCorrLine(QString, QString, long)));
+          PGM_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
 
   connect(this, SIGNAL(newMessage(QByteArray,bool)), 
-          (bncApp*) qApp, SLOT(slotMessage(const QByteArray,bool)));
+          PGM_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
   memset(&_co, 0, sizeof(_co));

trunk/BNC/src/RTCM3/ephemeris.cpp

@@ -416 +416 @@
     }
 
-    if (timeChanged && ((bncApp*) qApp)->mode() == bncApp::batchPostProcessing) {
+    if (timeChanged && PGM_CORE->mode() == t_pgmCore::batchPostProcessing) {
       bncTime newHTime(ww, (double) tow);
       cout << "GLONASS " << ee->almanac_number <<  " Time Changed at "