Index: /trunk/BNC/src/bncutils.h =================================================================== --- /trunk/BNC/src/bncutils.h (revision 5884) +++ /trunk/BNC/src/bncutils.h (revision 5885) @@ -99,3 +99,7 @@ SymmetricMatrix& QQ, ColumnVector& xx); +double djul(long j1, long m1, double tt); + +void jdgp(double tjul, double & second, long & nweek); + #endif Index: /trunk/BNC/src/src.pri =================================================================== --- /trunk/BNC/src/src.pri (revision 5884) +++ /trunk/BNC/src/src.pri (revision 5885) @@ -50,5 +50,5 @@ 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,4 +58,10 @@ 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,5 +87,5 @@ 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,4 +96,10 @@ 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,20 +120,4 @@ 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 } Index: unk/BNC/src/timeutils.cpp =================================================================== --- /trunk/BNC/src/timeutils.cpp (revision 5884) +++ (revision ) @@ -1,129 +1,0 @@ -/* ----------------------------------------------------------------------------- - * - * Function : djul - * - * Purpose : computes the modified julian date (mjd) from - * year, month and day - * - * Author : Z. Lukes - * - * Created : 13-OCT-2001 - * - * Changes : - * - * ---------------------------------------------------------------------------*/ - -#include - -double djul(long jj, long mm, double tt) { - long ii, kk; - double djul ; - - if( mm <= 2 ) { - jj = jj - 1; - mm = mm + 12; - } - - ii = jj/100; - kk = 2 - ii + ii/4; - djul = (365.25*jj - fmod( 365.25*jj, 1.0 )) - 679006.0; - djul = djul + floor( 30.6001*(mm + 1) ) + tt + kk; - return djul; -} - -/* ----------------------------------------------------------------------------- - * - * Function : gpjd - * - * Purpose : computes the modified julian date (mjd) from - * gpsweek number and number of seconds past last - * saturday/sunday midnight - * - * Author : Z. Lukes - * - * Created : 13-OCT-2001 - * - * Changes : - * - * ---------------------------------------------------------------------------*/ - -double gpjd(double second, int nweek) { - double deltat; - - // days since starting epoch of gps weeks (sunday 06-jan-80) - - deltat = nweek*7.0 + second/86400.0 ; - - // mod. julian date - - return( 44244.0 + deltat) ; -} - -/* ----------------------------------------------------------------------------- - * - * Function : jdgp - * - * Purpose : compute number of seconds past midnight of last - * saturday/sunday and gps week number of current - * date given in modified julian date - * - * Author : Z. Lukes - * - * Created : 13-OCT-2001 - * - * Changes : - * - * ---------------------------------------------------------------------------*/ - -void jdgp(double tjul, double & second, long & nweek) { - double deltat; - - deltat = tjul - 44244.0 ; - - // current gps week - - nweek = (long) floor(deltat/7.0); - - // seconds past midnight of last weekend - - second = (deltat - (nweek)*7.0)*86400.0; - -} - -/* ----------------------------------------------------------------------------- - * - * Function : djul - * - * Purpose : compute year,month,day of month from - * modified julian date (mjd=jul. date-2400000.5) - * - * Author : Z. Lukes - * - * Created : 13-OCT-2001 - * - * Changes : - * - * ---------------------------------------------------------------------------*/ - -void jmt(double djul, long& jj, long& mm, double& dd) { - long ih, ih1, ih2 ; - double t1, t2, t3, t4; - - t1 = 1.0 + djul - fmod( djul, 1.0 ) + 2400000.0; - t4 = fmod( djul, 1.0 ); - ih = long( (t1 - 1867216.25)/36524.25 ); - t2 = t1 + 1 + ih - ih/4; - t3 = t2 - 1720995.0; - ih1 = long( (t3 - 122.1)/365.25 ); - t1 = 365.25*ih1 - fmod( 365.25*ih1, 1.0 ); - ih2 = long( (t3 - t1)/30.6001 ); - dd = t3 - t1 - (int)( 30.6001*ih2 ) + t4; - mm = ih2 - 1; - - if ( ih2 > 13 ) mm = ih2 - 13; - - jj = ih1; - - if ( mm <= 2 ) jj = jj + 1; - -} Index: unk/BNC/src/timeutils.h =================================================================== --- /trunk/BNC/src/timeutils.h (revision 5884) +++ (revision ) @@ -1,9 +1,0 @@ -#ifndef TIMEUTILS_H -#define TIMEUTILS_H - -double djul(long j1, long m1, double tt); -double gpjd(double second, int nweek) ; -void jdgp(double tjul, double & second, long & nweek); -void jmt (double djul, long& jj, long& mm, double& dd); - -#endif