Fix my mailing address by replacing it with my web page.

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

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 00125ea6d440877969d1eaaeed48167586024dd5..7cfdf0e2eb72fe6f49566e6a6bfb15ece1de5c54 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -30,33 +30,30 @@
 #  include <config.h>
 #endif
 
-#include <simgear/compiler.h>
-
-#ifdef HAVE_WINDOWS_H          
+#ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
 
-#include GLUT_H
-
-#include <plib/ssg.h>
+#include <plib/fnt.h>
 
+#include <simgear/compiler.h>
+#include <simgear/props/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/interpolater.hxx>
-#include <simgear/misc/props.hxx>
 #include <simgear/timing/timestamp.hxx>
 
 #include <cmath>
 #include <vector>
 #include <map>
-#include <plib/fnt.h>
 
-#include <Main/fgfs.hxx>
 #include <Main/fg_props.hxx>
-
 #include <Input/input.hxx>
 
 SG_USING_STD(vector);
 SG_USING_STD(map);
 
+
+class ssgTexture;
 class FGPanelInstrument;
 
 
@@ -132,7 +129,7 @@ private:
  * redraw themselves when necessary, and will pass mouse clicks on to
  * the appropriate instruments for processing.
  */
-class FGPanel : public FGSubsystem
+class FGPanel : public SGSubsystem
 {
 public:
 
@@ -228,7 +225,7 @@ private:
  * or joystick, but they are tied to specific mouse actions in
  * rectangular areas of the panel.
  */
-class FGPanelAction : public FGConditional
+class FGPanelAction : public SGConditional
 {
 public:
   FGPanelAction ();
@@ -288,7 +285,7 @@ private:
 /**
  * A transformation for a layer.
  */
-class FGPanelTransformation : public FGConditional
+class FGPanelTransformation : public SGConditional
 {
 public:
 
@@ -327,7 +324,7 @@ public:
  * on current FGFS instrument readings: for example, a texture
  * representing a needle can rotate to show the airspeed.
  */
-class FGInstrumentLayer : public FGConditional
+class FGInstrumentLayer : public SGConditional
 {
 public:
 
@@ -369,7 +366,7 @@ protected:
  * may show up in the future (some complex instruments could be 
  * entirely hand-coded, for example).
  */
-class FGPanelInstrument : public FGConditional
+class FGPanelInstrument : public SGConditional
 {
 public:
   FGPanelInstrument ();
@@ -491,12 +488,13 @@ public:
     DOUBLE_VALUE
   };
 
-  class Chunk : public FGConditional
+  class Chunk : public SGConditional
   {
   public:
     Chunk (const string &text, const string &fmt = "%s");
     Chunk (ChunkType type, const SGPropertyNode * node,
-          const string &fmt = "", float mult = 1.0);
+          const string &fmt = "", float mult = 1.0, float offs = 0.0,
+           bool truncation = false);
 
     const char * getValue () const;
   private:
@@ -505,6 +503,8 @@ public:
     const SGPropertyNode * _node;
     string _fmt;
     float _mult;
+    float _offs;
+    bool _trunc;
     mutable char _buf[1024];
   };