Jean Pellotier: don't show markers for invalid targets in HUD

[flightgear.git] / src / Instrumentation / clock.cxx

diff --git a/src/Instrumentation/clock.cxx b/src/Instrumentation/clock.cxx
index 6f1db3e391dcbc86343ee42d3f2519575d961a53..86343cb47ebf0775cd52194365f8db62c88a3de2 100644 (file)
--- a/src/Instrumentation/clock.cxx
+++ b/src/Instrumentation/clock.cxx
@@ -5,6 +5,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include "clock.hxx"
 #include <simgear/timing/sg_time.hxx>
@@ -12,41 +15,17 @@
 #include <Main/util.hxx>
 
 
-Clock::Clock ( SGPropertyNode *node )
-    : _is_serviceable(true),
-      _gmt_time_sec(0),
-      _offset_sec(0),
-      _indicated_sec(0),
-      _standstill_offset(0),
-      name("clock"),
-      num(0)
-{
-    _indicated_string[0] = '\0';
-
-    int i;
-    for ( i = 0; i < node->nChildren(); ++i ) {
-        SGPropertyNode *child = node->getChild(i);
-        string cname = child->getName();
-        string cval = child->getStringValue();
-        if ( cname == "name" ) {
-            name = cval;
-        } else if ( cname == "number" ) {
-            num = child->getIntValue();
-        } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in clock config logic" );
-            if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
-            }
-        }
-    }
-}
-
-Clock::Clock ()
-    : _is_serviceable(true),
-      _gmt_time_sec(0),
-      _offset_sec(0),
-      _indicated_sec(0),
-      _standstill_offset(0)
+Clock::Clock(SGPropertyNode *node) :
+    _name(node->getStringValue("name", "clock")),
+    _num(node->getIntValue("number", 0)),
+    _is_serviceable(true),
+    _gmt_time_sec(0),
+    _offset_sec(0),
+    _indicated_sec(0),
+    _indicated_min(0),
+    _indicated_hour(0),
+    _local_hour(0),
+    _standstill_offset(0)
 {
     _indicated_string[0] = '\0';
 }
@@ -58,16 +37,19 @@ Clock::~Clock ()
 void
 Clock::init ()
 {
-    string branch;
-    branch = "/instrumentation/" + name;
+    std::string branch;
+    branch = "/instrumentation/" + _name;
 
-    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
     _serviceable_node = node->getChild("serviceable", 0, true);
     _offset_node = node->getChild("offset-sec", 0, true);
     _sec_node = node->getChild("indicated-sec", 0, true);
+    _min_node = node->getChild("indicated-min", 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);
-
-    _serviceable_node->setBoolValue(true);
+    _string_node1 = node->getChild("indicated-short-string", 0, true);
+    _string_node2 = node->getChild("local-short-string", 0, true);
 }
 
 void
@@ -86,6 +68,14 @@ Clock::update (double delta_time_sec)
     int min = t->tm_min;
     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;
     int offset = _offset_node->getLongValue();
 
@@ -124,7 +114,18 @@ Clock::update (double delta_time_sec)
 
     sprintf(_indicated_string, "%02d:%02d:%02d", hour, min, sec);
     _string_node->setStringValue(_indicated_string);
+    sprintf(_indicated_short_string, "%02d:%02d", hour, min);
+    _string_node1->setStringValue(_indicated_short_string);
+    sprintf(_local_short_string, "%02d:%02d", lhour, min);
+    _string_node2->setStringValue(_local_short_string);
     _is_serviceable = true;
+
+    _indicated_min = min;
+    _min_node->setLongValue(_indicated_min);
+    _indicated_hour = hour;
+    _hour_node->setLongValue(_indicated_hour);
+    _local_hour = lhour;
+    _lhour_node->setLongValue(_local_hour);
 }