FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up constructor a bit.

Browse Source
This commit is contained in:
curt 2000-08-08 03:20:02 +00:00
parent 159d3c4c6c
commit 4e23b3dff5
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
simgear/timing/sg_time.cxx
View File

@ -75,18 +75,23 @@ SGTime::SGTime( double lon, double lat, const string& root )
// cout << "Current local time = " // cout << "Current local time = "
// << asctime(localtime(&cur_time)) << endl; // << asctime(localtime(&cur_time)) << endl;
FGPath zone( root ); if ( root != "" ) {
zone.append( "zone.tab" ); FGPath zone( root );
FG_LOG( FG_EVENT, FG_DEBUG, "Reading timezone info from: " << zone.str() ); zone.append( "zone.tab" );
tzContainer = new TimezoneContainer( zone.c_str() ); FG_LOG( FG_EVENT, FG_DEBUG, "Reading timezone info from: "
<< zone.str() );
tzContainer = new TimezoneContainer( zone.c_str() );
GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon ); GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
GeoCoord* nearestTz = tzContainer->getNearest(location); GeoCoord* nearestTz = tzContainer->getNearest(location);
FGPath name( root ); FGPath name( root );
name.append( nearestTz->getDescription() ); name.append( nearestTz->getDescription() );
zonename = strdup( name.c_str() ); zonename = strdup( name.c_str() );
// cout << "Using zonename = " << zonename << endl; // cout << "Using zonename = " << zonename << endl;
} else {
tzContainer = NULL;
}
} }
@ -95,9 +100,16 @@ SGTime::SGTime( const string& root ) {
} }
SGTime::SGTime() {
SGTime( 0.0, 0.0, "" );
}
SGTime::~SGTime() SGTime::~SGTime()
{ {
delete tzContainer; if ( tzContainer != NULL ) {
delete tzContainer;
}
if ( zonename != NULL ) { if ( zonename != NULL ) {
delete zonename; delete zonename;

1
simgear/timing/sg_time.hxx
View File

@ -86,6 +86,7 @@ public:
SGTime( double lon, double lat, const string& root ); SGTime( double lon, double lat, const string& root );
SGTime( const string& root ); SGTime( const string& root );
SGTime();
~SGTime(); ~SGTime();
// Update the time related variables // Update the time related variables