Changeset 6520 in ntrip for trunk/BNC

Timestamp:

Dec 30, 2014, 3:15:35 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (4 diffs)
• bnccore.h (modified) (1 diff)
• bncephuser.cpp (modified) (1 diff)

trunk/BNC/src/bnccore.cpp

@@ -204 +204 @@
 }
 
+// 
+////////////////////////////////////////////////////////////////////////////
+t_irc t_bncCore::checkPrintEph(t_eph* eph) {
+  QMutexLocker locker(&_mutex);
+  t_irc ircPut = _ephUser.putNewEph(eph, true);
+  if (eph->checkState() == t_eph::bad) {
+    return failure;
+  }
+  printEphHeader();
+  printEph(*eph, (ircPut == success));
+  return success;
+}
+
 // New GPS Ephemeris 
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGPSEph(t_ephGPS eph) {
-  QMutexLocker locker(&_mutex);
-
-  t_irc irc = _ephUser.putNewEph(&eph, true);
-  if (eph.checkState() == t_eph::bad) {
-    return;
-  }
-
-  emit newGPSEph(eph);
-
-  printEphHeader();
-  printEph(eph, (irc == success));
+  if (checkPrintEph(&eph) == success) {
+    emit newGPSEph(eph);
+  }
 }
     
@@ -223 +228 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGlonassEph(t_ephGlo eph) {
-  QMutexLocker locker(&_mutex);
-
-  t_irc irc = _ephUser.putNewEph(&eph, true);
-  if (eph.checkState() == t_eph::bad) {
-    return;
-  }
-
-  emit newGlonassEph(eph);
-
-  printEphHeader();
-  printEph(eph, (irc == success));
+  if (checkPrintEph(&eph) == success) {
+    emit newGlonassEph(eph);
+  }
 }
 
@@ -239 +236 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewGalileoEph(t_ephGal eph) {
-  QMutexLocker locker(&_mutex);
-
-  t_irc irc = _ephUser.putNewEph(&eph, true);
-  if (eph.checkState() == t_eph::bad) {
-    return;
-  }
-
-  emit newGalileoEph(eph);
-
-  printEphHeader();
-  printEph(eph, (irc == success));
+  if (checkPrintEph(&eph) == success) {
+    emit newGalileoEph(eph);
+  }
 }
 
@@ -255 +244 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotNewSBASEph(t_ephSBAS eph) {
-  QMutexLocker locker(&_mutex);
-
-  t_irc irc = _ephUser.putNewEph(&eph, true);
-  if (eph.checkState() == t_eph::bad) {
-    return;
-  }
-
-  emit newSBASEph(eph);
-
-  printEphHeader();
-  printEph(eph, (irc == success));
+  if (checkPrintEph(&eph) == success) {
+    emit newSBASEph(eph);
+  }
 }
 

trunk/BNC/src/bnccore.h

@@ -111 +111 @@
 
  private:
-  void printEphHeader();
-  void printEph(const t_eph& eph, bool printFile);
-  void printOutputEph(bool printFile, QTextStream* stream, 
-                      const QString& strV2, const QString& strV3);
-  void messagePrivate(const QByteArray& msg);
+  t_irc checkPrintEph(t_eph* eph);
+  void  printEphHeader();
+  void  printEph(const t_eph& eph, bool printFile);
+  void  printOutputEph(bool printFile, QTextStream* stream, 
+                       const QString& strV2, const QString& strV3);
+  void  messagePrivate(const QByteArray& msg);
 
   QSettings::SettingsMap _settings;

trunk/BNC/src/bncephuser.cpp

@@ -185 +185 @@
     return;
   }
+
 }