Changeset 126 in ntrip for trunk/BNC

Timestamp:

Sep 7, 2006, 7:19:55 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• bncconst.cpp (added)
• bncconst.h (added)
• bncrinex.cpp (modified) (3 diffs)

trunk/BNC/bnc.pro

@@ -4 +4 @@
 DEFINES += NO_RTCM3_MAIN
 
-HEADERS = bnchelp.html bncgetthread.h    bncwindow.h   bnctabledlg.h   \
+HEADERS = bnchelp.html bncgetthread.h    bncwindow.h   bnctabledlg.h  \
           bnccaster.h bncrinex.h bncapp.h bncutils.h                  \
+          bncconst.h                                                  \
           RTCM/format.h RTCM/GPSDecoder.h RTCM/m_data.h RTCM/RTCM.h   \
           RTCM3/rtcm3.h RTCM3/rtcm3torinex.h                          \
@@ -14 +15 @@
 SOURCES = bncmain.cpp bncgetthread.cpp  bncwindow.cpp bnctabledlg.cpp \
           bnccaster.cpp bncrinex.cpp bncapp.cpp bncutils.cpp          \
+          bncconst.cpp                                                \
           RTCM/m_date.cpp RTCM/RTCM.cpp                               \
           RTCM3/rtcm3.cpp RTCM3/rtcm3torinex.cpp                      \

trunk/BNC/bncrinex.cpp

@@ -25 +25 @@
 #include "bncrinex.h"
 #include "bncutils.h"
+#include "bncconst.h"
 
 using namespace std;
@@ -206 +207 @@
   _out << endl;
 
-  static const double const_c       = 299792458.0;
-  static const double const_freq1   = 1575420000.0;
-  static const double const_freq2   = 1227600000.0;
-  static const double const_lambda1 = const_c / const_freq1;
-  static const double const_lambda2 = const_c / const_freq2;
-
   it.toFront();
   while (it.hasNext()) {
@@ -220 +215 @@
     _out << setw(14) << setprecision(3) << ob->C1 << lli << snr;
     _out << setw(14) << setprecision(3) << ob->P2 << lli << snr; 
-    _out << setw(14) << setprecision(3) << ob->L1 / const_lambda1 << lli << snr; 
-    _out << setw(14) << setprecision(3) << ob->L2 / const_lambda2 << lli << snr; 
+    _out << setw(14) << setprecision(3) << ob->L1 / t_CST::lambda1 << lli << snr; 
+    _out << setw(14) << setprecision(3) << ob->L2 / t_CST::lambda2 << lli << snr; 
     _out << endl;