Changeset 7298 in ntrip for trunk/BNC/src

Timestamp:

Sep 22, 2015, 10:44:09 PM (9 years ago)

Author:

stuerze

Message:

some restructuring

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (6 diffs)
• bnccore.h (modified) (5 diffs)
• bncwindow.cpp (modified) (1 diff)
• src.pri (modified) (7 diffs)

trunk/BNC/src/bnccore.cpp

@@ -53 +53 @@
 #include "rinex/rnxnavfile.h"
 #include "pppMain.h"
-
-#ifdef USE_COMBINATION
-#  include "combination/bnccomb.h"
-#endif
+#include "combination/bnccomb.h"
 
 using namespace std;
@@ -76 +73 @@
   _rawFile     = 0;
   _caster      = 0;
-#ifdef USE_COMBINATION
   _bncComb     = 0;
-#endif
 
   // Eph file(s)
@@ -145 +140 @@
   delete _dateAndTimeGPS;
   delete _rawFile;
-
-#ifdef USE_COMBINATION
   delete _bncComb;
-#endif
 }
 
@@ -707 +699 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::initCombination() {
-#ifdef USE_COMBINATION
   _bncComb = new bncComb();
   if (_bncComb->nStreams() < 1) {
@@ -713 +704 @@
     _bncComb = 0;
   }
-#endif
 }
 
@@ -719 +709 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::stopCombination() {
-#ifdef USE_COMBINATION
   delete _bncComb;
   _bncComb = 0;
-#endif
 }
 

trunk/BNC/src/bnccore.h

@@ -46 +46 @@
   enum e_mode {interactive, nonInteractive, batchPostProcessing};
   t_bncCore();
-  ~t_bncCore();  
+  ~t_bncCore();
   static t_bncCore* instance();
   e_mode            mode() const {return _mode;}
@@ -60 +60 @@
   void              setConfFileName(const QString& confFileName);
   QString           confFileName() const {return _confFileName;}
-  void              writeRawData(const QByteArray& data, const QByteArray& staID, 
+  void              writeRawData(const QByteArray& data, const QByteArray& staID,
                                 const QByteArray& format);
   void             initCombination();
@@ -107 +107 @@
   void mapSpeedSliderChanged(int);
   void stopRinexPPP();
-    
+
  private slots:
   void slotNewConnectionEph();
@@ -116 +116 @@
   void  printEphHeader();
   void  printEph(const t_eph& eph, bool printFile);
-  void  printOutputEph(bool printFile, QTextStream* stream, 
+  void  printOutputEph(bool printFile, QTextStream* stream,
                        const QString& strV2, const QString& strV3);
   void  messagePrivate(const QByteArray& msg);
@@ -145 +145 @@
   QTcpServer*            _serverCorr;
   QList<QTcpSocket*>*    _socketsCorr;
-  int                    _portNMEA;
   QTcpServer*            _serverNMEA;
   QList<QTcpSocket*>*    _socketsNMEA;

trunk/BNC/src/bncwindow.cpp

@@ -619 +619 @@
   _aogroup->addTab(pppGroup3,tr("PPP (3)"));
   _aogroup->addTab(pppGroup4,tr("PPP (4)"));
-
-#ifdef USE_COMBINATION
   _aogroup->addTab(cmbgroup,tr("Combine Corrections"));
-#endif
   _aogroup->addTab(uploadgroup,tr("Upload Corrections"));
   _aogroup->addTab(uploadEphgroup,tr("Upload Ephemeris"));

trunk/BNC/src/src.pri

@@ -40 +40 @@
           bncnetquery.h bncnetqueryv1.h bncnetqueryv2.h               \
           bncnetqueryrtp.h bncsettings.h latencychecker.h             \
-          bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \ 
-          bncnetqueryudp0.h bncudpport.h bnctime.h                    \ 
-          bncserialport.h bncnetquerys.h bncfigure.h                  \ 
-          bncfigurelate.h bncversion.h                                \ 
-          bncfigureppp.h bncrawfile.h                                 \ 
+          bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \
+          bncnetqueryudp0.h bncudpport.h bnctime.h                    \
+          bncserialport.h bncnetquerys.h bncfigure.h                  \
+          bncfigurelate.h bncversion.h                                \
+          bncfigureppp.h bncrawfile.h                                 \
           bncmap.h bncantex.h bncephuser.h                            \
           bncoutf.h bncclockrinex.h bncsp3.h bncsinextro.h            \
@@ -65 +65 @@
           rinex/graphwin.h         rinex/polarplot.h                  \
           rinex/availplot.h        rinex/eleplot.h                    \
-          rinex/dopplot.h          orbComp/sp3Comp.h
+          rinex/dopplot.h          orbComp/sp3Comp.h                  \
+          combination/bnccomb.h
 
 HEADERS       += serial/qextserialbase.h serial/qextserialport.h
@@ -71 +72 @@
 win32:HEADERS += serial/win_qextserialport.h
 
-SOURCES =             bncgetthread.cpp  bncwindow.cpp bnctabledlg.cpp \
+SOURCES = bncgetthread.cpp  bncwindow.cpp bnctabledlg.cpp             \
           bnccaster.cpp bncrinex.cpp bnccore.cpp bncutils.cpp         \
           bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp     \
@@ -101 +102 @@
           rinex/graphwin.cpp       rinex/polarplot.cpp                \
           rinex/availplot.cpp      rinex/eleplot.cpp                  \
-          rinex/dopplot.cpp        orbComp/sp3Comp.cpp
+          rinex/dopplot.cpp        orbComp/sp3Comp.cpp                \
+          combination/bnccomb.cpp
 
 SOURCES       += serial/qextserialbase.cpp serial/qextserialport.cpp
@@ -111 +113 @@
 QT += network
 
-exists(combination/bnccomb.h) {
-  DEFINES += USE_COMBINATION
-  HEADERS += combination/bnccomb.h
-  SOURCES += combination/bnccomb.cpp
-}
-
 exists(PPP) {
   INCLUDEPATH += PPP
@@ -122 +118 @@
   HEADERS += PPP/pppClient.h    PPP/pppObsPool.h   PPP/pppEphPool.h   \
              PPP/pppStation.h   PPP/pppFilter.h    PPP/pppParlist.h   \
-             PPP/pppSatObs.h           
+             PPP/pppSatObs.h
   SOURCES += PPP/pppClient.cpp  PPP/pppObsPool.cpp PPP/pppEphPool.cpp \
-             PPP/pppStation.cpp PPP/pppFilter.cpp  PPP/pppParlist.cpp \ 
-             PPP/pppSatObs.cpp      
+             PPP/pppStation.cpp PPP/pppFilter.cpp  PPP/pppParlist.cpp \
+             PPP/pppSatObs.cpp
 }
 else {
@@ -149 +145 @@
 
 macx {
-  exists("$$[QT_INSTALL_LIBS]/QtWebKit.framework") { 
+  exists("$$[QT_INSTALL_LIBS]/QtWebKit.framework") {
     DEFINES += QT_WEBKIT
   }