Changeset 5722 in ntrip for trunk/BNC

Timestamp:

Jul 31, 2014, 1:57:27 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppThread.cpp (modified) (1 diff)
• bnccaster.cpp (modified) (1 diff)
• bnccaster.h (modified) (1 diff)
• bnccore.h (modified) (1 diff)

trunk/BNC/src/PPP/pppThread.cpp

@@ -65 +65 @@
 void t_pppThread::run() {
 
-
   // Connect to BNC Signals
   // ----------------------
-  connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
-          this, SLOT(slotNewCorrections(QList<QString>)));
+  if (BNC_CORE->caster()) {
+    connect(BNC_CORE->caster(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
+          this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
 
-  connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
-          this, SLOT(slotNewEphGPS(gpsephemeris)));
+    connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
+            this, SLOT(slotNewEphGPS(gpsephemeris)));
+  
+    connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
+            this, SLOT(slotNewEphGlonass(glonassephemeris)));
+  
+    connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
+            this, SLOT(slotNewEphGalileo(galileoephemeris)));
 
-  connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
-          this, SLOT(slotNewEphGlonass(glonassephemeris)));
-
-  connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
-          this, SLOT(slotNewEphGalileo(galileoephemeris)));
+    connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
+            this, SLOT(slotNewCorrections(QList<QString>)));
+  }
  
   // Start processing loop

trunk/BNC/src/bnccaster.cpp

@@ -283 +283 @@
           this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
 
+  connect(getThread, SIGNAL(newObs(QByteArray, QList<t_obs>)),
+          this,      SIGNAL(slotNewObs(QByteArray, QList<t_obs>)));
+
   connect(getThread, SIGNAL(newRawData(QByteArray, QByteArray)),
           this,      SLOT(slotNewRawData(QByteArray, QByteArray)));

trunk/BNC/src/bnccaster.h

@@ -54 +54 @@
    void getThreadsFinished();   
    void newMessage(QByteArray msg, bool showOnScreen);
+   void newObs(QByteArray staID, QList<t_obs> obsList);
 
  private slots:

trunk/BNC/src/bnccore.h

@@ -52 +52 @@
     void setPortCorr(int port);
     void setCaster(bncCaster* caster) {_caster = caster;}
+    const bncCaster* caster() const {return _caster;}
     QDateTime* _currentDateAndTimeGPS;
     void setConfFileName(const QString& confFileName);