Make more use of SGGeod

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

diff --git a/src/Instrumentation/heading_indicator.cxx b/src/Instrumentation/heading_indicator.cxx
index 66fdd833c70c461d833941cc0ad728e58cb0d70e..4ab01a60f43115ca8cc5326266d86e567d0ce1bb 100644 (file)
--- a/src/Instrumentation/heading_indicator.cxx
+++ b/src/Instrumentation/heading_indicator.cxx
@@ -3,11 +3,42 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#include <simgear/compiler.h>
+#include STL_IOSTREAM
+#include STL_STRING
+#include <sstream>
+
 #include "heading_indicator.hxx"
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
 
 
+HeadingIndicator::HeadingIndicator ( SGPropertyNode *node )
+    :
+    name("heading-indicator"),
+    num(0),
+    vacuum_system("/systems/vacuum")
+{
+    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 if ( cname == "vacuum-system" ) {
+            vacuum_system = cval;
+        } else {
+            SG_LOG( SG_INSTR, SG_WARN, "Error in heading-indicator config logic" );
+            if ( name.length() ) {
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
+            }
+        }
+    }
+}
+
 HeadingIndicator::HeadingIndicator ()
 {
 }
@@ -19,13 +50,15 @@ HeadingIndicator::~HeadingIndicator ()
 void
 HeadingIndicator::init ()
 {
-    _offset_node =
-        fgGetNode("/instrumentation/heading-indicator/offset-deg", true);
+    string branch;
+    branch = "/instrumentation/" + name;
+    vacuum_system += "/suction-inhg";
+
+    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    _offset_node = node->getChild("offset-deg", 0, true);
     _heading_in_node = fgGetNode("/orientation/heading-deg", true);
-    _suction_node = fgGetNode("/systems/vacuum[0]/suction-inhg", true);
-    _heading_out_node =
-        fgGetNode("/instrumentation/heading-indicator/indicated-heading-deg",
-                  true);
+    _suction_node = fgGetNode(vacuum_system.c_str(), true);
+    _heading_out_node = node->getChild("indicated-heading-deg", 0, true);
     _last_heading_deg = (_heading_in_node->getDoubleValue() +
                          _offset_node->getDoubleValue());
 }
@@ -33,17 +66,27 @@ HeadingIndicator::init ()
 void
 HeadingIndicator::bind ()
 {
-    fgTie("/instrumentation/heading-indicator/serviceable",
-          &_gyro, &Gyro::is_serviceable);
-    fgTie("/instrumentation/heading-indicator/spin",
+    std::ostringstream temp;
+    string branch;
+    temp << num;
+    branch = "/instrumentation/" + name + "[" + temp.str() + "]";
+
+    fgTie((branch + "/serviceable").c_str(),
+          &_gyro, &Gyro::is_serviceable, &Gyro::set_serviceable);
+    fgTie((branch + "/spin").c_str(),
           &_gyro, &Gyro::get_spin_norm, &Gyro::set_spin_norm);
 }
 
 void
 HeadingIndicator::unbind ()
 {
-    fgUntie("/instrumentation/heading-indicator/serviceable");
-    fgUntie("/instrumentation/heading-indicator/spin");
+    std::ostringstream temp;
+    string branch;
+    temp << num;
+    branch = "/instrumentation/" + name + "[" + temp.str() + "]";
+
+    fgUntie((branch + "/serviceable").c_str());
+    fgUntie((branch + "/spin").c_str());
 }
 
 void