Changeset 6519 in ntrip for trunk/BNC/src/bnccore.cpp

Timestamp:

Dec 30, 2014, 3:04:57 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bnccore.cpp (modified) (4 diffs)

trunk/BNC/src/bnccore.cpp

@@ -207 +207 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGPSEph(t_ephGPS eph) {
-
-  QMutexLocker locker(&_mutex);
+  QMutexLocker locker(&_mutex);
+
+  t_irc irc = _ephUser.putNewEph(&eph, true);
+  if (eph.checkState() == t_eph::bad) {
+    return;
+  }
 
   emit newGPSEph(eph);
 
   printEphHeader();
-
-  if (_ephUser.putNewEph(&eph, true) == success) {
-    printEph(eph, true);
-  }
-  else {
-    printEph(eph, false);
-  }
+  printEph(eph, (irc == success));
 }
     
@@ -225 +223 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGlonassEph(t_ephGlo eph) {
-
-  QMutexLocker locker(&_mutex);
+  QMutexLocker locker(&_mutex);
+
+  t_irc irc = _ephUser.putNewEph(&eph, true);
+  if (eph.checkState() == t_eph::bad) {
+    return;
+  }
 
   emit newGlonassEph(eph);
 
   printEphHeader();
-
-  if (_ephUser.putNewEph(&eph, true) == success) {
-    printEph(eph, true);
-  }
-  else {
-    printEph(eph, false);
-  }
+  printEph(eph, (irc == success));
 }
 
@@ -243 +239 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGalileoEph(t_ephGal eph) {
-
-  QMutexLocker locker(&_mutex);
+  QMutexLocker locker(&_mutex);
+
+  t_irc irc = _ephUser.putNewEph(&eph, true);
+  if (eph.checkState() == t_eph::bad) {
+    return;
+  }
 
   emit newGalileoEph(eph);
 
   printEphHeader();
-
-  if (_ephUser.putNewEph(&eph, true) == success) {
-    printEph(eph, true);
-  }
-  else {
-    printEph(eph, false);
-  }
+  printEph(eph, (irc == success));
 }
 
@@ -261 +255 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewSBASEph(t_ephSBAS eph) {
-
-  QMutexLocker locker(&_mutex);
+  QMutexLocker locker(&_mutex);
+
+  t_irc irc = _ephUser.putNewEph(&eph, true);
+  if (eph.checkState() == t_eph::bad) {
+    return;
+  }
 
   emit newSBASEph(eph);
 
   printEphHeader();
-
-  if (_ephUser.putNewEph(&eph, true) == success) {
-    printEph(eph, true);
-  }
-  else {
-    printEph(eph, false);
-  }
+  printEph(eph, (irc == success));
 }