Changeset 2899 in ntrip

Timestamp:

Jan 26, 2011, 6:24:04 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bnc.pro (modified) (3 diffs)
• bncapp.cpp (modified) (4 diffs)

trunk/BNC/bnc.pro

@@ -41 +41 @@
           bncfigurelate.h bncpppclient.h bncversion.h                 \ 
           bancroft.h bncmodel.h bncfigureppp.h bncrawfile.h           \ 
-          bnctides.h bncmap.h bncmapview.h bnccomb.h bncantex.h       \
+          bnctides.h bncmap.h bncmapview.h bncantex.h                 \
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -67 +67 @@
           bncnetqueryrtp.cpp bncsettings.cpp latencychecker.cpp       \
           bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp          \
-          bncnetqueryudp0.cpp bncudpport.cpp bncantex.cpp             \
+          bncnetqueryudp0.cpp bncudpport.cpp                          \
           bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
           bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \
           bancroft.cpp bncmodel.cpp bncfigureppp.cpp bncrawfile.cpp   \
-          bnctides.cpp bncmap.cpp bncmapview.cpp bnccomb.cpp          \
+          bnctides.cpp bncmap.cpp bncmapview.cpp bncantex.cpp         \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
@@ -98 +98 @@
 QT += network
 
+DEFINES += USE_COMBINATION
+HEADERS += combination/bnccomb.h 
+SOURCES += combination/bnccomb.cpp
+

trunk/BNC/bncapp.cpp

@@ -48 +48 @@
 #include "bncsettings.h" 
 #include "bncversion.h" 
-#include "bnccomb.h" 
+
+#ifdef USE_COMBINATION
+#include "combination/bnccomb.h" 
+#endif
 
 using namespace std;
@@ -112 +115 @@
   }
 
+#ifdef USE_COMBINATION
   _bncComb = new bncComb();
+#endif
 }
 
@@ -146 +151 @@
   delete _rawFile;
 
+#ifdef USE_COMBINATION
   delete _bncComb;
+#endif
 }
 
@@ -735 +742 @@
   // Combination of Corrections
   // --------------------------
+#ifdef USE_COMBINATION
   if (_bncComb) {
     _bncComb->processCorrLine(staID, line);
   }
+#endif
 
   bncSettings settings;