X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.cxx;h=18887b83bff04c54d802bbe3f03f61790bf59061;hb=ec6a0b2810277970878771f0685ad274d2c59588;hp=09005b936606f67c3133bab2859c4304ddf1e344;hpb=485230b443de22c97d5c4ddfda98598fb52ce98a;p=flightgear.git

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 09005b936..18887b83b 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -26,174 +26,651 @@
 #  include <windows.h>
 #endif
 
+#include <stdio.h>	// sprintf
 #include <string.h>
 
 #include <plib/ssg.h>
-#include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <plib/fnt.h>
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 
-#include <Main/options.hxx>
+#include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
+#include <Main/viewmgr.hxx>
 #include <Objects/texload.h>
-#include <Autopilot/autopilot.hxx>
+#include <Time/light.hxx>
 
-#include "cockpit.hxx"
+#include "hud.hxx"
 #include "panel.hxx"
 
-#define SIX_X 200
-#define SIX_Y 345
-#define SIX_W 128
-#define SIX_SPACING (SIX_W + 5)
-#define SMALL_W 112
+#define WIN_X 0
+#define WIN_Y 0
+#define WIN_W 1024
+#define WIN_H 768
+
+#if defined( NONE ) && defined( _MSC_VER )
+#  pragma message( "A sloppy coder has defined NONE as a macro!!!" )
+#  undef NONE
+#elif defined( NONE )
+#  pragma warn A sloppy coder has defined NONE as a macro!!!
+#  undef NONE
+#endif
+
+
+////////////////////////////////////////////////////////////////////////
+// Local functions.
+////////////////////////////////////////////////////////////////////////
+
+
+/**
+ * Calculate the aspect adjustment for the panel.
+ */
+static float
+get_aspect_adjust (int xsize, int ysize)
+{
+  float ideal_aspect = float(WIN_W) / float(WIN_H);
+  float real_aspect = float(xsize) / float(ysize);
+  return (real_aspect / ideal_aspect);
+}
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGPanel.
+// Global functions.
 ////////////////////////////////////////////////////////////////////////
 
-FGPanel * FGPanel::OurPanel = 0;
+bool
+fgPanelVisible ()
+{
+     if(current_panel == 0)
+	return false;
+     if(current_panel->getVisibility() == 0)
+	return false;
+     if(globals->get_viewmgr()->get_current() != 0)
+	return false;
+     if(globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS != 0 &&
+        !fgGetBool("/sim/virtual-cockpit"))
+	return false;
+     return true;
+}
+
 
-FGPanel::FGPanel ()
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGTextureManager.
+////////////////////////////////////////////////////////////////////////
+
+map<string,ssgTexture *> FGTextureManager::_textureMap;
+
+ssgTexture *
+FGTextureManager::createTexture (const string &relativePath)
 {
-  if (OurPanel == 0) {
-    OurPanel = this;
-  } else {
-    FG_LOG(FG_GENERAL, FG_ALERT, "Multiple panels");
-    exit(-1);
+  ssgTexture * texture = _textureMap[relativePath];
+  if (texture == 0) {
+    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) 
+      SG_LOG( SG_COCKPIT, SG_ALERT, "Texture *still* doesn't exist" );
+    SG_LOG( SG_COCKPIT, SG_DEBUG, "Created texture " << relativePath
+            << " handle=" << texture->getHandle() );
   }
 
-  int x = SIX_X;
-  int y = SIX_Y;
+  return texture;
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGCropped Texture.
+////////////////////////////////////////////////////////////////////////
+
+
+FGCroppedTexture::FGCroppedTexture ()
+  : _path(""), _texture(0),
+    _minX(0.0), _minY(0.0), _maxX(1.0), _maxY(1.0)
+{
+}
+
+
+FGCroppedTexture::FGCroppedTexture (const string &path,
+				    float minX, float minY,
+				    float maxX, float maxY)
+  : _path(path), _texture(0),
+    _minX(minX), _minY(minY), _maxX(maxX), _maxY(maxY)
+{
+}
+
 
-  FGPath tpath(current_options.get_fg_root());
-  tpath.append("Textures/Panel/panel-bg.rgb");
-  _bg = new ssgTexture((char *)tpath.c_str(), false, false);
+FGCroppedTexture::~FGCroppedTexture ()
+{
+}
 
-  _airspeed = new FGAirspeedIndicator(x, y);
-  x += SIX_SPACING;
-  _horizon = new FGHorizon(x, y);
-  x += SIX_SPACING;
-  _altimeter = new FGAltimeter(x, y);
-  x = SIX_X;
-  y -= SIX_SPACING;
-  _coordinator = new FGTurnCoordinator(x, y);
-  x += SIX_SPACING;
-  _gyro = new FGGyroCompass(x, y);
-  x += SIX_SPACING;
-  _vertical = new FGVerticalVelocity(x, y);
 
-  y -= SIX_SPACING;
-  _rpm = new FGRPMGauge(x, y);
+ssgTexture *
+FGCroppedTexture::getTexture ()
+{
+  if (_texture == 0) {
+    _texture = FGTextureManager::createTexture(_path);
+  }
+  return _texture;
+}
+
 
-  x -= SIX_SPACING;
-  _flaps = new FGFlapIndicator(x, y);
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGPanel.
+////////////////////////////////////////////////////////////////////////
+
+FGPanel * current_panel = NULL;
+static fntRenderer text_renderer;
+static fntTexFont *default_font;
+static fntTexFont *led_font;
+
+/**
+ * Constructor.
+ */
+FGPanel::FGPanel ()
+  : _mouseDown(false),
+    _mouseInstrument(0),
+    _width(WIN_W), _height(int(WIN_H * 0.5768 + 1)),
+    _x_offset(0), _y_offset(0), _view_height(int(WIN_H * 0.4232)),
+    _jitter(0.0),
+    _xsize_node(fgGetNode("/sim/startup/xsize", true)),
+    _ysize_node(fgGetNode("/sim/startup/ysize", true))
+{
+  setVisibility(fgPanelVisible());
 }
 
+
+/**
+ * Destructor.
+ */
 FGPanel::~FGPanel ()
 {
-  OurPanel = 0;
-  delete _airspeed;
-  delete _horizon;
-  delete _altimeter;
-  delete _coordinator;
-  delete _gyro;
-  delete _vertical;
-  delete _rpm;
-  delete _flaps;
+  for (instrument_list_type::iterator it = _instruments.begin();
+       it != _instruments.end();
+       it++) {
+    delete *it;
+    *it = 0;
+  }
 }
 
-float
-FGPanel::get_height () const
+
+/**
+ * Add an instrument to the panel.
+ */
+void
+FGPanel::addInstrument (FGPanelInstrument * instrument)
 {
-  return _panel_h;
+  _instruments.push_back(instrument);
 }
 
+
+/**
+ * Initialize the panel.
+ */
 void
-FGPanel::ReInit (int x, int y, int finx, int finy)
+FGPanel::init ()
 {
-  _x = x;
-  _y = y;
-  _w = finx - x;
-  _h = finy - y;
-  _panel_h = (int)((finy - y) * 0.5768 + 1);
+    SGPath base_path;
+    char* envp = ::getenv( "FG_FONTS" );
+    if ( envp != NULL ) {
+        base_path.set( envp );
+    } else {
+        base_path.set( globals->get_fg_root() );
+	base_path.append( "Fonts" );
+    }
+
+    SGPath fntpath;
+
+    // Install the default font
+    fntpath = base_path;
+    fntpath.append( "typewriter.txf" );
+    default_font = new fntTexFont ;
+    default_font -> load ( (char *)fntpath.c_str() ) ;
+
+    // Install the LED font
+    fntpath = base_path;
+    fntpath.append( "led.txf" );
+    led_font = new fntTexFont ;
+    led_font -> load ( (char *)fntpath.c_str() ) ;
 }
 
+
+/**
+ * Bind panel properties.
+ */
 void
-FGPanel::Update () const
+FGPanel::bind ()
 {
-  // glPushAttrib(GL_ALL_ATTRIB_BITS);
+  fgSetArchivable("/sim/panel/visibility");
+  fgSetArchivable("/sim/panel/x-offset");
+  fgSetArchivable("/sim/panel/y-offset");
+  fgSetArchivable("/sim/panel/jitter");
+}
 
-  glMatrixMode(GL_PROJECTION);
-  glPushMatrix();
-  glLoadIdentity();
-  gluOrtho2D(_x, _x + _w, _y, _y + _h);
 
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glLoadIdentity();
+/**
+ * Unbind panel properties.
+ */
+void
+FGPanel::unbind ()
+{
+}
 
-				// Draw the background
-  glDisable(GL_LIGHTING);
+
+/**
+ * Update the panel.
+ */
+void
+FGPanel::update (int dt)
+{
+				// TODO: cache the nodes
+    _visibility = fgGetBool("/sim/panel/visibility");
+    _x_offset = fgGetInt("/sim/panel/x-offset");
+    _y_offset = fgGetInt("/sim/panel/y-offset");
+    _jitter = fgGetFloat("/sim/panel/jitter");
+
+				// Do nothing if the panel isn't visible.
+    if ( !fgPanelVisible() ) {
+        return;
+    }
+
+				// If the mouse is down, do something
+    if (_mouseDown) {
+        _mouseDelay--;
+        if (_mouseDelay < 0) {
+            _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
+            _mouseDelay = 2;
+        }
+    }
+
+				// Now, draw the panel
+    float aspect_adjust = get_aspect_adjust(_xsize_node->getIntValue(),
+                                            _ysize_node->getIntValue());
+    if (aspect_adjust <1.0)
+        update(WIN_X, int(WIN_W * aspect_adjust), WIN_Y, WIN_H);
+    else
+        update(WIN_X, WIN_W, WIN_Y, int(WIN_H / aspect_adjust));
+}
+
+
+void
+FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
+{
+				// Calculate accelerations
+				// and jiggle the panel accordingly
+				// The factors and bounds are just
+				// initial guesses; using sqrt smooths
+				// out the spikes.
+  double x_offset = _x_offset;
+  double y_offset = _y_offset;
+
+  if (_jitter != 0.0) {
+    double a_x_pilot = current_aircraft.fdm_state->get_A_X_pilot();
+    double a_y_pilot = current_aircraft.fdm_state->get_A_Y_pilot();
+    double a_z_pilot = current_aircraft.fdm_state->get_A_Z_pilot();
+
+    double a_zx_pilot = a_z_pilot - a_x_pilot;
+    
+    int x_adjust = int(sqrt(fabs(a_y_pilot) * _jitter)) *
+		   (a_y_pilot < 0 ? -1 : 1);
+    int y_adjust = int(sqrt(fabs(a_zx_pilot) * _jitter)) *
+		   (a_zx_pilot < 0 ? -1 : 1);
+
+				// adjustments in screen coordinates
+    x_offset += x_adjust;
+    y_offset += y_adjust;
+  }
+
+  if(fgGetBool("/sim/virtual-cockpit")) {
+      setupVirtualCockpit();
+  } else {
+      glMatrixMode(GL_PROJECTION);
+      glPushMatrix();
+      glLoadIdentity();
+      gluOrtho2D(winx, winx + winw, winy, winy + winh); /* right side up */
+      // gluOrtho2D(winx + winw, winx, winy + winh, winy); /* up side down */
+      
+      glMatrixMode(GL_MODELVIEW);
+      glPushMatrix();
+      glLoadIdentity();
+      
+      glTranslated(x_offset, y_offset, 0);
+  }
+  
+  // Draw the background
   glEnable(GL_TEXTURE_2D);
-  if ( _bg->getHandle() >= 0 ) {
-      glBindTexture(GL_TEXTURE_2D, _bg->getHandle());
+  glDisable(GL_LIGHTING);
+  glEnable(GL_BLEND);
+  glEnable(GL_ALPHA_TEST);
+  glEnable(GL_COLOR_MATERIAL);
+  // glColor4f(1.0, 1.0, 1.0, 1.0);
+  if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
+      glColor4fv( cur_light_params.scene_diffuse );
   } else {
-      cout << "invalid texture handle in FGPanel::Update()" << endl;
+      glColor4f(0.7, 0.2, 0.2, 1.0);
+  }
+  if (_bg != 0) {
+    glBindTexture(GL_TEXTURE_2D, _bg->getHandle());
+    // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glBegin(GL_POLYGON);
+    glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X, WIN_Y, 0);
+    glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + _width, WIN_Y, 0);
+    glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + _width, WIN_Y + _height, 0);
+    glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X, WIN_Y + _height, 0);
+    glEnd();
+  } else {
+    for (int i = 0; i < 4; i ++) {
+      // top row of textures...(1,3,5,7)
+      glBindTexture(GL_TEXTURE_2D, _mbg[i*2]->getHandle());
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      glBegin(GL_POLYGON);
+      glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y + (_height/2), 0);
+      glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y + (_height/2), 0);
+      glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y + _height, 0);
+      glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y + _height, 0);
+      glEnd();
+      // bottom row of textures...(2,4,6,8)
+      glBindTexture(GL_TEXTURE_2D, _mbg[(i*2)+1]->getHandle());
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      glBegin(GL_POLYGON);
+      glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y, 0);
+      glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y, 0);
+      glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y + (_height/2), 0);
+      glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y + (_height/2), 0);
+      glEnd();
+    }
+
   }
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-  glBegin(GL_POLYGON);
-  glTexCoord2f(0.0, 0.0); glVertex3f(_x, _y, 0);
-  glTexCoord2f(10.0, 0.0); glVertex3f(_x + _w, _y, 0);
-  glTexCoord2f(10.0, 5.0); glVertex3f(_x + _w, _y + _panel_h, 0);
-  glTexCoord2f(0.0, 5.0); glVertex3f(_x, _y + _panel_h, 0);
-  glEnd();
 
 				// Draw the instruments.
-  glLoadIdentity();
-  glTranslated(_airspeed->getXPos(), _airspeed->getYPos(), 0);
-  _airspeed->draw();
+  instrument_list_type::const_iterator current = _instruments.begin();
+  instrument_list_type::const_iterator end = _instruments.end();
+
+  for ( ; current != end; current++) {
+    FGPanelInstrument * instr = *current;
+    glPushMatrix();
+    glTranslated(instr->getXPos(), instr->getYPos(), 0);
+    instr->draw();
+    glPopMatrix();
+  }
+
+  if(fgGetBool("/sim/virtual-cockpit")) {
+      cleanupVirtualCockpit();
+  } else {
+      glMatrixMode(GL_PROJECTION);
+      glPopMatrix();
+      glMatrixMode(GL_MODELVIEW);
+      glPopMatrix();
+  }
+
+  ssgForceBasicState();
+  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+}
+
+void
+FGPanel::setupVirtualCockpit()
+{
+    int i;
+    FGViewer* view = globals->get_current_view();
+
+    // Generate corners for the panel quad.  Put the top edge of the
+    // panel 1m in and 6 degrees down from the forward direction, and
+    // make the whole thing 60 degrees wide.  In principle, these
+    // should be settable per-panel, so that you can have lots of
+    // panel objects plastered about the cockpit in realistic
+    // positions and orientations.
+    float a[3], b[3], c[3];
+    float pw = tan(30*SGD_DEGREES_TO_RADIANS);
+    float ph = 2 * pw * (float)_height/(float)_width;
+    float ptop = -tan(6*SGD_DEGREES_TO_RADIANS);
+    a[0] = -pw; a[1] = ptop-ph; a[2] = -1; // bottom left
+    b[0] =  pw; b[1] = ptop-ph; b[2] = -1; // bottom right
+    c[0] = -pw; c[1] = ptop;    c[2] = -1; // top left
+
+    // A standard projection, in meters, with especially close clip
+    // planes.
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+    gluPerspective(view->get_v_fov(), 1/view->get_aspect_ratio(), 
+		   0.01, 100);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    // Generate a "look at" matrix using OpenGL (!) coordinate
+    // conventions.
+    float lookat[3];
+    float pitch = view->getPitchOffset_deg() * SGD_DEGREES_TO_RADIANS;
+    float rot = view->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS;
+    lookat[0] = -sin(rot);
+    lookat[1] = sin(pitch) / cos(pitch);
+    lookat[2] = -cos(rot);
+    if(fabs(lookat[1]) > 9999) lookat[1] = 9999; // FPU sanity
+    gluLookAt(0, 0, 0, lookat[0], lookat[1], lookat[2], 0, 1, 0);
+
+    // Translate the origin to the location of the panel quad
+    glTranslatef(a[0], a[1], a[2]);
+ 
+    // Generate a matrix to translate unit square coordinates from the
+    // panel to real world coordinates.  Use a transposed basis for
+    // the panel quad.  Note: this matrix is relatively expensive to
+    // compute, and is invariant.  Consider precomputing and storing
+    // it.  Also, consider using the plib vector math routines, so the
+    // reuse junkies don't yell at me.  (Fine, I hard-coded a cross
+    // product.  Just shoot me and be done with it.)
+    float u[3], v[3], w[3], m[16];
+    for(i=0; i<3; i++) u[i] = b[i] - a[i]; // U = B - A
+    for(i=0; i<3; i++) v[i] = c[i] - a[i]; // V = C - A
+    w[0] = u[1]*v[2] - v[1]*u[2];          // W = U x V
+    w[1] = u[2]*v[0] - v[2]*u[0];
+    w[2] = u[0]*v[1] - v[0]*u[1];
+
+    m[0] = u[0]; m[4] = v[0]; m[8]  = w[0]; m[12] = 0; //     |Ux Vx Wx|
+    m[1] = u[1]; m[5] = v[1]; m[9]  = w[1]; m[13] = 0; // m = |Uy Vy Wy|
+    m[2] = u[2]; m[6] = v[2]; m[10] = w[2]; m[14] = 0; //     |Uz Vz Wz|
+    m[3] = 0;    m[7] = 0;    m[11] = 0;    m[15] = 1;
+    glMultMatrixf(m);
+
+    // Finally, a scaling factor to map the panel's width and height
+    // to the unit square.
+    glScalef(1./_width, 1./_height, 1);
+
+    // Now, turn off the Z buffer.  The panel code doesn't need
+    // it, and we're using different clip planes anyway (meaning we
+    // can't share it without glDepthRange() hackery or much
+    // framebuffer bandwidth wasteage)
+    glDisable(GL_DEPTH_TEST);
+}
+
+void
+FGPanel::cleanupVirtualCockpit()
+{
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+    glEnable(GL_DEPTH_TEST);
+}
+
+
+/**
+ * Set the panel's visibility.
+ */
+void
+FGPanel::setVisibility (bool visibility)
+{
+  _visibility = visibility;
+}
+
+
+/**
+ * Return true if the panel is visible.
+ */
+bool
+FGPanel::getVisibility () const
+{
+  return _visibility;
+}
+
+
+/**
+ * Set the panel's background texture.
+ */
+void
+FGPanel::setBackground (ssgTexture * texture)
+{
+  _bg = texture;
+}
+
+/**
+ * Set the panel's multiple background textures.
+ */
+void
+FGPanel::setMultiBackground (ssgTexture * texture, int idx)
+{
+  _bg = 0;
+  _mbg[idx] = texture;
+}
+
+/**
+ * Set the panel's x-offset.
+ */
+void
+FGPanel::setXOffset (int offset)
+{
+  if (offset <= 0 && offset >= -_width + WIN_W)
+    _x_offset = offset;
+}
+
+
+/**
+ * Set the panel's y-offset.
+ */
+void
+FGPanel::setYOffset (int offset)
+{
+  if (offset <= 0 && offset >= -_height)
+    _y_offset = offset;
+}
 
-  glLoadIdentity();
-  glTranslated(_horizon->getXPos(), _horizon->getYPos(), 0);
-  _horizon->draw();
 
-  glLoadIdentity();
-  glTranslated(_altimeter->getXPos(), _altimeter->getYPos(), 0);
-  _altimeter->draw();
+/**
+ * Perform a mouse action.
+ */
+bool
+FGPanel::doMouseAction (int button, int updown, int x, int y)
+{
+				// FIXME: this same code appears in update()
+  int xsize = _xsize_node->getIntValue();
+  int ysize = _ysize_node->getIntValue();
+  float aspect_adjust = get_aspect_adjust(xsize, ysize);
+
+				// Note a released button and return
+  // cerr << "Doing mouse action\n";
+  if (updown == 1) {
+    _mouseDown = false;
+    _mouseInstrument = 0;
+    return false;
+  }
+
+				// Scale for the real window size.
+  if (aspect_adjust < 1.0) {
+    x = int(((float)x / xsize) * WIN_W * aspect_adjust);
+    y = int(WIN_H - ((float(y) / ysize) * WIN_H));
+  } else {
+    x = int(((float)x / xsize) * WIN_W);
+    y = int((WIN_H - ((float(y) / ysize) * WIN_H)) / aspect_adjust);
+  }
+
+				// Adjust for offsets.
+  x -= _x_offset;
+  y -= _y_offset;
+
+				// Search for a matching instrument.
+  for (int i = 0; i < (int)_instruments.size(); i++) {
+    FGPanelInstrument *inst = _instruments[i];
+    int ix = inst->getXPos();
+    int iy = inst->getYPos();
+    int iw = inst->getWidth() / 2;
+    int ih = inst->getHeight() / 2;
+    if (x >= ix - iw && x < ix + iw && y >= iy - ih && y < iy + ih) {
+      _mouseDown = true;
+      _mouseDelay = 20;
+      _mouseInstrument = inst;
+      _mouseButton = button;
+      _mouseX = x - ix;
+      _mouseY = y - iy;
+				// Always do the action once.
+      return _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
+    }
+  }
+  return false;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////.
+// Implementation of FGPanelAction.
+////////////////////////////////////////////////////////////////////////
+
+FGPanelAction::FGPanelAction ()
+{
+}
 
-  glLoadIdentity();
-  glTranslated(_coordinator->getXPos(), _coordinator->getYPos(), 0);
-  _coordinator->draw();
+FGPanelAction::FGPanelAction (int button, int x, int y, int w, int h)
+  : _button(button), _x(x), _y(y), _w(w), _h(h)
+{
+  for (unsigned int i = 0; i < _bindings.size(); i++)
+    delete _bindings[i];
+}
 
-  glLoadIdentity();
-  glTranslated(_gyro->getXPos(), _gyro->getYPos(), 0);
-  _gyro->draw();
+FGPanelAction::~FGPanelAction ()
+{
+}
 
-  glLoadIdentity();
-  glTranslated(_vertical->getXPos(), _vertical->getYPos(), 0);
-  _vertical->draw();
+void
+FGPanelAction::addBinding (FGBinding * binding)
+{
+  _bindings.push_back(binding);
+}
 
-  glLoadIdentity();
-  glTranslated(_rpm->getXPos(), _rpm->getYPos(), 0);
-  _rpm->draw();
+void
+FGPanelAction::doAction ()
+{
+  if (test()) {
+    int nBindings = _bindings.size();
+    for (int i = 0; i < nBindings; i++) {
+      _bindings[i]->fire();
+    }
+  }
+}
 
-  glLoadIdentity();
-  glTranslated(_flaps->getXPos(), _flaps->getYPos(), 0);
-  _flaps->draw();
 
-  glMatrixMode(GL_PROJECTION);
-  glPopMatrix();
-  glMatrixMode(GL_MODELVIEW);
-  glPopMatrix();
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGPanelTransformation.
+////////////////////////////////////////////////////////////////////////
 
-  // glPopAttrib();
+FGPanelTransformation::FGPanelTransformation ()
+  : table(0)
+{
+}
 
-//   ssgForceBasicState();
+FGPanelTransformation::~FGPanelTransformation ()
+{
+  delete table;
 }
 
 
@@ -217,6 +694,12 @@ FGPanelInstrument::FGPanelInstrument (int x, int y, int w, int h)
 
 FGPanelInstrument::~FGPanelInstrument ()
 {
+  for (action_list_type::iterator it = _actions.begin();
+       it != _actions.end();
+       it++) {
+    delete *it;
+    *it = 0;
+  }
 }
 
 void
@@ -245,363 +728,426 @@ FGPanelInstrument::getYPos () const
   return _y;
 }
 
-
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of FGTexturedInstrument.
-////////////////////////////////////////////////////////////////////////
-
-FGTexturedInstrument::FGTexturedInstrument (int x, int y, int w, int h)
-  : FGPanelInstrument(x, y, w, h)
+int
+FGPanelInstrument::getWidth () const
 {
-  for (int i = 0; i < MAX_LAYERS; i++) {
-    _layers[i] = false;
-  }
+  return _w;
 }
 
-FGTexturedInstrument::~FGTexturedInstrument ()
+int
+FGPanelInstrument::getHeight () const
 {
-  // FIXME: maybe free textures
+  return _h;
 }
 
 void
-FGTexturedInstrument::addLayer (int layer, const char * textureName)
+FGPanelInstrument::addAction (FGPanelAction * action)
 {
-  FGPath tpath(current_options.get_fg_root());
-  tpath.append(textureName);
-  ssgTexture * texture = new ssgTexture((char *)tpath.c_str(), false, false);
-  cerr << "Loaded texture " << textureName << endl;
-  addLayer(layer, texture);
+  _actions.push_back(action);
 }
 
-void
-FGTexturedInstrument::addLayer (int layer, ssgTexture * texture)
+				// Coordinates relative to centre.
+bool
+FGPanelInstrument::doMouseAction (int button, int x, int y)
 {
-  _layers[layer] = true;
-  _textures[layer] = texture;
-  _rotation[layer] = 0.0;
-  _xoffset[layer] = _yoffset[layer] = 0;
-  _xcenter[layer] = _ycenter[layer] = 0;
+  if (test()) {
+    action_list_type::iterator it = _actions.begin();
+    action_list_type::iterator last = _actions.end();
+    for ( ; it != last; it++) {
+      if ((*it)->inArea(button, x, y)) {
+	(*it)->doAction();
+	return true;
+      }
+    }
+  }
+  return false;
 }
 
-void
-FGTexturedInstrument::setLayerCenter (int layer, int x, int y)
-{
-  _xcenter[layer] = x;
-  _ycenter[layer] = y;
-}
 
-void
-FGTexturedInstrument::setLayerRot (int layer, double rotation) const
-{
-  _rotation[layer] = rotation;
-}
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGLayeredInstrument.
+////////////////////////////////////////////////////////////////////////
 
-void
-FGTexturedInstrument::setLayerOffset (int layer, int xoff, int yoff) const
+FGLayeredInstrument::FGLayeredInstrument (int x, int y, int w, int h)
+  : FGPanelInstrument(x, y, w, h)
 {
-  _xoffset[layer] = xoff;
-  _yoffset[layer] = yoff;
 }
 
-bool
-FGTexturedInstrument::hasLayer (int layer) const
+FGLayeredInstrument::~FGLayeredInstrument ()
 {
-  return _layers[layer];
+  for (layer_list::iterator it = _layers.begin(); it != _layers.end(); it++) {
+    delete *it;
+    *it = 0;
+  }
 }
 
 void
-FGTexturedInstrument::draw () const
+FGLayeredInstrument::draw ()
 {
-  glEnable(GL_TEXTURE_2D);
-
-  int i;
-  int w2 = _w / 2;
-  int h2 = _h / 2;
-
-  glMatrixMode(GL_MODELVIEW);
-  for (i = 0; i < MAX_LAYERS; i++) {
-    if (hasLayer(i)) {
+  if (test()) {
+    for (int i = 0; i < (int)_layers.size(); i++) {
       glPushMatrix();
-      glTranslated(_xcenter[i], _ycenter[i], 0);
-      glRotatef(0.0 - _rotation[i], 0.0, 0.0, 1.0);
-      glTranslated(_xoffset[i], _yoffset[i], 0);
-      if ( _textures[i]->getHandle() >= 0 ) {
-	  glBindTexture(GL_TEXTURE_2D, _textures[i]->getHandle());
-      } else {
-	  cout << "invalid texture handle in FGTexturedInstrument::draw()" 
-	       << endl;
-      }
-      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-      glBegin(GL_POLYGON);
-				// FIXME: is this really correct
-				// for layering?
-      glTexCoord2f(0.0, 0.0); glVertex3f(-w2, -h2, i / 100.0 + 0.1);
-      glTexCoord2f(1.0, 0.0); glVertex3f(w2, -h2, i / 100.0 + 0.1);
-      glTexCoord2f(1.0, 1.0); glVertex3f(w2, h2, i / 100.0 + 0.1);
-      glTexCoord2f(0.0, 1.0); glVertex3f(-w2, h2, i / 100.0 + 0.1);
-      glEnd();
+      if(!fgGetBool("/sim/virtual-cockpit"))
+	  glTranslatef(0.0, 0.0, (i / 100.0) + 0.1);
+      _layers[i]->draw();
       glPopMatrix();
     }
   }
-
-  glDisable(GL_TEXTURE_2D);
 }
 
-
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of FGAirspeedIndicator.
-////////////////////////////////////////////////////////////////////////
-
-FGAirspeedIndicator::FGAirspeedIndicator (int x, int y)
-  : FGTexturedInstrument(x, y, SIX_W, SIX_W)
+int
+FGLayeredInstrument::addLayer (FGInstrumentLayer *layer)
 {
-  addLayer(0, "Textures/Panel/airspeed.rgb");
-  addLayer(1, "Textures/Panel/long-needle.rgb");
+  int n = _layers.size();
+  if (layer->getWidth() == -1) {
+    layer->setWidth(getWidth());
+  }
+  if (layer->getHeight() == -1) {
+    layer->setHeight(getHeight());
+  }
+  _layers.push_back(layer);
+  return n;
 }
 
-FGAirspeedIndicator::~FGAirspeedIndicator ()
+int
+FGLayeredInstrument::addLayer (FGCroppedTexture &texture,
+			       int w, int h)
 {
+  return addLayer(new FGTexturedLayer(texture, w, h));
 }
 
 void
-FGAirspeedIndicator::draw () const
+FGLayeredInstrument::addTransformation (FGPanelTransformation * transformation)
 {
-  double speed = get_speed();
-  if (speed < 30.0) {
-    speed = 30.0;
-  } else if (speed > 220.0) {
-    speed = 220.0;
-  }
-  double angle = speed / 20.0 * 36.0 - 54.0;
-  setLayerRot(1, angle);
-  FGTexturedInstrument::draw();
+  int layer = _layers.size() - 1;
+  _layers[layer]->addTransformation(transformation);
 }
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGHorizon.
+// Implementation of FGInstrumentLayer.
 ////////////////////////////////////////////////////////////////////////
 
-FGHorizon::FGHorizon (int x, int y)
-  : FGTexturedInstrument(x, y, SIX_W, SIX_W)
+FGInstrumentLayer::FGInstrumentLayer (int w, int h)
+  : _w(w),
+    _h(h)
+{
+}
+
+FGInstrumentLayer::~FGInstrumentLayer ()
 {
-  addLayer(0, "Textures/Panel/horizon-bg.rgb");
-  addLayer(1, "Textures/Panel/horizon-float.rgb");
-  addLayer(2, "Textures/Panel/horizon-rim.rgb");
-  addLayer(3, "Textures/Panel/horizon-fg.rgb");
+  for (transformation_list::iterator it = _transformations.begin();
+       it != _transformations.end();
+       it++) {
+    delete *it;
+    *it = 0;
+  }
 }
 
-FGHorizon::~FGHorizon ()
+void
+FGInstrumentLayer::transform () const
 {
+  transformation_list::const_iterator it = _transformations.begin();
+  transformation_list::const_iterator last = _transformations.end();
+  while (it != last) {
+    FGPanelTransformation *t = *it;
+    if (t->test()) {
+      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;
+      }
+      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:
+	glTranslatef(val, 0.0, 0.0);
+	break;
+      case FGPanelTransformation::YSHIFT:
+	glTranslatef(0.0, val, 0.0);
+	break;
+      case FGPanelTransformation::ROTATION:
+	glRotatef(-val, 0.0, 0.0, 1.0);
+	break;
+      }
+    }
+    it++;
+  }
 }
 
 void
-FGHorizon::draw () const
+FGInstrumentLayer::addTransformation (FGPanelTransformation * transformation)
 {
-  double rot = get_roll() * RAD_TO_DEG;
-  double pitch = get_pitch() * RAD_TO_DEG;
-  if (pitch > 20)
-    pitch = 20;
-  else if (pitch < -20)
-    pitch = -20;
-  int yoffset = 0 - (pitch * ((1.5 / 160.0) * _h));
-  setLayerRot(0, 0 - rot);
-  setLayerRot(1, 0 - rot);
-  setLayerOffset(1, 0, yoffset);
-  setLayerRot(2, 0 - rot);
-  FGTexturedInstrument::draw();
+  _transformations.push_back(transformation);
 }
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGAltimeter.
+// Implementation of FGGroupLayer.
 ////////////////////////////////////////////////////////////////////////
 
-// TODO: add 10,000 bug
+FGGroupLayer::FGGroupLayer ()
+{
+}
 
-FGAltimeter::FGAltimeter (int x, int y)
-  : FGTexturedInstrument(x, y, SIX_W, SIX_W)
+FGGroupLayer::~FGGroupLayer ()
 {
-  addLayer(0, "Textures/Panel/altimeter.rgb");
-  addLayer(1, "Textures/Panel/long-needle.rgb");
-  addLayer(2, "Textures/Panel/short-needle.rgb");
-  addLayer(3, "Textures/Panel/bug.rgb");
+  for (unsigned int i = 0; i < _layers.size(); i++)
+    delete _layers[i];
 }
 
-FGAltimeter::~FGAltimeter ()
+void
+FGGroupLayer::draw ()
 {
+  if (test()) {
+    int nLayers = _layers.size();
+    for (int i = 0; i < nLayers; i++)
+      _layers[i]->draw();
+  }
 }
 
 void
-FGAltimeter::draw () const
+FGGroupLayer::addLayer (FGInstrumentLayer * layer)
 {
-  long altitude = get_altitude();
-  setLayerRot(1, (altitude % 1000) / 1000.0 * 360.0);
-  setLayerRot(2, (altitude % 10000) / 10000.0 * 360.0);
-  setLayerRot(3, (altitude % 100000) / 100000.0 * 360.0);
-  FGTexturedInstrument::draw();
+  _layers.push_back(layer);
 }
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGTurnCoordinator.
+// Implementation of FGTexturedLayer.
 ////////////////////////////////////////////////////////////////////////
 
-// TODO: add slip/skid ball
 
-FGTurnCoordinator::FGTurnCoordinator (int x, int y)
-  : FGTexturedInstrument(x, y, SIX_W, SIX_W)
+FGTexturedLayer::FGTexturedLayer (const FGCroppedTexture &texture, int w, int h)
+  : FGInstrumentLayer(w, h)
 {
-  addLayer(0, "Textures/Panel/turn-bg.rgb");
-  addLayer(1, "Textures/Panel/turn.rgb");
-  addLayer(2, "Textures/Panel/ball.rgb");
+  setTexture(texture);
 }
 
-FGTurnCoordinator::~FGTurnCoordinator ()
+
+FGTexturedLayer::~FGTexturedLayer ()
 {
 }
 
+
 void
-FGTurnCoordinator::draw () const
+FGTexturedLayer::draw ()
 {
-				// Set little plane
-				// FIXME: this should be turn, maybe
-  double rot = get_roll() * RAD_TO_DEG;
-  if (rot > 30.0)
-    rot = 30.0;
-  else if (rot < -30.0)
-    rot = -30.0;
-  setLayerRot(1, rot);
+  if (test()) {
+    int w2 = _w / 2;
+    int h2 = _h / 2;
+    
+    transform();
+    glBindTexture(GL_TEXTURE_2D, _texture.getTexture()->getHandle());
+    glBegin(GL_POLYGON);
+    
+				// From Curt: turn on the panel
+				// lights after sundown.
+    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);
+    }
 
-				// Set ball
-				// FIXME: totally bogus values
-  double slip = get_sideslip() * 450;
-  if (slip > 45) {
-    slip = 45;
-  } else if (slip < -45) {
-    slip = -45;
-  }
-  setLayerRot(2, 0 - slip);
 
-  FGTexturedInstrument::draw();
+    glTexCoord2f(_texture.getMinX(), _texture.getMinY()); glVertex2f(-w2, -h2);
+    glTexCoord2f(_texture.getMaxX(), _texture.getMinY()); glVertex2f(w2, -h2);
+    glTexCoord2f(_texture.getMaxX(), _texture.getMaxY()); glVertex2f(w2, h2);
+    glTexCoord2f(_texture.getMinX(), _texture.getMaxY()); glVertex2f(-w2, h2);
+    glEnd();
+  }
 }
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGGyroCompass.
+// Implementation of FGTextLayer.
 ////////////////////////////////////////////////////////////////////////
 
-// TODO: add heading bug
+FGTextLayer::FGTextLayer (int w, int h)
+  : FGInstrumentLayer(w, h), _pointSize(14.0), _font_name("default")
+{
+  _then.stamp();
+  _color[0] = _color[1] = _color[2] = 0.0;
+  _color[3] = 1.0;
+}
 
-FGGyroCompass::FGGyroCompass (int x, int y)
-  : FGTexturedInstrument(x, y, SIX_W, SIX_W)
+FGTextLayer::~FGTextLayer ()
 {
-  addLayer(0, "Textures/Panel/gyro-bg.rgb");
-  addLayer(1, "Textures/Panel/bug.rgb");
-  addLayer(2, "Textures/Panel/gyro-fg.rgb");
+  chunk_list::iterator it = _chunks.begin();
+  chunk_list::iterator last = _chunks.end();
+  for ( ; it != last; it++) {
+    delete *it;
+  }
 }
 
-FGGyroCompass::~FGGyroCompass ()
+void
+FGTextLayer::draw ()
 {
+  if (test()) {
+    glPushMatrix();
+    glColor4fv(_color);
+    transform();
+    if ( _font_name == "led" ) {
+	text_renderer.setFont(led_font);
+    } else {
+	text_renderer.setFont(guiFntHandle);
+    }
+    text_renderer.setPointSize(_pointSize);
+    text_renderer.begin();
+    text_renderer.start3f(0, 0, 0);
+
+    _now.stamp();
+    if (_now - _then > 100000) {
+      recalc_value();
+      _then = _now;
+    }
+    text_renderer.puts((char *)(_value.c_str()));
+
+    text_renderer.end();
+    glColor4f(1.0, 1.0, 1.0, 1.0);	// FIXME
+    glPopMatrix();
+  }
 }
 
 void
-FGGyroCompass::draw () const
+FGTextLayer::addChunk (FGTextLayer::Chunk * chunk)
 {
-  setLayerRot(0, 0.0 - get_heading());
-  setLayerRot(1, 0.0 - get_heading() + fgAPget_TargetHeading());
-  FGTexturedInstrument::draw();
+  _chunks.push_back(chunk);
 }
 
+void
+FGTextLayer::setColor (float r, float g, float b)
+{
+  _color[0] = r;
+  _color[1] = g;
+  _color[2] = b;
+  _color[3] = 1.0;
+}
 
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of FGVerticalVelocity.
-////////////////////////////////////////////////////////////////////////
+void
+FGTextLayer::setPointSize (float size)
+{
+  _pointSize = size;
+}
 
-FGVerticalVelocity::FGVerticalVelocity (int x, int y)
-  : FGTexturedInstrument(x, y, SIX_W, SIX_W)
+void
+FGTextLayer::setFontName(const string &name)
 {
-  addLayer(0, "Textures/Panel/vertical.rgb");
-  addLayer(1, "Textures/Panel/long-needle.rgb");
+  _font_name = name;
 }
 
-FGVerticalVelocity::~FGVerticalVelocity ()
+
+void
+FGTextLayer::setFont(fntFont * font)
 {
+  text_renderer.setFont(font);
 }
 
+
 void
-FGVerticalVelocity::draw () const
+FGTextLayer::recalc_value () const
 {
-  double climb = get_climb_rate() / 500.0;
-  if (climb < -4.0) {
-    climb = -4.0;
-  } else if (climb > 4.0) {
-    climb = 4.0;
+  _value = "";
+  chunk_list::const_iterator it = _chunks.begin();
+  chunk_list::const_iterator last = _chunks.end();
+  for ( ; it != last; it++) {
+    _value += (*it)->getValue();
   }
-  double rot = (climb * 42.0) + 270.0;
-				// FIXME: why inverted?
-  setLayerRot(1, rot);
-  FGTexturedInstrument::draw();
 }
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGRPMGauge.
+// Implementation of FGTextLayer::Chunk.
 ////////////////////////////////////////////////////////////////////////
 
-FGRPMGauge::FGRPMGauge (int x, int y)
-  : FGTexturedInstrument(x, y, SMALL_W, SMALL_W)
+FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
+  : _type(FGTextLayer::TEXT), _fmt(fmt)
 {
-  addLayer(0, "Textures/Panel/rpm.rgb");
-  addLayer(1, "Textures/Panel/long-needle.rgb");
+  _text = text;
+  if (_fmt.empty()) 
+    _fmt = "%s";
 }
 
-FGRPMGauge::~FGRPMGauge ()
+FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
+			   const string &fmt, float mult)
+  : _type(type), _fmt(fmt), _mult(mult)
 {
+  if (_fmt.empty()) {
+    if (type == TEXT_VALUE)
+      _fmt = "%s";
+    else
+      _fmt = "%.2f";
+  }
+  _node = node;
 }
 
-void
-FGRPMGauge::draw () const
+const char *
+FGTextLayer::Chunk::getValue () const
 {
-  double rot = get_throttleval() * 300 - 150;
-  setLayerRot(1, rot);
-  FGTexturedInstrument::draw();
+  if (test()) {
+    _buf[0] = '\0';
+    switch (_type) {
+    case TEXT:
+      sprintf(_buf, _fmt.c_str(), _text.c_str());
+      return _buf;
+    case TEXT_VALUE:
+      sprintf(_buf, _fmt.c_str(), _node->getStringValue());
+      break;
+    case DOUBLE_VALUE:
+      sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
+      break;
+    }
+    return _buf;
+  } else {
+    return "";
+  }
 }
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of FGFlapIndicator.
+// Implementation of FGSwitchLayer.
 ////////////////////////////////////////////////////////////////////////
 
-FGFlapIndicator::FGFlapIndicator (int x, int y)
-  : FGTexturedInstrument(x, y, SMALL_W, SMALL_W)
+FGSwitchLayer::FGSwitchLayer (int w, int h, const SGPropertyNode * node,
+			      FGInstrumentLayer * layer1,
+			      FGInstrumentLayer * layer2)
+  : FGInstrumentLayer(w, h), _node(node), _layer1(layer1), _layer2(layer2)
 {
-  addLayer(0, "Textures/Panel/flaps.rgb");
-  addLayer(1, "Textures/Panel/long-needle.rgb");
-  setLayerCenter(1, 0 - (SMALL_W / 4) + (SMALL_W / 16), 0);
 }
 
-FGFlapIndicator::~FGFlapIndicator ()
+FGSwitchLayer::~FGSwitchLayer ()
 {
+  delete _layer1;
+  delete _layer2;
 }
 
 void
-FGFlapIndicator::draw () const
+FGSwitchLayer::draw ()
 {
-  double rot = controls.get_flaps() * 120 + 30;
-  setLayerRot(1, rot);
-  FGTexturedInstrument::draw();
+  if (test()) {
+    transform();
+    if (_node->getBoolValue()) {
+      _layer1->draw();
+    } else {
+      _layer2->draw();
+    }
+  }
 }
 
-
 
 // end of panel.cxx
+
+
+