Changeset 2585 in ntrip

Timestamp:

Aug 29, 2010, 6:09:19 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• GPSS/gpssDecoder.cpp (modified) (1 diff)
• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• RTIGS/RTIGSDecoder.cpp (modified) (1 diff)
• bnccaster.cpp (modified) (2 diffs)
• bncpppclient.cpp (modified) (1 diff)

trunk/BNC/GPSS/gpssDecoder.cpp

@@ -51 +51 @@
 gpssDecoder::gpssDecoder() : GPSDecoder() {
   connect(this, SIGNAL(newGPSEph(gpsephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)),
-          Qt::DirectConnection);
+          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)));
 }
 

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -75 +75 @@
 
   connect(this, SIGNAL(newGPSEph(gpsephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)),
-          Qt::DirectConnection);
+          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)));
   connect(this, SIGNAL(newGlonassEph(glonassephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGlonassEph(glonassephemeris*)),
-          Qt::DirectConnection);
+          (bncApp*) qApp, SLOT(slotNewGlonassEph(glonassephemeris*)));
 
   // Sub-Decoder for Clock and Orbit Corrections

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -72 +72 @@
 
   connect(this, SIGNAL(newCorrLine(QString, QString, long)), 
-          (bncApp*) qApp, SLOT(slotNewCorrLine(QString, QString, long)),
-          Qt::DirectConnection);
+          (bncApp*) qApp, SLOT(slotNewCorrLine(QString, QString, long)));
 
   memset(&_co, 0, sizeof(_co));

trunk/BNC/RTIGS/RTIGSDecoder.cpp

@@ -52 +52 @@
 ephSenderRTIGS::ephSenderRTIGS() {
   connect(this, SIGNAL(newGPSEph(gpsephemeris*)), 
-          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)),
-          Qt::DirectConnection);
-  //connect(this, SIGNAL(newGlonassEph(glonassephemeris*)), 
-  //        (bncApp*) qApp, SLOT(slotNewGlonassEph(glonassephemeris*)),
-  //        Qt::DirectConnection);
+          (bncApp*) qApp, SLOT(slotNewGPSEph(gpsephemeris*)));
 }
 

trunk/BNC/bnccaster.cpp

@@ -260 +260 @@
 
   qRegisterMetaType<p_obs>("p_obs");
+  qRegisterMetaType<gpsephemeris>("gpsephemeris");
+  qRegisterMetaType<glonassephemeris>("glonassephemeris");
 
   connect(getThread, SIGNAL(newObs(QByteArray, bool, p_obs)),
@@ -271 +273 @@
 
   connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
-          getThread, SLOT(slotNewEphGPS(gpsephemeris)),
-          Qt::DirectConnection);
+          getThread, SLOT(slotNewEphGPS(gpsephemeris)));
 
   _staIDs.push_back(getThread->staID());

trunk/BNC/bncpppclient.cpp

@@ -80 +80 @@
 
   connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
-          this, SLOT(slotNewEphGPS(gpsephemeris)),
-          Qt::DirectConnection);
+          this, SLOT(slotNewEphGPS(gpsephemeris)));
 
   connect(((bncApp*)qApp), SIGNAL(newEphGlonass(glonassephemeris)),
-          this, SLOT(slotNewEphGlonass(glonassephemeris)),
-          Qt::DirectConnection);
+          this, SLOT(slotNewEphGlonass(glonassephemeris)));
 
   connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
-          this, SLOT(slotNewCorrections(QList<QString>)),
-          Qt::DirectConnection);
+          this, SLOT(slotNewCorrections(QList<QString>)));
 
   _staID   = staID;