Changeset 2492 in ntrip for trunk

Timestamp:

Jun 1, 2010, 8:18:33 PM (14 years ago)

Author:

stoecker

Message:

removed double storage of RTCM3 stuff

Location:

trunk/BNC

Files:

• GPSS/gpssDecoder.h (modified) (1 diff)
• RTCM/RTCM2Decoder.h (modified) (1 diff)
• RTCM/rtcm_utils.cpp (modified) (1 diff)
• RTCM3 (modified) (1 prop)
• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• RTCM3/clock_orbit_rtcm.c (deleted)
• RTCM3/clock_orbit_rtcm.h (deleted)
• RTCM3/ephemeris.h (modified) (1 diff)
• RTCM3/rtcm3torinex.c (deleted)
• RTCM3/rtcm3torinex.h (deleted)
• RTIGS/RTIGSDecoder.h (modified) (1 diff)
• bnc.pro (modified) (3 diffs)
• bncgetthread.h (modified) (1 diff)
• bncrinex.cpp (modified) (1 diff)

trunk/BNC/GPSS/gpssDecoder.h

@@ -6 +6 @@
 
 #include "RTCM/GPSDecoder.h"
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 
 class gpssDecoder : public QObject, public GPSDecoder {

trunk/BNC/RTCM/RTCM2Decoder.h

@@ -33 +33 @@
 #include "RTCM2.h"
 #include "RTCM2_2021.h"
-#include "../RTCM3/rtcm3torinex.h"
-#include "../RTCM3/ephemeris.h"
+#include "rtcm3torinex.h"
+#include "ephemeris.h"
 
 class RTCM2Decoder: public GPSDecoder {

trunk/BNC/RTCM/rtcm_utils.cpp

@@ -3 +3 @@
 #include <math.h>
 #include <stdio.h>
-#include <RTCM3/rtcm3torinex.h>
-#include <RTCM3/ephemeris.h>
+#include <rtcm3torinex.h>
+#include <ephemeris.h>
 
 #include "rtcm_utils.h"

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -307 +307 @@
                     obs->_o.L1            = _Parser.Data.measdata[ii][pos] + modulusAmb;
                     obs->_o.SNR1          = _Parser.Data.snrL1[ii];
-                    obs->_o.lock_timei_L1 = _Parser.lastlockl1[isat];
+                    obs->_o.lock_timei_L1 = _Parser.lastlockGPSl1[isat];
                   }
                   else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) {
                     obs->_o.L2            = _Parser.Data.measdata[ii][pos] + modulusAmb;
                     obs->_o.SNR2          = _Parser.Data.snrL2[ii];
-                    obs->_o.lock_timei_L2 = _Parser.lastlockl2[isat];
+                    obs->_o.lock_timei_L2 = _Parser.lastlockGPSl2[isat];
                   }
                   else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) {

trunk/BNC/RTCM3/ephemeris.h

@@ -7 +7 @@
 #include <string>
 extern "C" {
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 }
 

trunk/BNC/RTIGS/RTIGSDecoder.h

@@ -33 +33 @@
 // 2/1/2008 SPG Start
 extern "C" {
-        #include "../RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 }
 

trunk/BNC/bnc.pro

@@ -29 +29 @@
 # Include Path
 # ------------
-INCLUDEPATH = . ./newmat ./RTCM3
+INCLUDEPATH = . ./newmat ./RTCM3 ./RTCM3/clock_and_orbit ./RTCM3/rtcm3torinex
 
 HEADERS = bnchelp.html bncgetthread.h    bncwindow.h   bnctabledlg.h  \
@@ -43 +43 @@
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
-          RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex.h                   \
-          RTCM3/RTCM3coDecoder.h RTCM3/clock_orbit_rtcm.h             \
+          RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex/rtcm3torinex.h      \
+          RTCM3/RTCM3coDecoder.h                                      \
+          RTCM3/clock_and_orbit/clock_orbit_rtcm.h                    \
           RTCM3/ephemeris.h RTCM3/timeutils.h                         \
           RTIGS/RTIGSDecoder.h RTIGS/rtigs_records.h                  \
@@ -68 +69 @@
           bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
           bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \
-          bancroft.cpp bncmodel.cpp bncfigureppp.cpp                  \ 
+          bancroft.cpp bncmodel.cpp bncfigureppp.cpp                  \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
-          RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex.c                 \
-          RTCM3/RTCM3coDecoder.cpp RTCM3/clock_orbit_rtcm.c           \
+          RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex/rtcm3torinex.c    \
+          RTCM3/RTCM3coDecoder.cpp                                    \
+          RTCM3/clock_and_orbit/clock_orbit_rtcm.c                    \
           RTCM3/ephemeris.cpp RTCM3/timeutils.cpp                     \
           RTIGS/RTIGSDecoder.cpp RTIGS/cgps_transform.cpp             \

trunk/BNC/bncgetthread.h

@@ -32 +32 @@
 
 #include "RTCM/GPSDecoder.h"
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 #include "bncconst.h"
 #include "bncnetquery.h"

trunk/BNC/bncrinex.cpp

@@ -57 +57 @@
 #include "bncsettings.h"
 #include "bncversion.h"
-#include "RTCM3/rtcm3torinex.h"
+#include "rtcm3torinex.h"
 
 using namespace std;