More magvar fixes relating to vor/ils.

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

diff --git a/src/Cockpit/sp_panel.cxx b/src/Cockpit/sp_panel.cxx
index 1d59fd37f083d6d417f52a816cbd3cf46d03bcb3..a502b7fc4effdbf8a811ff77fbd32f9415d2f8a3 100644 (file)
--- a/src/Cockpit/sp_panel.cxx
+++ b/src/Cockpit/sp_panel.cxx
@@ -183,8 +183,8 @@ createTurnCoordinator (int x, int y)
                                // moves with roll
   inst->addLayer(createTexture("Textures/Panel/turn.rgb"));
   inst->addTransformation(FGInstrumentLayer::ROTATION,
-                         FGSteam::get_TC_radps,
-                         -30.0, 30.0, 1.0, 0.0);
+                         FGSteam::get_TC_std,
+                         -2.5, 2.5, 20.0, 0.0);
 
                                // Layer 2: little ball
                                // moves with slip/skid
@@ -227,18 +227,18 @@ createGyroCompass (int x, int y)
                                // rotates with heading
   inst->addLayer(createTexture("Textures/Panel/gyro-bg.rgb"));
   inst->addTransformation(FGInstrumentLayer::ROTATION,
-                         FGBFI::getHeading,
-                         -360.0, 360.0, -1.0, 0.0);
+                         FGSteam::get_MH_deg,
+                         -720.0, 720.0, -1.0, 0.0);
 
                                // Layer 1: heading bug
                                // rotates with heading and AP heading
   inst->addLayer(createTexture("Textures/Panel/bug.rgb"));
   inst->addTransformation(FGInstrumentLayer::ROTATION,
-                         FGBFI::getHeading,
-                         -360.0, 360.0, -1.0, 0.0);
+                         FGSteam::get_MH_deg,
+                         -720.0, 720.0, -1.0, 0.0);
   inst->addTransformation(FGInstrumentLayer::ROTATION,
                          FGBFI::getAPHeading,
-                         -360.0, 360.0, 1.0, 0.0);
+                         -720.0, 720.0, 1.0, 0.0);
 
                                // Layer 2: fixed center
   inst->addLayer(createTexture("Textures/Panel/gyro-fg.rgb"));
@@ -689,19 +689,19 @@ createADFRadio (int x, int y)
   inst->addAction(0, SIX_W * 0.7, -SIX_W * 0.07, SIX_W * 0.09, SIX_W * 0.14,
                  new FGAdjustAction(FGBFI::getADFFreq,
                                     FGBFI::setADFFreq,
-                                    -0.05, 111.0, 999.95, true));
+                                    -1.0, 100.0, 1299, true));
   inst->addAction(0, SIX_W * 0.79, -SIX_W * 0.07, SIX_W * 0.09, SIX_W * 0.14,
                  new FGAdjustAction(FGBFI::getADFFreq,
                                     FGBFI::setADFFreq,
-                                    0.05, 111.0, 999.95, true));
+                                    1.0, 100.0, 1299, true));
   inst->addAction(1, SIX_W * 0.7, -SIX_W * 0.07, SIX_W * 0.09, SIX_W * 0.14,
                  new FGAdjustAction(FGBFI::getADFFreq,
                                     FGBFI::setADFFreq,
-                                    -5.0, 111.0, 999.95, true));
+                                    -25.0, 100.0, 1299, true));
   inst->addAction(1, SIX_W * 0.79, -SIX_W * 0.07, SIX_W * 0.09, SIX_W * 0.14,
                  new FGAdjustAction(FGBFI::getADFFreq,
                                     FGBFI::setADFFreq,
-                                    5.0, 111.0, 999.95, true));
+                                    25.0, 100.0, 1299, true));
 
                                // Layer 0: background
   FGTexturedLayer * layer =
@@ -711,11 +711,11 @@ createADFRadio (int x, int y)
 
                                // Layer: ADF frequency
   FGTextLayer * text = new FGTextLayer(SIX_W*2, SIX_W/2);
-  text->addChunk(new FGTextLayer::Chunk(FGBFI::getADFFreq, "%.2f"));
+  text->addChunk(new FGTextLayer::Chunk(FGBFI::getADFFreq, "%4.0f"));
   text->setPointSize(14);
   text->setColor(1.0, 0.5, 0.0);
   inst->addLayer(text);
-  inst->addTransformation(FGInstrumentLayer::XSHIFT, -SIX_W + 12);
+  inst->addTransformation(FGInstrumentLayer::XSHIFT, -SIX_W + 18);
 
   return inst;
 }