fly/fgdata
1
0
Fork 0
Code Activity

Patch from Julian Foad:

Browse source 
OK -- thanks.  I have now fixed up all the other XML files in the base
package that use "max" and "wrap".  Those affected are all in
Aircraft/Instruments/.  In these files I have also corrected the
indentation in some places, and corrected the frequency controls in
nav3.xml (which does not seem to be in use), and corrected a few obvious
hotspot position bugs.  Where the radios used wrapping to toggle the
ident button between 0 and 1, I have changed this to use
"property-toggle" instead.
This commit is contained in:
david 2003-01-19 22:00:08 +00:00
parent 34ac18b305
commit f026a4db74
9 changed files with 231 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
Aircraft/Instruments/adf-hi.xml
View file

@ -109,22 +109,22 @@ properties' values.
</transformation>
</transformations>
</layer>
<layer>
<name>bezel</name>
<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>bezel</name>
<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>
@ -135,9 +135,9 @@ properties' values.
<x2>1.0</x2>
<y2>0.5</y2>
</texture>
<w>124</w>
<h>124</h>
<transformations>
<w>124</w>
<h>124</h>
<transformations>
<transformation>
<type>rotation</type>
<property>/orientation/roll-deg</property>
@ -146,28 +146,28 @@ properties' values.
<scale>1.0</scale>
<wrap>1</wrap>
</transformation>
<transformation>
<type>x-shift</type>
<offset>2</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</layer>
<transformation>
<type>x-shift</type>
<offset>2</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</layer>
<layer>
<name>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>
<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>
@ -197,13 +197,13 @@ properties' values.
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>large clockwise rotation</name>
@ -213,30 +213,30 @@ properties' values.
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>small counter-clockwise rotation</name>
<button>0</button>
<x>-46</x>
<y>-65</y>
<y>-56</y>
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>large counter-clockwise rotation</name>
<button>1</button>
@ -245,13 +245,13 @@ properties' values.
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
</actions>

18
Aircraft/Instruments/adf-radio.xml
View file

@ -274,7 +274,8 @@ properties' values.
<property alias="../../../../params/adf-freq-standby-prop"/>
<step>-1</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -291,7 +292,8 @@ properties' values.
<property alias="../../../../params/adf-freq-standby-prop"/>
<step>-100</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -308,7 +310,8 @@ properties' values.
<property alias="../../../../params/adf-freq-standby-prop"/>
<step>1</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -325,7 +328,8 @@ properties' values.
<property alias="../../../../params/adf-freq-standby-prop"/>
<step>100</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -384,12 +388,8 @@ properties' values.
<w>14</w>
<h>16</h>
<binding>
<command>property-adjust</command>
<command>property-toggle</command>
<property alias="../../../../params/adf-morse-ident-toggle-prop"/>
<step>1.0</step>
<min>0</min>
<max>1</max>
<wrap>1</wrap>
</binding>
</action>

136
Aircraft/Instruments/adf.xml
View file

@ -91,6 +91,7 @@ properties' values.
</transformation>
</transformations>
</layer>
<layer>
<name>Plane</name>
<texture>
@ -109,22 +110,23 @@ properties' values.
</transformation>
</transformations>
</layer>
<layer>
<name>bezel</name>
<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>bezel</name>
<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>
@ -135,9 +137,9 @@ properties' values.
<x2>1.0</x2>
<y2>0.5</y2>
</texture>
<w>124</w>
<h>124</h>
<transformations>
<w>124</w>
<h>124</h>
<transformations>
<transformation>
<type>rotation</type>
<property>/orientation/roll-deg</property>
@ -146,28 +148,28 @@ properties' values.
<scale>1.0</scale>
<wrap>1</wrap>
</transformation>
<transformation>
<type>x-shift</type>
<offset>2</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</layer>
<transformation>
<type>x-shift</type>
<offset>2</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</layer>
<layer>
<name>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>
<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>
@ -197,13 +199,13 @@ properties' values.
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>large clockwise rotation</name>
@ -213,30 +215,30 @@ properties' values.
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>small counter-clockwise rotation</name>
<button>0</button>
<x>-46</x>
<y>-65</y>
<y>-56</y>
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>large counter-clockwise rotation</name>
<button>1</button>
@ -245,13 +247,13 @@ properties' values.
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
<command>property-adjust</command>
<property>/radios/kr-87/inputs/rotation-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
</actions>

16
Aircraft/Instruments/gyro.xml
View file

@ -291,7 +291,7 @@ properties' values.
<property>/instrumentation/heading-indicator/offset-deg</property>
<step>-1</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>true</wrap>
</binding>
</action>
@ -308,7 +308,7 @@ properties' values.
<property>/instrumentation/heading-indicator/offset-deg</property>
<step>-5</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -325,7 +325,7 @@ properties' values.
<property>/instrumentation/heading-indicator/offset-deg</property>
<step>1</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -342,7 +342,7 @@ properties' values.
<property>/instrumentation/heading-indicator/offset-deg</property>
<step>5</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -359,7 +359,7 @@ properties' values.
<property>/autopilot/settings/heading-bug-deg</property>
<step>-1</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -376,7 +376,7 @@ properties' values.
<property>/autopilot/settings/heading-bug-deg</property>
<step>-5</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -393,7 +393,7 @@ properties' values.
<property>/autopilot/settings/heading-bug-deg</property>
<step>1</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -410,7 +410,7 @@ properties' values.
<property>/autopilot/settings/heading-bug-deg</property>
<step>5</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>

12
Aircraft/Instruments/kr-87adf.xml
View file

@ -800,7 +800,8 @@ properties' values.
<property>/radios/kr-87/outputs/selected-khz</property>
<step>-1</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -823,7 +824,8 @@ properties' values.
<property>/radios/kr-87/outputs/selected-khz</property>
<step>1</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -847,7 +849,8 @@ properties' values.
<property>/radios/kr-87/outputs/selected-khz</property>
<step>-25</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -871,7 +874,8 @@ properties' values.
<property>/radios/kr-87/outputs/selected-khz</property>
<step>25</step>
<min>100</min>
<max>1299</max>
<max>1300</max>
<resolution>1</resolution>
<wrap>1</wrap>
</binding>
</action>

67
Aircraft/Instruments/nav3.xml
View file

@ -365,29 +365,30 @@ properties' values.
</transformations>
</layer>
</layers>
</layers>
<actions>
<action>
<name>Coarse Radio Tune - clockwise</name>
<button>0</button>
<x>-56</x>
<y>-56</y>
<w>12</w>
<h>24</h>
<binding>
<action>
<name>Fine Radio Tune - clockwise</name>
<button>0</button>
<x>-56</x>
<y>-56</y>
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<step>-0.5</step>
<step>-0.05</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</binding>
</action>
<action>
<name>Fine Radio Tune - clockwise</name>
<name>Coarse Radio Tune - clockwise</name>
<button>1</button>
<x>-56</x>
<y>-56</y>
@ -396,15 +397,16 @@ properties' values.
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<step>-0.05</step>
<step>-0.5</step>
<min>108.0</min>
<max>117.95</max>
<wrap>1</wrap>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>OBS small counter-clockwise rotation</name>
<name>Fine Radio Tune - counter-clockwise</name>
<button>0</button>
<x>-46</x>
<y>-56</y>
@ -413,27 +415,30 @@ properties' values.
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<step>-0.5</step>
<step>-0.05</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</action>
<action>
<name>OBS large counter-clockwise rotation</name>
<button>1</button>
<x>-46</x>
<y>-56</y>
<w>12</w>
<h>24</h>
<binding>
<name>Coarse Radio Tune - counter-clockwise</name>
<button>1</button>
<x>-46</x>
<y>-56</y>
<w>12</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<step>-0.5</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</binding>
</action>
<action>
@ -544,12 +549,8 @@ properties' values.
<w>24</w>
<h>24</h>
<binding>
<command>property-adjust</command>
<command>property-toggle</command>
<property alias="../../../../params/nav-morse-ident-toggle-prop"/>
<step>1.0</step>
<min>0</min>
<max>1</max>
<wrap>1</wrap>
</binding>
</action>
-->

30
Aircraft/Instruments/navcom-kx155.xml
View file

@ -208,7 +208,8 @@ properties' values.
<property alias="../../../../params/nav-freq-standby-prop"/>
<step>-0.05</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -225,7 +226,8 @@ properties' values.
<property alias="../../../../params/nav-freq-standby-prop"/>
<step>-0.5</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -242,7 +244,8 @@ properties' values.
<property alias="../../../../params/nav-freq-standby-prop"/>
<step>0.05</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -259,7 +262,8 @@ properties' values.
<property alias="../../../../params/nav-freq-standby-prop"/>
<step>0.5</step>
<min>108.0</min>
<max>117.95</max>
<max>118.0</max>
<resolution>0.05</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -276,8 +280,9 @@ properties' values.
<command>property-adjust</command>
<property alias="../../../../params/comm-freq-standby-prop"/>
<step>-0.025</step>
<min>0.0</min>
<min>118.0</min>
<max>140.0</max>
<resolution>0.025</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -293,8 +298,9 @@ properties' values.
<command>property-adjust</command>
<property alias="../../../../params/comm-freq-standby-prop"/>
<step>-1.0</step>
<min>0.0</min>
<min>118.0</min>
<max>140.0</max>
<resolution>0.025</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -310,8 +316,9 @@ properties' values.
<command>property-adjust</command>
<property alias="../../../../params/comm-freq-standby-prop"/>
<step>0.025</step>
<min>0.0</min>
<min>118.0</min>
<max>140.0</max>
<resolution>0.025</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -327,8 +334,9 @@ properties' values.
<command>property-adjust</command>
<property alias="../../../../params/comm-freq-standby-prop"/>
<step>1.0</step>
<min>0.0</min>
<min>118.0</min>
<max>140.0</max>
<resolution>0.025</resolution>
<wrap>1</wrap>
</binding>
</action>
@ -403,12 +411,8 @@ properties' values.
<w>14</w>
<h>14</h>
<binding>
<command>property-adjust</command>
<command>property-toggle</command>
<property alias="../../../../params/nav-morse-ident-toggle-prop"/>
<step>1.0</step>
<min>0</min>
<max>1</max>
<wrap>1</wrap>
</binding>
</action>

14
Aircraft/Instruments/navcom-radio.xml
View file

@ -353,7 +353,7 @@ properties' values.
<action>
<name>com frequency decrease (decimal part)</name>
<button>0</button>
<x>-36</x>
<x>-32</x>
<y>-32</y>
<w>16</w>
<h>32</h>
@ -372,7 +372,7 @@ properties' values.
<action>
<name>com frequency decrease (integer part)</name>
<button>1</button>
<x>-36</x>
<x>-32</x>
<y>-32</y>
<w>16</w>
<h>32</h>
@ -391,7 +391,7 @@ properties' values.
<action>
<name>com frequency increase (decimal part)</name>
<button>0</button>
<x>-20</x>
<x>-16</x>
<y>-32</y>
<w>16</w>
<h>32</h>
@ -410,7 +410,7 @@ properties' values.
<action>
<name>com frequency increase (integer part)</name>
<button>1</button>
<x>-20</x>
<x>-16</x>
<y>-32</y>
<w>16</w>
<h>32</h>
@ -495,12 +495,8 @@ properties' values.
<w>14</w>
<h>16</h>
<binding>
<command>property-adjust</command>
<command>property-toggle</command>
<property alias="../../../../params/nav-morse-ident-toggle-prop"/>
<step>1.0</step>
<min>0</min>
<max>1</max>
<wrap>1</wrap>
</binding>
</action>

28
Aircraft/Instruments/rmi.xml
View file

@ -78,8 +78,8 @@ properties' values.
<h>105</h>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-1.5</offset>
<type>x-shift</type>
<offset>-1.5</offset>
</transformation>
<transformation>
<type>y-shift</type>
@ -92,8 +92,8 @@ properties' values.
<name>fixed center</name>
<condition>
<equals>
<property alias="../../../../../params/dg-style"/>
<value>1</value>
<property alias="../../../../../params/dg-style"/>
<value>1</value>
</equals>
</condition>
<texture>
@ -126,8 +126,8 @@ properties' values.
<x2>1.0</x2>
<y2>0.5</y2>
</texture>
<w>128</w>
<h>128</h>
<w>128</w>
<h>128</h>
<transformations>
<transformation>
<type>x-shift</type>
@ -137,11 +137,11 @@ properties' values.
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</transformations>
</layer>
<layer>
<layer>
<name>OBS Knob</name>
<texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path>
@ -196,7 +196,7 @@ properties' values.
</transformation>
</transformations>
</layer>
<layer>
<layer>
<name>ADF Needle</name>
<texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@ -239,7 +239,7 @@ properties' values.
</transformation>
</transformations>
</layer>
</layers>
</layers>
<actions>
@ -255,7 +255,7 @@ properties' values.
<property>/steam/gyro-compass-error-deg</property>
<step>-1</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>true</wrap>
</binding>
</action>
@ -272,7 +272,7 @@ properties' values.
<property>/steam/gyro-compass-error-deg</property>
<step>-5</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -289,7 +289,7 @@ properties' values.
<property>/steam/gyro-compass-error-deg</property>
<step>1</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>
@ -306,7 +306,7 @@ properties' values.
<property>/steam/gyro-compass-error-deg</property>
<step>5</step>
<min>0</min>
<max>359</max>
<max>360</max>
<wrap>1</wrap>
</binding>
</action>