Changeset 6432 in ntrip for trunk/BNC/src/bnccore.h

Timestamp:

Dec 25, 2014, 6:11:49 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bnccore.h (modified) (6 diffs)

trunk/BNC/src/bnccore.h

@@ -31 +31 @@
 #include "bnccaster.h"
 #include "bncrawfile.h"
-#include "RTCM3/RTCM3Decoder.h"
+#include "bncephuser.h"
 
 class bncComb;
@@ -76 +76 @@
  public slots:
   void slotMessage(QByteArray msg, bool showOnScreen);
-  void slotNewGPSEph(gpsephemeris* gpseph);
-  void slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID);
-  void slotNewGalileoEph(galileoephemeris* galileoeph);
-  void slotNewSBASEph(sbasephemeris* sbaseph);
+  void slotNewGPSEph(t_ephGPS);
+  void slotNewGlonassEph(t_ephGlo);
+  void slotNewGalileoEph(t_ephGal);
+  void slotNewSBASEph(t_ephSBAS);
   void slotNewOrbCorrections(QList<t_orbCorr> orbCorr);
   void slotNewClkCorrections(QList<t_clkCorr> clkCorr);
@@ -86 +86 @@
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
-  void newEphGPS(gpsephemeris gpseph);
-  void newEphGlonass(glonassephemeris glonasseph);
-  void newEphGalileo(galileoephemeris galileoeph);
-  void newEphSBAS(sbasephemeris sbaseph);
+  void newGPSEph(t_ephGPS eph);
+  void newGlonassEph(t_ephGlo eph);
+  void newSBASEph(t_ephSBAS eph);
+  void newGalileoEph(t_ephGal eph);
   void newOrbCorrections(QList<t_orbCorr> orbCorr);
   void newClkCorrections(QList<t_clkCorr> clkCorr);
@@ -106 +106 @@
  private:
   void printEphHeader();
-  void printGPSEph(gpsephemeris* ep, bool printFile);
-  void printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID);
-  void printGalileoEph(galileoephemeris* ep, bool printFile);
-  void printSBASEph(sbasephemeris* ep, bool printFile);
+  void printEph(const t_eph& eph, bool printFile);
   void printOutput(bool printFile, QTextStream* stream, 
                    const QString& strV2, const QString& strV3);
   void messagePrivate(const QByteArray& msg);
-  void checkEphemeris(gpsephemeris* oldEph, gpsephemeris* newEph);
 
   QSettings::SettingsMap _settings;
@@ -132 +128 @@
   QFile*                 _ephFileSBAS;
   QTextStream*           _ephStreamSBAS;
-  gpsephemeris*          _gpsEph[PRN_GPS_END - PRN_GPS_START + 1];
-  gpsephemeris*          _qzssEph[PRN_QZSS_END - PRN_QZSS_START + 1];
-  glonassephemeris*      _glonassEph[PRN_GLONASS_END - PRN_GLONASS_START + 1];
-  galileoephemeris*      _galileoEph[PRN_GALILEO_END - PRN_GALILEO_START + 1];
-  sbasephemeris*         _sbasEph[PRN_SBAS_END - PRN_SBAS_START + 1];
   QString                _userName;
   QString                _pgmName;
@@ -159 +150 @@
   mutable QMutex         _mutexDateAndTimeGPS;
   BNC_PPP::t_pppMain*    _pppMain;
+  bncEphUser             _ephUser;
 };