replaced SGValue with SGPropertyNode throughout.

[flightgear.git] / src / Cockpit / panel.cxx

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 8cfc864a892987f6e092786feb9b1c1a00df9a39..869aa7114db6c80c868c3576f1895a23c63e76a2 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -32,7 +32,7 @@
 #include <plib/fnt.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -46,7 +46,8 @@
 bool
 fgPanelVisible ()
 {
-  return ((globals->get_options()->get_panel_status()) &&
+  return ((current_panel != 0) &&
+         (current_panel->getVisibility()) &&
          (globals->get_viewmgr()->get_current() == 0) &&
          (globals->get_current_view()->get_view_offset() == 0.0));
 }
@@ -64,15 +65,16 @@ FGTextureManager::createTexture (const string &relativePath)
 {
   ssgTexture * texture = _textureMap[relativePath];
   if (texture == 0) {
-    cerr << "Texture " << relativePath << " does not yet exist" << endl;
-    FGPath tpath(globals->get_options()->get_fg_root());
+    SG_LOG( SG_COCKPIT, SG_DEBUG,
+            "Texture " << relativePath << " does not yet exist" );
+    SGPath tpath(globals->get_fg_root());
     tpath.append(relativePath);
     texture = new ssgTexture((char *)tpath.c_str(), false, false);
     _textureMap[relativePath] = texture;
     if (_textureMap[relativePath] == 0) 
-      cerr << "Texture *still* doesn't exist" << endl;
-    cerr << "Created texture " << relativePath
-        << " handle=" << texture->getHandle() << endl;
+      SG_LOG( SG_COCKPIT, SG_ALERT, "Texture *still* doesn't exist" );
+    SG_LOG( SG_COCKPIT, SG_DEBUG, "Created texture " << relativePath
+            << " handle=" << texture->getHandle() );
   }
 
   return texture;
@@ -134,7 +136,8 @@ FGPanel::FGPanel (int window_x, int window_y, int window_w, int window_h)
     _mouseInstrument(0),
     _winx(window_x), _winy(window_y), _winw(window_w), _winh(window_h),
     _width(_winw), _height(int(_winh * 0.5768 + 1)),
-    _x_offset(0), _y_offset(0), _view_height(int(_winh * 0.4232))
+    _x_offset(0), _y_offset(0), _view_height(int(_winh * 0.4232)),
+    _bound(false)
 {
   setVisibility(fgPanelVisible());
 }
@@ -145,7 +148,8 @@ FGPanel::FGPanel (int window_x, int window_y, int window_w, int window_h)
  */
 FGPanel::~FGPanel ()
 {
-  unbind();
+  if (_bound)
+    unbind();
   for (instrument_list_type::iterator it = _instruments.begin();
        it != _instruments.end();
        it++) {
@@ -184,6 +188,7 @@ FGPanel::bind ()
   fgTie("/sim/panel/visibility", &_visibility);
   fgTie("/sim/panel/x-offset", &_x_offset);
   fgTie("/sim/panel/y-offset", &_y_offset);
+  _bound = true;
 }
 
 
@@ -196,6 +201,7 @@ FGPanel::unbind ()
   fgUntie("/sim/panel/visibility");
   fgUntie("/sim/panel/x-offset");
   fgUntie("/sim/panel/y-offset");
+  _bound = false;
 }
 
 
@@ -237,7 +243,7 @@ FGPanel::update ()
   glEnable(GL_ALPHA_TEST);
   glEnable(GL_COLOR_MATERIAL);
   // glColor4f(1.0, 1.0, 1.0, 1.0);
-  if ( cur_light_params.sun_angle * RAD_TO_DEG < 95.0 ) {
+  if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
       glColor4fv( cur_light_params.scene_diffuse );
   } else {
       glColor4f(0.7, 0.2, 0.2, 1.0);
@@ -342,8 +348,8 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
   }
 
                                // Scale for the real window size.
-  x = int(((float)x / globals->get_options()->get_xsize()) * _winw);
-  y = int(_winh - (((float)y / globals->get_options()->get_ysize())
+  x = int(((float)x / fgGetInt("/sim/startup/xsize")) * _winw);
+  y = int(_winh - (((float)y / fgGetInt("/sim/startup/ysize"))
                   * _winh));
 
                                // Adjust for offsets.
@@ -398,10 +404,10 @@ FGPanelAction::~FGPanelAction ()
 ////////////////////////////////////////////////////////////////////////
 
 FGAdjustAction::FGAdjustAction (int button, int x, int y, int w, int h,
-                               SGValue * value, float increment, 
+                               SGPropertyNode * node, float increment, 
                                float min, float max, bool wrap)
   : FGPanelAction(button, x, y, w, h),
-    _value(value), _increment(increment), _min(min), _max(max), _wrap(wrap)
+    _node(node), _increment(increment), _min(min), _max(max), _wrap(wrap)
 {
 }
 
@@ -412,14 +418,14 @@ FGAdjustAction::~FGAdjustAction ()
 void
 FGAdjustAction::doAction ()
 {
-  float val = _value->getFloatValue();
+  float val = _node->getFloatValue();
   val += _increment;
   if (val < _min) {
     val = (_wrap ? _max : _min);
   } else if (val > _max) {
     val = (_wrap ? _min : _max);
   }
-  _value->setDoubleValue(val);
+  _node->setDoubleValue(val);
 }
 
 
@@ -429,8 +435,8 @@ FGAdjustAction::doAction ()
 ////////////////////////////////////////////////////////////////////////
 
 FGSwapAction::FGSwapAction (int button, int x, int y, int w, int h,
-                           SGValue * value1, SGValue * value2)
-  : FGPanelAction(button, x, y, w, h), _value1(value1), _value2(value2)
+                           SGPropertyNode * node1, SGPropertyNode * node2)
+  : FGPanelAction(button, x, y, w, h), _node1(node1), _node2(node2)
 {
 }
 
@@ -441,9 +447,9 @@ FGSwapAction::~FGSwapAction ()
 void
 FGSwapAction::doAction ()
 {
-  float val = _value1->getFloatValue();
-  _value1->setDoubleValue(_value2->getFloatValue());
-  _value2->setDoubleValue(val);
+  float val = _node1->getFloatValue();
+  _node1->setDoubleValue(_node2->getFloatValue());
+  _node2->setDoubleValue(val);
 }
 
 
@@ -453,8 +459,8 @@ FGSwapAction::doAction ()
 ////////////////////////////////////////////////////////////////////////
 
 FGToggleAction::FGToggleAction (int button, int x, int y, int w, int h,
-                               SGValue * value)
-  : FGPanelAction(button, x, y, w, h), _value(value)
+                               SGPropertyNode * node)
+  : FGPanelAction(button, x, y, w, h), _node(node)
 {
 }
 
@@ -465,7 +471,7 @@ FGToggleAction::~FGToggleAction ()
 void
 FGToggleAction::doAction ()
 {
-  _value->setBoolValue(!(_value->getBoolValue()));
+  _node->setBoolValue(!(_node->getBoolValue()));
 }
 
 
@@ -475,6 +481,7 @@ FGToggleAction::doAction ()
 ////////////////////////////////////////////////////////////////////////
 
 FGPanelTransformation::FGPanelTransformation ()
+  : table(0)
 {
 }
 
@@ -657,13 +664,17 @@ FGInstrumentLayer::transform () const
   transformation_list::const_iterator last = _transformations.end();
   while (it != last) {
     FGPanelTransformation *t = *it;
-    float val = (t->value == 0 ? 0.0 : t->value->getFloatValue());
+    float val = (t->node == 0 ? 0.0 : t->node->getFloatValue());
     if (val < t->min) {
       val = t->min;
     } else if (val > t->max) {
       val = t->max;
     }
-    val = val * t->factor + t->offset;
+    if(t->table==0) {
+       val = val * t->factor + t->offset;
+    } else {
+       val = t->table->interpolate(val) * t->factor + t->offset;
+    }
 
     switch (t->type) {
     case FGPanelTransformation::XSHIFT:
@@ -717,7 +728,7 @@ FGTexturedLayer::draw ()
 
                                // From Curt: turn on the panel
                                // lights after sundown.
-  if ( cur_light_params.sun_angle * RAD_TO_DEG < 95.0 ) {
+  if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
       glColor4fv( cur_light_params.scene_diffuse );
   } else {
       glColor4f(0.7, 0.2, 0.2, 1.0);
@@ -830,7 +841,7 @@ FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
     _fmt = "%s";
 }
 
-FGTextLayer::Chunk::Chunk (ChunkType type, const SGValue * value,
+FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
                           const string &fmt, float mult)
   : _type(type), _fmt(fmt), _mult(mult)
 {
@@ -840,7 +851,7 @@ FGTextLayer::Chunk::Chunk (ChunkType type, const SGValue * value,
     else
       _fmt = "%.2f";
   }
-  _value = value;
+  _node = node;
 }
 
 const char *
@@ -851,10 +862,10 @@ FGTextLayer::Chunk::getValue () const
     sprintf(_buf, _fmt.c_str(), _text.c_str());
     return _buf;
   case TEXT_VALUE:
-    sprintf(_buf, _fmt.c_str(), _value->getStringValue().c_str());
+    sprintf(_buf, _fmt.c_str(), _node->getStringValue().c_str());
     break;
   case DOUBLE_VALUE:
-    sprintf(_buf, _fmt.c_str(), _value->getFloatValue() * _mult);
+    sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
     break;
   }
   return _buf;
@@ -866,10 +877,10 @@ FGTextLayer::Chunk::getValue () const
 // Implementation of FGSwitchLayer.
 ////////////////////////////////////////////////////////////////////////
 
-FGSwitchLayer::FGSwitchLayer (int w, int h, const SGValue * value,
+FGSwitchLayer::FGSwitchLayer (int w, int h, const SGPropertyNode * node,
                              FGInstrumentLayer * layer1,
                              FGInstrumentLayer * layer2)
-  : FGInstrumentLayer(w, h), _value(value), _layer1(layer1), _layer2(layer2)
+  : FGInstrumentLayer(w, h), _node(node), _layer1(layer1), _layer2(layer2)
 {
 }
 
@@ -883,7 +894,7 @@ void
 FGSwitchLayer::draw ()
 {
   transform();
-  if (_value->getBoolValue()) {
+  if (_node->getBoolValue()) {
     _layer1->draw();
   } else {
     _layer2->draw();