Changeset 7716 in ntrip for trunk/BNC/src

Timestamp:

Feb 2, 2016, 4:40:56 PM (9 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bncephuser.cpp (modified) (7 diffs)
• upload/bncephuploadcaster.cpp (modified) (5 diffs)

trunk/BNC/src/bncephuser.cpp

@@ -34 +34 @@
  * Created:    27-Jan-2011
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -51 +51 @@
     connect(BNC_CORE, SIGNAL(newGPSEph(t_ephGPS)),
             this, SLOT(slotNewGPSEph(t_ephGPS)), Qt::DirectConnection);
-  
+
     connect(BNC_CORE, SIGNAL(newGlonassEph(t_ephGlo)),
             this, SLOT(slotNewGlonassEph(t_ephGlo)), Qt::DirectConnection);
-  
+
     connect(BNC_CORE, SIGNAL(newGalileoEph(t_ephGal)),
             this, SLOT(slotNewGalileoEph(t_ephGal)), Qt::DirectConnection);
@@ -79 +79 @@
 }
 
-// New GPS Ephemeris 
+// New GPS Ephemeris
 ////////////////////////////////////////////////////////////////////////////
 void bncEphUser::slotNewGPSEph(t_ephGPS eph) {
   putNewEph(&eph, false);
 }
-    
+
 // New Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
@@ -109 +109 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncEphUser::putNewEph(t_eph* eph, bool check) {
@@ -159 +159 @@
     ephOld = 0;
   }
-  
+
   if ((ephOld == 0 || newEph->isNewerThan(ephOld)) &&
       (eph->checkState() != t_eph::bad ||
@@ -178 +178 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncEphUser::checkEphemeris(t_eph* eph) {
@@ -257 +257 @@
 
     // some lines to allow update of ephemeris data sets after outage
-    if      ((eph->type() == t_eph::GPS ||
-              eph->type() == t_eph::Galileo)  && dt > 4*3600) {
-      ephL->setCheckState(t_eph::outdated);
-      return;
-    }
-    else if ((eph->type() == t_eph::GLONASS ||
-              eph->type() == t_eph::QZSS)     && dt > 2*3600) {
-      ephL->setCheckState(t_eph::outdated);
-      return;
-    }
-    else if  (eph->type() == t_eph::SBAS      && dt > 1*3600)   {
-      ephL->setCheckState(t_eph::outdated);
-      return;
-    }
-    else if  (eph->type() == t_eph::BDS       && dt > 6*3600)   {
+    if      (eph->type() == t_eph::GPS    && dt > 4*3600) {
+      ephL->setCheckState(t_eph::outdated);
+      return;
+    }
+    else if (eph->type() == t_eph::Galileo && dt > 4*3600) {
+      ephL->setCheckState(t_eph::outdated);
+      return;
+    }
+    else if (eph->type() == t_eph::GLONASS && dt > 1*3600) {
+      ephL->setCheckState(t_eph::outdated);
+      return;
+    }
+    else if (eph->type() == t_eph::QZSS    && dt > 1*1800) {
+      ephL->setCheckState(t_eph::outdated);
+      return;
+    }
+    else if  (eph->type() == t_eph::SBAS   && dt > 600)   {
+      ephL->setCheckState(t_eph::outdated);
+      return;
+    }
+    else if  (eph->type() == t_eph::BDS    && dt > 6*3600)   {
       ephL->setCheckState(t_eph::outdated);
       return;

trunk/BNC/src/upload/bncephuploadcaster.cpp

@@ -11 +11 @@
  * Created:    03-Apr-2011
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -17 +17 @@
 #include <iostream>
 #include <math.h>
-#include "bncephuploadcaster.h" 
+#include "bncephuploadcaster.h"
 #include "bncsettings.h"
 #include "RTCM3/ephEncoder.h"
@@ -38 +38 @@
     int     sampl    = settings.value("uploadEphSample").toInt();
 
-    _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort, 
+    _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort,
                                            password, -1, sampl);
 
-    connect(_ephUploadCaster, SIGNAL(newBytes(QByteArray,double)), 
+    connect(_ephUploadCaster, SIGNAL(newBytes(QByteArray,double)),
           this, SIGNAL(newBytes(QByteArray,double)));
 
@@ -62 +62 @@
     QByteArray outBuffer;
 
+    QDateTime now = currentDateAndTimeGPS();
+    bncTime currentTime(now.toString(Qt::ISODate).toStdString());
+
     QListIterator<QString> it(prnList());
     while (it.hasNext()) {
       const t_eph* eph = ephLast(it.next());
+
+      bncTime toc = eph->TOC();
+      double timeDiff = fabs(toc - currentTime);
 
       const t_ephGPS*  ephGPS  = dynamic_cast<const t_ephGPS*>(eph);
@@ -76 +82 @@
 
       if (ephGPS) {
-        size = t_ephEncoder::RTCM3(*ephGPS, Array);
+        if (eph->checkState() == t_eph::ok && timeDiff <= 4*3600) {
+          size = t_ephEncoder::RTCM3(*ephGPS, Array);
+        }
       }
       else if (ephGlo) {
-        size = t_ephEncoder::RTCM3(*ephGlo, Array);
+        if (eph->checkState() == t_eph::ok && timeDiff <= 1*3600) {
+          size = t_ephEncoder::RTCM3(*ephGlo, Array);
+        }
       }
       else if (ephGal) {
-        size = t_ephEncoder::RTCM3(*ephGal, Array);
+        if (eph->checkState() == t_eph::ok && timeDiff <= 4*3600) {
+          size = t_ephEncoder::RTCM3(*ephGal, Array);
+        }
       }
       else if (ephSBAS) {
-        size = t_ephEncoder::RTCM3(*ephSBAS, Array);
+        if (eph->checkState() == t_eph::ok && timeDiff <= 600) {
+          size = t_ephEncoder::RTCM3(*ephSBAS, Array);
+        }
       }
       else if (ephBDS) {
-        size = t_ephEncoder::RTCM3(*ephBDS, Array);
+        if (eph->checkState() == t_eph::ok && timeDiff <= 6*3600) {
+          size = t_ephEncoder::RTCM3(*ephBDS, Array);
+        }
       }
       if (size > 0) {