From 056dff7dee63b1b26948eae7fa07ea870fdc3600 Mon Sep 17 00:00:00 2001
From: j4strngs <j4strngs>
Date: Sun, 10 Nov 2002 20:44:17 +0000
Subject: [PATCH] Fixes from Julian Foad:

- makes instrument knobs turn at a realistic rate
- removes redundant <min> and <max> specifications*
- corrects the indentation to reflect nesting depth
- corrects some descriptive names

* E.g. if the gyro compass heading is 365, there's no point clamping the
value to 360 before drawing it.  Just using the given value is more
likely to be right - or, if it's wrong, at least we won't hide the bug.
---
 Aircraft/Instruments/gyro.xml     |  19 +-
 Aircraft/Instruments/kr-87adf.xml |   4 +-
 Aircraft/Instruments/nav1-hi.xml  | 312 +++++++++++++++---------------
 Aircraft/Instruments/nav1.xml     | 244 +++++++++++------------
 4 files changed, 290 insertions(+), 289 deletions(-)

diff --git a/Aircraft/Instruments/gyro.xml b/Aircraft/Instruments/gyro.xml
index 938a2be1b..ba637a55c 100644
--- a/Aircraft/Instruments/gyro.xml
+++ b/Aircraft/Instruments/gyro.xml
@@ -50,8 +50,6 @@ properties' values.
     <transformation>
      <type>rotation</type>
      <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
-     <min>-720.0</min>
-     <max>720.0</max>
      <scale>-1.0</scale>
     </transformation>
    </transformations>
@@ -166,7 +164,7 @@ properties' values.
     </transformations>
   </layer>
 
- <layer>
+  <layer>
    <name>Heading Knob</name>
    <texture>
     <path>Aircraft/Instruments/Textures/blister.rgb</path>
@@ -188,10 +186,12 @@ properties' values.
     </transformation>
     <transformation>
      <type>rotation</type>
-     <offset>180</offset>
+     <property>/autopilot/settings/heading-bug-deg</property>
+     <scale>5.0</scale>
     </transformation>
    </transformations>
   </layer>
+
   <layer>
    <name>Heading label</name>
    <texture>
@@ -215,11 +215,12 @@ properties' values.
     <transformation>
      <type>rotation</type>
      <property>/autopilot/settings/heading-bug-deg</property>
+     <scale>5.0</scale>
     </transformation>
    </transformations>
   </layer>
 
- <layer>
+  <layer>
    <name>OBS Knob</name>
    <texture>
     <path>Aircraft/Instruments/Textures/blister.rgb</path>
@@ -241,7 +242,8 @@ properties' values.
     </transformation>
     <transformation>
      <type>rotation</type>
-     <offset>180</offset>
+     <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
+     <scale>5.0</scale>
     </transformation>
    </transformations>
   </layer>
@@ -269,12 +271,11 @@ properties' values.
     <transformation>
      <type>rotation</type>
      <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
-     <min>0</min>
-     <max>360</max>
+     <scale>5.0</scale>
     </transformation>
    </transformations>
   </layer>
-</layers>
+ </layers>
 
  <actions>
 
diff --git a/Aircraft/Instruments/kr-87adf.xml b/Aircraft/Instruments/kr-87adf.xml
index 0694898a7..b0e079dbb 100644
--- a/Aircraft/Instruments/kr-87adf.xml
+++ b/Aircraft/Instruments/kr-87adf.xml
@@ -737,7 +737,7 @@ properties' values.
   </action>
   
  <action>
-   <name>timer set hours down</name>
+   <name>timer set minutes down</name>
    <button>1</button>
    <x>89</x>
    <y>-12</y>
@@ -760,7 +760,7 @@ properties' values.
   </action>
 
   <action>
-   <name>timer set hours up</name>
+   <name>timer set minutes up</name>
    <button>1</button>
    <x>100</x>
    <y>-12</y>
diff --git a/Aircraft/Instruments/nav1-hi.xml b/Aircraft/Instruments/nav1-hi.xml
index aaa9a98fb..cd04db949 100644
--- a/Aircraft/Instruments/nav1-hi.xml
+++ b/Aircraft/Instruments/nav1-hi.xml
@@ -117,14 +117,14 @@ properties' values.
    </transformations>
   </layer>
 
- <layer>
+  <layer>
    <name>pivoting vertical needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>1</value>
-   </equals>
-  </condition>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>1</value>
+    </equals>
+   </condition>
    <texture>
     <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
     <x1>0.439</x1>
@@ -153,14 +153,14 @@ properties' values.
    </transformations>
   </layer>
 
- <layer>
+  <layer>
    <name>arcing vertical needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>0</value>
-   </equals>
-  </condition>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>0</value>
+    </equals>
+   </condition>
    <texture>
     <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
     <x1>0.439</x1>
@@ -181,84 +181,84 @@ properties' values.
    </transformations>
   </layer>
 
- <layer>
-  <name>pivoting glidescope needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-has-gs-needle"/>
-   <value>1</value>
-   </equals>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>1</value>
-   </equals>
-  </condition>
-  <texture>
-   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-   <x1>0.439</x1>
-   <y1>0.5</y1>
-   <x2>0.4575</x2>
-   <y2>1.0</y2>
-  </texture>
-  <w>6</w>
-  <h>64</h>
-  <transformations>
-   <transformation>
-    <type>x-shift</type>
-    <offset>-32</offset>
-   </transformation> 
-   <transformation>
-    <type>rotation</type>
-    <property alias="../../../../../params/nav-gs-needle-deflection"/>
-    <min>-3.5</min>
-    <max>3.5</max>
-    <scale>-7</scale>
-   </transformation>
-   <transformation>
-    <type>x-shift</type>
-    <offset>32</offset>
-   </transformation> 
-   <transformation>
-    <type>rotation</type>
-    <offset>90</offset>
-   </transformation>
-  </transformations>
+  <layer>
+   <name>pivoting glidescope needle</name>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-has-gs-needle"/>
+    <value>1</value>
+    </equals>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>1</value>
+    </equals>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+    <x1>0.439</x1>
+    <y1>0.5</y1>
+    <x2>0.4575</x2>
+    <y2>1.0</y2>
+   </texture>
+   <w>6</w>
+   <h>64</h>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <offset>-32</offset>
+    </transformation> 
+    <transformation>
+     <type>rotation</type>
+     <property alias="../../../../../params/nav-gs-needle-deflection"/>
+     <min>-3.5</min>
+     <max>3.5</max>
+     <scale>-7</scale>
+    </transformation>
+    <transformation>
+     <type>x-shift</type>
+     <offset>32</offset>
+    </transformation> 
+    <transformation>
+     <type>rotation</type>
+     <offset>90</offset>
+    </transformation>
+   </transformations>
   </layer>
 
- <layer>
-  <name>sliding glidescope needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-has-gs-needle"/>
-   <value>1</value>
-   </equals>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>0</value>
-   </equals>
-  </condition>
-  <texture>
-   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-   <x1>0.439</x1>
-   <y1>0.5</y1>
-   <x2>0.4575</x2>
-   <y2>1.0</y2>
-  </texture>
-  <w>6</w>
-  <h>64</h>
-  <transformations>
-   <transformation>
-    <type>y-shift</type>
-    <property alias="../../../../../params/nav-gs-needle-deflection"/>
-    <min>-1</min>
-    <max>1</max>
-    <scale>25.6</scale>
-   </transformation>
-   <transformation>
-    <type>rotation</type>
-    <offset>90</offset>
-   </transformation>
-  </transformations>
+  <layer>
+   <name>sliding glidescope needle</name>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-has-gs-needle"/>
+    <value>1</value>
+    </equals>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>0</value>
+    </equals>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+    <x1>0.439</x1>
+    <y1>0.5</y1>
+    <x2>0.4575</x2>
+    <y2>1.0</y2>
+   </texture>
+   <w>6</w>
+   <h>64</h>
+   <transformations>
+    <transformation>
+     <type>y-shift</type>
+     <property alias="../../../../../params/nav-gs-needle-deflection"/>
+     <min>-1</min>
+     <max>1</max>
+     <scale>25.6</scale>
+    </transformation>
+    <transformation>
+     <type>rotation</type>
+     <offset>90</offset>
+    </transformation>
+   </transformations>
   </layer>
 
 <!-- fix misc.rgb -->
@@ -276,76 +276,77 @@ properties' values.
   </layer>
 
   <layer>
-  <name>bezel</name>
-  <condition>
-   <not-equals>
-    <property>/sim/aero</property>
-    <value>c310u3a</value>
-   </not-equals>
-  </condition>
-  <texture>
-   <path>Aircraft/Instruments/Textures/bezel.rgb</path>
-   <x1>0.0</x1>
-   <y1>0.0</y1>
-   <x2>1.0</x2>
-   <y2>1.0</y2>
-  </texture>
-  <transformations>
-   <transformation>
-   <type>x-shift</type>
-   <offset>-1</offset>
-   </transformation>
-  </transformations>
- </layer>
-
-  <layer>
-  <name>glare shield</name>
-  <texture>
-    <path>Aircraft/Instruments/Textures/bezel1.rgb</path>
-    <x1>0.5</x1>
+   <name>bezel</name>
+   <condition>
+    <not-equals>
+     <property>/sim/aero</property>
+     <value>c310u3a</value>
+    </not-equals>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/bezel.rgb</path>
+    <x1>0.0</x1>
     <y1>0.0</y1>
     <x2>1.0</x2>
-    <y2>0.5</y2>
-  </texture>
-  <w>124</w>
-  <h>124</h>
-  <transformations>
-   <transformation>
+    <y2>1.0</y2>
+   </texture>
+   <transformations>
+    <transformation>
     <type>x-shift</type>
-    <offset>2</offset>
-   </transformation>
-   <transformation>
-    <type>y-shift</type>
-    <offset>-2</offset>
-   </transformation>
-  </transformations>
+    <offset>-1</offset>
+    </transformation>
+   </transformations>
   </layer>
 
   <layer>
-  <name>OBS Knob</name>
-  <texture>
-   <path>Aircraft/Instruments/Textures/blister.rgb</path>
-   <x1>0.25</x1>
-   <y1>0.75</y1>
-   <x2>0.5</x2>
-   <y2>1.0</y2>
-  </texture>
-  <h>24</h>
-  <w>24</w>
-  <transformations>
-   <transformation>
-    <type>x-shift</type>
-    <offset>-45</offset>
-   </transformation>
-   <transformation>
-    <type>y-shift</type>
-    <offset>-45</offset>
-   </transformation>
-   <transformation>
-    <type>rotation</type>
-    <offset>180</offset>
-   </transformation>
-  </transformations>
+   <name>glare shield</name>
+   <texture>
+     <path>Aircraft/Instruments/Textures/bezel1.rgb</path>
+     <x1>0.5</x1>
+     <y1>0.0</y1>
+     <x2>1.0</x2>
+     <y2>0.5</y2>
+   </texture>
+   <w>124</w>
+   <h>124</h>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <offset>2</offset>
+    </transformation>
+    <transformation>
+     <type>y-shift</type>
+     <offset>-2</offset>
+    </transformation>
+   </transformations>
+  </layer>
+
+  <layer>
+   <name>OBS Knob</name>
+   <texture>
+    <path>Aircraft/Instruments/Textures/blister.rgb</path>
+    <x1>0.25</x1>
+    <y1>0.75</y1>
+    <x2>0.5</x2>
+    <y2>1.0</y2>
+   </texture>
+   <h>24</h>
+   <w>24</w>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <offset>-45</offset>
+    </transformation>
+    <transformation>
+     <type>y-shift</type>
+     <offset>-45</offset>
+    </transformation>
+    <transformation>
+     <type>rotation</type>
+     <property alias="../../../../../params/nav-radial-selected"/>
+     <scale>5</scale>
+    </transformation>
+   </transformations>
   </layer>
 
   <layer>
@@ -371,8 +372,7 @@ properties' values.
     <transformation>
      <type>rotation</type>
      <property alias="../../../../../params/nav-radial-selected"/>
-     <min>0</min>
-     <max>360</max>
+     <scale>5</scale>
     </transformation>
    </transformations>
   </layer>
diff --git a/Aircraft/Instruments/nav1.xml b/Aircraft/Instruments/nav1.xml
index 62bf68c35..71742b30a 100644
--- a/Aircraft/Instruments/nav1.xml
+++ b/Aircraft/Instruments/nav1.xml
@@ -117,14 +117,14 @@ properties' values.
    </transformations>
   </layer>
 
- <layer>
+  <layer>
    <name>pivoting vertical needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>1</value>
-   </equals>
-  </condition>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>1</value>
+    </equals>
+   </condition>
    <texture>
     <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
     <x1>0.439</x1>
@@ -153,14 +153,14 @@ properties' values.
    </transformations>
   </layer>
 
- <layer>
+  <layer>
    <name>arcing vertical needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>0</value>
-   </equals>
-  </condition>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>0</value>
+    </equals>
+   </condition>
    <texture>
     <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
     <x1>0.439</x1>
@@ -181,48 +181,48 @@ properties' values.
    </transformations>
   </layer>
 
- <layer>
-  <name>pivoting glidescope needle</name>
-  <condition>
-   <equals>
-   <property alias="../../../../../params/nav-has-gs-needle"/>
-   <value>1</value>
-   </equals>
-   <equals>
-   <property alias="../../../../../params/nav-needles-pivot"/>
-   <value>1</value>
-   </equals>
-  </condition>
-  <texture>
-   <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
-   <x1>0.439</x1>
-   <y1>0.5</y1>
-   <x2>0.4575</x2>
-   <y2>1.0</y2>
-  </texture>
-  <w>6</w>
-  <h>64</h>
-  <transformations>
-   <transformation>
-    <type>x-shift</type>
-    <offset>-32</offset>
-   </transformation> 
-   <transformation>
-    <type>rotation</type>
-    <property alias="../../../../../params/nav-gs-needle-deflection"/>
-    <min>-3.5</min>
-    <max>3.5</max>
-    <scale>-7</scale>
-   </transformation>
-   <transformation>
-    <type>x-shift</type>
-    <offset>32</offset>
-   </transformation> 
-   <transformation>
-    <type>rotation</type>
-    <offset>90</offset>
-   </transformation>
-  </transformations>
+  <layer>
+   <name>pivoting glidescope needle</name>
+   <condition>
+    <equals>
+    <property alias="../../../../../params/nav-has-gs-needle"/>
+    <value>1</value>
+    </equals>
+    <equals>
+    <property alias="../../../../../params/nav-needles-pivot"/>
+    <value>1</value>
+    </equals>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
+    <x1>0.439</x1>
+    <y1>0.5</y1>
+    <x2>0.4575</x2>
+    <y2>1.0</y2>
+   </texture>
+   <w>6</w>
+   <h>64</h>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <offset>-32</offset>
+    </transformation> 
+    <transformation>
+     <type>rotation</type>
+     <property alias="../../../../../params/nav-gs-needle-deflection"/>
+     <min>-3.5</min>
+     <max>3.5</max>
+     <scale>-7</scale>
+    </transformation>
+    <transformation>
+     <type>x-shift</type>
+     <offset>32</offset>
+    </transformation> 
+    <transformation>
+     <type>rotation</type>
+     <offset>90</offset>
+    </transformation>
+   </transformations>
   </layer>
 
  <layer>
@@ -276,76 +276,77 @@ properties' values.
   </layer>
 
   <layer>
-  <name>bezel</name>
-  <condition>
-   <not-equals>
-    <property>/sim/aero</property>
-    <value>c310u3a</value>
-   </not-equals>
-  </condition>
-  <texture>
-   <path>Aircraft/Instruments/Textures/bezel.rgb</path>
-   <x1>0.0</x1>
-   <y1>0.0</y1>
-   <x2>1.0</x2>
-   <y2>1.0</y2>
-  </texture>
-  <transformations>
-   <transformation>
-   <type>x-shift</type>
-   <offset>-1</offset>
-   </transformation>
-  </transformations>
- </layer>
-
-  <layer>
-  <name>glare shield</name>
-  <texture>
-    <path>Aircraft/Instruments/Textures/bezel1.rgb</path>
-    <x1>0.5</x1>
+   <name>bezel</name>
+   <condition>
+    <not-equals>
+     <property>/sim/aero</property>
+     <value>c310u3a</value>
+    </not-equals>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/bezel.rgb</path>
+    <x1>0.0</x1>
     <y1>0.0</y1>
     <x2>1.0</x2>
-    <y2>0.5</y2>
-  </texture>
-  <w>124</w>
-  <h>124</h>
-  <transformations>
-   <transformation>
+    <y2>1.0</y2>
+   </texture>
+   <transformations>
+    <transformation>
     <type>x-shift</type>
-    <offset>2</offset>
-   </transformation>
-   <transformation>
-    <type>y-shift</type>
-    <offset>-2</offset>
-   </transformation>
-  </transformations>
+    <offset>-1</offset>
+    </transformation>
+   </transformations>
   </layer>
 
   <layer>
-  <name>OBS Knob</name>
-  <texture>
-   <path>Aircraft/Instruments/Textures/blister.rgb</path>
-   <x1>0.25</x1>
-   <y1>0.75</y1>
-   <x2>0.5</x2>
-   <y2>1.0</y2>
-  </texture>
-  <h>24</h>
-  <w>24</w>
-  <transformations>
-   <transformation>
-    <type>x-shift</type>
-    <offset>-45</offset>
-   </transformation>
-   <transformation>
-    <type>y-shift</type>
-    <offset>-45</offset>
-   </transformation>
-   <transformation>
-    <type>rotation</type>
-    <offset>180</offset>
-   </transformation>
-  </transformations>
+   <name>glare shield</name>
+   <texture>
+     <path>Aircraft/Instruments/Textures/bezel1.rgb</path>
+     <x1>0.5</x1>
+     <y1>0.0</y1>
+     <x2>1.0</x2>
+     <y2>0.5</y2>
+   </texture>
+   <w>124</w>
+   <h>124</h>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <offset>2</offset>
+    </transformation>
+    <transformation>
+     <type>y-shift</type>
+     <offset>-2</offset>
+    </transformation>
+   </transformations>
+  </layer>
+
+  <layer>
+   <name>OBS Knob</name>
+   <texture>
+    <path>Aircraft/Instruments/Textures/blister.rgb</path>
+    <x1>0.25</x1>
+    <y1>0.75</y1>
+    <x2>0.5</x2>
+    <y2>1.0</y2>
+   </texture>
+   <h>24</h>
+   <w>24</w>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <offset>-45</offset>
+    </transformation>
+    <transformation>
+     <type>y-shift</type>
+     <offset>-45</offset>
+    </transformation>
+    <transformation>
+     <type>rotation</type>
+     <property alias="../../../../../params/nav-radial-selected"/>
+     <scale>5</scale>
+    </transformation>
+   </transformations>
   </layer>
 
   <layer>
@@ -371,8 +372,7 @@ properties' values.
     <transformation>
      <type>rotation</type>
      <property alias="../../../../../params/nav-radial-selected"/>
-     <min>0</min>
-     <max>360</max>
+     <scale>5</scale>
     </transformation>
    </transformations>
   </layer>