ADF: code clean-up/documentation

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

diff --git a/src/Instrumentation/vertical_speed_indicator.cxx b/src/Instrumentation/vertical_speed_indicator.cxx
index 2092b439fd5a2019c5a677577d83ce205e167117..f5991265107fded22a674b2a4bf5e6dc06ea4621 100644 (file)
--- a/src/Instrumentation/vertical_speed_indicator.cxx
+++ b/src/Instrumentation/vertical_speed_indicator.cxx
@@ -3,15 +3,23 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/math/interpolater.hxx>
 
 #include "vertical_speed_indicator.hxx"
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
 
+using std::string;
 
-VerticalSpeedIndicator::VerticalSpeedIndicator ()
-    : _internal_pressure_inhg(29.92)
+VerticalSpeedIndicator::VerticalSpeedIndicator ( SGPropertyNode *node )
+    : _internal_pressure_inhg(29.92),
+      _name(node->getStringValue("name", "vertical-speed-indicator")),
+      _num(node->getIntValue("number", 0)),
+      _static_pressure(node->getStringValue("static-pressure", "/systems/static/pressure-inhg"))
 {
 }
 
@@ -22,14 +30,17 @@ VerticalSpeedIndicator::~VerticalSpeedIndicator ()
 void
 VerticalSpeedIndicator::init ()
 {
-    _serviceable_node =
-        fgGetNode("/instrumentation/vertical-speed-indicator/serviceable",
-                  true);
-    _pressure_node =
-        fgGetNode("/systems/static/pressure-inhg", true);
-    _speed_node =
-        fgGetNode("/instrumentation/vertical-speed-indicator/indicated-speed-fpm",
-                  true);
+    string branch;
+    branch = "/instrumentation/" + _name;
+
+    SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
+    _serviceable_node = node->getChild("serviceable", 0, true);
+    _pressure_node = fgGetNode(_static_pressure.c_str(), true);
+    _speed_node = node->getChild("indicated-speed-fpm", 0, true);
+    _speed_up_node = fgGetNode("/sim/speed-up", true);
+
+                                // Initialize at ambient pressure
+    _internal_pressure_inhg = _pressure_node->getDoubleValue();
 }
 
 void
@@ -39,6 +50,9 @@ VerticalSpeedIndicator::update (double dt)
                                 // from 10000 to 10500 for manual factor
     if (_serviceable_node->getBoolValue()) {
         double pressure = _pressure_node->getDoubleValue();
+        double speed_up = _speed_up_node->getDoubleValue();
+        if( speed_up > 1 )
+            dt *= speed_up;
         _speed_node
             ->setDoubleValue((_internal_pressure_inhg - pressure) * 10500);
         _internal_pressure_inhg =