fly/flightgear
1
0
Fork 0
Code Activity

Clock also able to report local time.

Browse source
This commit is contained in:
curt 2005-11-17 22:07:27 +00:00
parent ff7dfebb90
commit ae5cf05827
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Instrumentation/clock.cxx
View file

@ -19,6 +19,7 @@ Clock::Clock ( SGPropertyNode *node )
_indicated_sec(0), _indicated_sec(0),
_indicated_min(0), _indicated_min(0),
_indicated_hour(0), _indicated_hour(0),
_local_hour(0),
_standstill_offset(0), _standstill_offset(0),
name("clock"), name("clock"),
num(0) num(0)
@ -70,8 +71,10 @@ Clock::init ()
_sec_node = node->getChild("indicated-sec", 0, true); _sec_node = node->getChild("indicated-sec", 0, true);
_min_node = node->getChild("indicated-min", 0, true); _min_node = node->getChild("indicated-min", 0, true);
_hour_node = node->getChild("indicated-hour", 0, true); _hour_node = node->getChild("indicated-hour", 0, true);
_lhour_node = node->getChild("local-hour", 0, true);
_string_node = node->getChild("indicated-string", 0, true); _string_node = node->getChild("indicated-string", 0, true);
_string_node1 = node->getChild("indicated-short-string", 0, true); _string_node1 = node->getChild("indicated-short-string", 0, true);
_string_node2 = node->getChild("local-short-string", 0, true);
} }
void void
@ -90,6 +93,12 @@ Clock::update (double delta_time_sec)
int min = t->tm_min; int min = t->tm_min;
int sec = t->tm_sec; int sec = t->tm_sec;
// compute local time zone hour
int tzoffset_hours = globals->get_time_params()->get_local_offset() / 3600;
int lhour = hour + tzoffset_hours;
if ( lhour < 0 ) { lhour += 24; }
if ( lhour >= 24 ) { lhour -= 24; }
long gmt = (hour * 60 + min) * 60 + sec; long gmt = (hour * 60 + min) * 60 + sec;
int offset = _offset_node->getLongValue(); int offset = _offset_node->getLongValue();
@ -130,12 +139,18 @@ Clock::update (double delta_time_sec)
_string_node->setStringValue(_indicated_string); _string_node->setStringValue(_indicated_string);
sprintf(_indicated_short_string, "%02d:%02d", hour, min); sprintf(_indicated_short_string, "%02d:%02d", hour, min);
_string_node1->setStringValue(_indicated_short_string); _string_node1->setStringValue(_indicated_short_string);
sprintf(_local_short_string, "%02d:%02d", lhour, min);
_string_node2->setStringValue(_local_short_string);
_is_serviceable = true; _is_serviceable = true;
_indicated_min = min; _indicated_min = min;
_min_node->setLongValue(_indicated_min); _min_node->setLongValue(_indicated_min);
_indicated_hour = hour; _indicated_hour = hour;
_hour_node->setLongValue(_indicated_hour); _hour_node->setLongValue(_indicated_hour);
_local_hour = lhour;
_lhour_node->setLongValue(_local_hour);
} }

4
src/Instrumentation/clock.hxx
View file

@ -50,8 +50,10 @@ private:
long _indicated_sec; long _indicated_sec;
long _indicated_min; long _indicated_min;
long _indicated_hour; long _indicated_hour;
long _local_hour;
char _indicated_string[16]; char _indicated_string[16];
char _indicated_short_string[16]; char _indicated_short_string[16];
char _local_short_string[16];
long _standstill_offset; long _standstill_offset;
string name; string name;
@ -61,9 +63,11 @@ private:
SGPropertyNode_ptr _offset_node; SGPropertyNode_ptr _offset_node;
SGPropertyNode_ptr _sec_node; SGPropertyNode_ptr _sec_node;
SGPropertyNode_ptr _hour_node; SGPropertyNode_ptr _hour_node;
SGPropertyNode_ptr _lhour_node;
SGPropertyNode_ptr _min_node; SGPropertyNode_ptr _min_node;
SGPropertyNode_ptr _string_node; SGPropertyNode_ptr _string_node;
SGPropertyNode_ptr _string_node1; SGPropertyNode_ptr _string_node1;
SGPropertyNode_ptr _string_node2;
}; };