X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Ftiming%2Fsg_time.cxx;h=d32302ee1eef9c5575a5595f82ea612ea1ce734d;hb=b47d1ad5fd8ed111cae99c1f65f5bb65a5371501;hp=37dc34546a1070edede77f027fe35c54a63e62ea;hpb=7379d8a54d2df3c041b42eb4002426b7834ba8b6;p=simgear.git diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx index 37dc3454..d32302ee 100644 --- a/simgear/timing/sg_time.cxx +++ b/simgear/timing/sg_time.cxx @@ -2,7 +2,7 @@ // // Written by Curtis Olson, started August 1997. // -// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com +// Copyright (C) 1997 Curtis L. Olson - http://www.flightgear.org/~curt // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -14,10 +14,9 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Library General Public License for more details. // -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ @@ -30,15 +29,12 @@ #include // for errno -#ifdef SG_HAVE_STD_INCLUDES -# include -# include -# include -#else -# include -# include -# include -#endif +#include +#include +#include +#include + +#include #ifdef HAVE_SYS_TIME_H # include // for get/setitimer, gettimeofday, struct timeval @@ -60,17 +56,17 @@ #include "timezone.h" #include "lowleveltime.h" - #define DEGHR(x) ((x)/15.) #define RADHR(x) DEGHR(x*SGD_RADIANS_TO_DEGREES) +using std::string; static const double MJD0 = 2415020.0; static const double J2000 = 2451545.0 - MJD0; static const double SIDRATE = 0.9972695677; -void SGTime::init( double lon, double lat, +void SGTime::init( double lon_rad, double lat_rad, const string& root, time_t init_time ) { SG_LOG( SG_EVENT, SG_INFO, "Initializing Time" ); @@ -93,25 +89,25 @@ void SGTime::init( double lon, double lat, zone.append( "zone.tab" ); SG_LOG( SG_EVENT, SG_INFO, "Reading timezone info from: " << zone.str() ); - tzContainer = new TimezoneContainer( zone.c_str() ); - - GeoCoord location( SGD_RADIANS_TO_DEGREES * lat, SGD_RADIANS_TO_DEGREES * lon ); - GeoCoord* nearestTz = tzContainer->getNearest(location); + tzContainer = new SGTimeZoneContainer( zone.c_str() ); + SGGeod location(SGGeod::fromRad(lon_rad, lat_rad)); + SGTimeZone* nearestTz = tzContainer->getNearest(location); SGPath name( root ); name.append( nearestTz->getDescription() ); - zonename = strdup( name.c_str() ); + zonename = name.str(); SG_LOG( SG_EVENT, SG_INFO, "Using zonename = " << zonename ); } else { SG_LOG( SG_EVENT, SG_INFO, "*** NO TIME ZONE NAME ***" ); tzContainer = NULL; - zonename = NULL; + zonename.erase(); } } -SGTime::SGTime( double lon, double lat, const string& root, time_t init_time ) +SGTime::SGTime( double lon_rad, double lat_rad, const string& root, + time_t init_time ) { - init( lon, lat, root, init_time ); + init( lon_rad, lat_rad, root, init_time ); } @@ -127,17 +123,7 @@ SGTime::SGTime() { SGTime::~SGTime() { - if ( tzContainer != NULL ) { - TimezoneContainer *tmp = tzContainer; - tzContainer = NULL; - delete tmp; - } - - if ( zonename != NULL ) { - char *tmp = zonename; - zonename = NULL; - free(tmp); - } + delete tzContainer; } @@ -201,12 +187,14 @@ static double sidereal_course( time_t cur_time, const struct tm *gmt, double lng // Update the time related variables -void SGTime::update( double lon, double lat, time_t ct, long int warp ) { +void SGTime::update( double lon_rad, double lat_rad, + time_t ct, long int warp ) +{ double gst_precise, gst_course; -#if defined(_MSC_VER) || defined(__MINGW32__) + tm * gmt = &m_gmt; -#endif + SG_LOG( SG_EVENT, SG_DEBUG, "Updating time" ); @@ -222,11 +210,8 @@ void SGTime::update( double lon, double lat, time_t ct, long int warp ) { << " warp = " << warp ); // get GMT break down for current time -#if defined(_MSC_VER) || defined(__MINGW32__) + memcpy( gmt, gmtime(&cur_time), sizeof(tm) ); -#else - gmt = gmtime(&cur_time); -#endif SG_LOG( SG_EVENT, SG_DEBUG, " Current GMT = " << gmt->tm_mon+1 << "/" << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " " @@ -256,60 +241,59 @@ void SGTime::update( double lon, double lat, time_t ct, long int warp ) { gst_diff = gst_precise - gst_course; - lst = sidereal_course( cur_time, gmt, -(lon * SGD_RADIANS_TO_DEGREES) ) + gst_diff; + lst = sidereal_course( cur_time, gmt, + -(lon_rad * SGD_RADIANS_TO_DEGREES) ) + gst_diff; } else { // course + difference should drift off very slowly gst = sidereal_course( cur_time, gmt, 0.00 ) + gst_diff; - lst = sidereal_course( cur_time, gmt, -(lon * SGD_RADIANS_TO_DEGREES) ) + gst_diff; + lst = sidereal_course( cur_time, gmt, + -(lon_rad * SGD_RADIANS_TO_DEGREES) ) + gst_diff; } SG_LOG( SG_EVENT, SG_DEBUG, " Current lon=0.00 Sidereal Time = " << gst ); SG_LOG( SG_EVENT, SG_DEBUG, " Current LOCAL Sidereal Time = " << lst << " (" - << sidereal_precise( mjd, -(lon * SGD_RADIANS_TO_DEGREES) ) + << sidereal_precise( mjd, -(lon_rad * SGD_RADIANS_TO_DEGREES) ) << ") (diff = " << gst_diff << ")" ); } // Given lon/lat, update timezone information and local_offset -void SGTime::updateLocal( double lon, double lat, const string& root ) { +void SGTime::updateLocal( double lon_rad, double lat_rad, const string& root ) { // sanity checking - if ( lon < -SGD_PI || lon > SGD_PI ) { + if ( lon_rad < -SGD_PI || lon_rad> SGD_PI ) { // not within -180 ... 180 - lon = 0.0; + lon_rad = 0.0; } - if ( lat < -SGD_PI * 0.5 || lat > SGD_PI * 0.5 ) { + if ( lat_rad < -SGD_PI_2 || lat_rad > SGD_PI_2 ) { // not within -90 ... 90 - lat = 0.0; + lat_rad = 0.0; } - if ( lon != lon ) { - // only true if lon == nan - SG_LOG( SG_EVENT, SG_ALERT, " Detected lon == nan, resetting to 0.0" ); - lon = 0.0; + if ( lon_rad != lon_rad ) { + // only true if lon_rad == nan + SG_LOG( SG_EVENT, SG_ALERT, + " Detected lon_rad == nan, resetting to 0.0" ); + lon_rad = 0.0; } - if ( lat != lat ) { - // only true if lat == nan - SG_LOG( SG_EVENT, SG_ALERT, " Detected lat == nan, resetting to 0.0" ); - lat = 0.0; + if ( lat_rad != lat_rad ) { + // only true if lat_rad == nan + SG_LOG( SG_EVENT, SG_ALERT, + " Detected lat_rad == nan, resetting to 0.0" ); + lat_rad = 0.0; } time_t currGMT; time_t aircraftLocalTime; - GeoCoord location( SGD_RADIANS_TO_DEGREES * lat, SGD_RADIANS_TO_DEGREES * lon ); - GeoCoord* nearestTz = tzContainer->getNearest(location); + SGGeod location(SGGeod::fromRad(lon_rad, lat_rad)); + SGTimeZone* nearestTz = tzContainer->getNearest(location); SGPath zone( root ); zone.append ( nearestTz->getDescription() ); - if ( zonename ) { - char *ptr = zonename; - zonename = NULL; - free(ptr); - } - zonename = strdup( zone.c_str() ); + zonename = zone.str(); //Avoid troubles when zone.tab hasn't got the right line endings - if (zonename[strlen(zonename)-1] == '\r') + if (zonename[zonename.size()-1] == '\r') { - zonename[strlen(zonename)-1]=0; + zonename[zonename.size()-1]=0; zone.set( zonename ); } @@ -376,12 +360,8 @@ double sgTimeCalcMJD(int mn, double dy, int yr) { // since 1900 jan 0.5), mjd. double sgTimeCurrentMJD( time_t ct, long int warp ) { -#if defined(_MSC_VER) || defined(__MINGW32__) struct tm m_gmt; // copy of system gmtime(&time_t) structure struct tm *gmt = &m_gmt; -#else - struct tm *gmt; -#endif // get current Unix calendar time (in seconds) // warp += warp_delta; @@ -396,11 +376,7 @@ double sgTimeCurrentMJD( time_t ct, long int warp ) { << " warp = " << warp ); // get GMT break down for current time -#if defined(_MSC_VER) || defined(__MINGW32__) memcpy( gmt, gmtime(&cur_time), sizeof(tm) ); -#else - gmt = gmtime(&cur_time); -#endif SG_LOG( SG_EVENT, SG_DEBUG, " Current GMT = " << gmt->tm_mon+1 << "/" << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " " @@ -532,7 +508,7 @@ time_t sgTimeGetGMT(int year, int month, int day, int hour, int min, int sec) #else // ! defined ( MK_TIME_IS_GMT ) // timezone seems to work as a proper offset for Linux & Solaris -# if defined( __linux__ ) || defined( __sun__ ) ||defined(__CYGWIN__) +# if defined( __linux__ ) || defined(__sun) ||defined(__CYGWIN__) # define TIMEZONE_OFFSET_WORKS 1 # endif