Changeset 5885 in ntrip for trunk

Timestamp:

Aug 8, 2014, 4:12:58 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncutils.h (modified) (1 diff)
• src.pri (modified) (5 diffs)
• timeutils.cpp (deleted)
• timeutils.h (deleted)

trunk/BNC/src/bncutils.h

@@ -99 +99 @@
                     SymmetricMatrix& QQ, ColumnVector& xx);
 
+double       djul(long j1, long m1, double tt);
+
+void         jdgp(double tjul, double & second, long & nweek);
+
 #endif

trunk/BNC/src/src.pri

@@ -50 +50 @@
           bncbytescounter.h bncsslconfig.h reqcdlg.h                  \
           upload/bncrtnetdecoder.h upload/bncuploadcaster.h           \
-          ephemeris.h timeutils.h t_prn.h                             \
+          ephemeris.h t_prn.h                                         \
           upload/bncrtnetuploadcaster.h upload/bnccustomtrafo.h       \
           upload/bncephuploadcaster.h bnccomb.h qtfilechooser.h       \
@@ -58 +58 @@
           RTCM3/RTCM3coDecoder.h RTCM3/ephEncoder.h                   \
           RTCM3/clock_and_orbit/clock_orbit_rtcm.h                    \
+          rinex/rnxobsfile.h                                          \
+          rinex/rnxnavfile.h       rinex/corrfile.h                   \
+          rinex/reqcedit.h         rinex/reqcanalyze.h                \
+          rinex/graphwin.h         rinex/polarplot.h                  \
+          rinex/availplot.h        rinex/eleplot.h                    \
+          rinex/dopplot.h                                             \
           PPP/pppInclude.h   PPP/pppOptions.h   PPP/pppMain.h         \
           PPP/pppWidgets.h   PPP/pppThread.h    PPP/pppClient.h       \
@@ -81 +87 @@
           bncephuser.cpp bncoutf.cpp bncclockrinex.cpp bncsp3.cpp     \
           bncbytescounter.cpp bncsslconfig.cpp reqcdlg.cpp            \
-          ephemeris.cpp timeutils.cpp t_prn.cpp                       \
+          ephemeris.cpp t_prn.cpp                                     \
           upload/bncrtnetdecoder.cpp upload/bncuploadcaster.cpp       \
           upload/bncrtnetuploadcaster.cpp upload/bnccustomtrafo.cpp   \
@@ -90 +96 @@
           RTCM3/RTCM3coDecoder.cpp RTCM3/ephEncoder.cpp               \
           RTCM3/clock_and_orbit/clock_orbit_rtcm.c                    \
+          rinex/rnxobsfile.cpp                                        \
+          rinex/rnxnavfile.cpp     rinex/corrfile.cpp                 \
+          rinex/reqcedit.cpp       rinex/reqcanalyze.cpp              \
+          rinex/graphwin.cpp       rinex/polarplot.cpp                \
+          rinex/availplot.cpp      rinex/eleplot.cpp                  \
+          rinex/dopplot.cpp                                           \
                              PPP/pppOptions.cpp PPP/pppMain.cpp       \
           PPP/pppWidgets.cpp PPP/pppThread.cpp  PPP/pppClient.cpp     \
@@ -108 +120 @@
   HEADERS += combination/bnccomb.h
   SOURCES += combination/bnccomb.cpp
-}
-
-exists(rinex/rnxobsfile.h) {
-  DEFINES += USE_POSTPROCESSING
-  HEADERS += rinex/rnxobsfile.h                            \
-             rinex/rnxnavfile.h       rinex/corrfile.h     \
-             rinex/reqcedit.h         rinex/reqcanalyze.h  \
-             rinex/graphwin.h         rinex/polarplot.h    \
-             rinex/availplot.h        rinex/eleplot.h      \
-             rinex/dopplot.h
-  SOURCES += rinex/rnxobsfile.cpp                           \
-             rinex/rnxnavfile.cpp     rinex/corrfile.cpp    \
-             rinex/reqcedit.cpp       rinex/reqcanalyze.cpp \
-             rinex/graphwin.cpp       rinex/polarplot.cpp   \
-             rinex/availplot.cpp      rinex/eleplot.cpp     \
-             rinex/dopplot.cpp
 }