From 217dcb38fa5964326268880a4fbd8fdf2afe982f Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Fri, 12 Mar 2004 15:06:04 +0000
Subject: [PATCH] David Culp:

Add clickable range selection for the radar and wxradar.  Right
now it is clickable only between 20 and 40 mile ranges, which should work for
most uses.
---
 Aircraft/Instruments/radar.xml   | 104 ++++++++++++++++++++++++++++--
 Aircraft/Instruments/wxradar.xml | 106 +++++++++++++++++++++++++++++--
 2 files changed, 198 insertions(+), 12 deletions(-)

diff --git a/Aircraft/Instruments/radar.xml b/Aircraft/Instruments/radar.xml
index f1daa09c4..80ee123f0 100644
--- a/Aircraft/Instruments/radar.xml
+++ b/Aircraft/Instruments/radar.xml
@@ -18,14 +18,20 @@
   </layer>
 
   <layer>
-   <name>target1</name>
+   <name>target1 - range 40</name>
    <w>8</w>
    <h>17</h>
    <condition>
-    <less-than>
-     <property>ai/models/aircraft[1]/radar/range-nm</property>
-     <value>43</value>
-    </less-than>
+    <and>
+     <less-than>
+      <property>ai/models/aircraft[1]/radar/range-nm</property>
+      <value>43</value>
+     </less-than>
+     <equals>
+      <property>/instrumentation/radar/range</property>
+      <value>40</value>
+     </equals>
+    </and>
    </condition>
    <texture>
     <path>Aircraft/Instruments/Textures/radar_misc.rgb</path>
@@ -52,6 +58,48 @@
    </transformations>
   </layer>
 
+  <layer>
+   <name>target1 - range 20</name>
+   <w>8</w>
+   <h>17</h>
+   <condition>
+    <and>
+     <less-than>
+      <property>ai/models/aircraft[1]/radar/range-nm</property>
+      <value>22</value>
+     </less-than>
+     <equals>
+      <property>/instrumentation/radar/range</property>
+      <value>20</value>
+     </equals>
+    </and>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/radar_misc.rgb</path>
+    <x1>0.0429687</x1>
+    <y1>0.8320312</y1>
+    <x2>0.0703125</x2>
+    <y2>0.8945312</y2>
+   </texture>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <property>ai/models/aircraft[1]/radar/x-shift</property>
+     <scale>5.1</scale>
+    </transformation>
+    <transformation>
+     <type>y-shift</type>
+     <property>ai/models/aircraft[1]/radar/y-shift</property>
+     <scale>5.1</scale>
+    </transformation>
+    <transformation>
+     <type>rotation</type>
+     <property>ai/models/aircraft[1]/radar/rotation</property>
+    </transformation>
+   </transformations>
+  </layer>
+
+
   <layer>
    <name>frame</name>
    <w>256</w>
@@ -220,6 +268,50 @@
     </transformations>
   </layer>
 
-
  </layers>
+
+ <actions>
+
+  <action>
+   <name>set range 40</name>
+   <button>0</button>
+   <x>-120</x>
+   <y>-120</y>
+   <w>35</w>
+   <h>35</h>
+   <condition>
+    <equals>
+     <property>/instrumentation/radar/range</property>
+     <value>20</value>
+    </equals>
+   </condition>
+   <binding>
+    <command>property-assign</command>
+    <property>/instrumentation/radar/range</property>
+    <value>40</value>
+   </binding>
+  </action>
+
+  <action>
+   <name>set range 20</name>
+   <button>0</button>
+   <x>-120</x>
+   <y>-120</y>
+   <w>35</w>
+   <h>35</h>
+   <condition>
+    <equals>
+     <property>/instrumentation/radar/range</property>
+     <value>40</value>
+    </equals>
+   </condition>
+   <binding>
+    <command>property-assign</command>
+    <property>/instrumentation/radar/range</property>
+    <value>20</value>
+   </binding>
+  </action>
+
+ </actions>
+
 </PropertyList>
diff --git a/Aircraft/Instruments/wxradar.xml b/Aircraft/Instruments/wxradar.xml
index b85f7abb0..d4f2de15b 100644
--- a/Aircraft/Instruments/wxradar.xml
+++ b/Aircraft/Instruments/wxradar.xml
@@ -18,14 +18,20 @@
   </layer>
 
   <layer>
-   <name>target1</name>
+   <name>target1 - range 40</name>
    <w>20</w>
    <h>13</h>
    <condition>
-    <less-than>
-     <property>ai/models/thunderstorm[1]/radar/range-nm</property>
-     <value>43</value>
-    </less-than>
+    <and>
+     <less-than>
+      <property>ai/models/thunderstorm[1]/radar/range-nm</property>
+      <value>43</value>
+     </less-than>
+     <equals>
+      <property>/instrumentation/radar/range</property>
+      <value>40</value>
+     </equals>
+    </and>
    </condition>
    <texture>
     <path>Aircraft/Instruments/Textures/radar_misc.rgb</path>
@@ -53,6 +59,48 @@
    </transformations>
   </layer>
 
+  <layer>
+   <name>target1 - range 20</name>
+   <w>20</w>
+   <h>13</h>
+   <condition>
+    <and>
+     <less-than>
+      <property>ai/models/thunderstorm[1]/radar/range-nm</property>
+      <value>22</value>
+     </less-than>
+     <equals>
+      <property>/instrumentation/radar/range</property>
+      <value>20</value>
+     </equals>
+    </and>
+   </condition>
+   <texture>
+    <path>Aircraft/Instruments/Textures/radar_misc.rgb</path>
+    <x1>0.078125</x1>
+    <y1>0.605468</y1>
+    <x2>0.414062</x2>
+    <y2>0.8125</y2>
+   </texture>
+   <transformations>
+    <transformation>
+     <type>x-shift</type>
+     <property>ai/models/thunderstorm[1]/radar/x-shift</property>
+     <scale>5.1</scale>
+    </transformation>
+    <transformation>
+     <type>y-shift</type>
+     <property>ai/models/thunderstorm[1]/radar/y-shift</property>
+     <scale>5.1</scale>
+    </transformation>
+    <transformation>
+     <type>rotation</type>
+     <property>ai/models/thunderstorm[1]/radar/rotation</property>
+     <offset>-90</offset>
+    </transformation>
+   </transformations>
+  </layer>
+
   <layer>
    <name>frame</name>
    <w>256</w>
@@ -221,6 +269,52 @@
     </transformations>
   </layer>
 
-
  </layers>
+
+ <actions>
+
+  <action>
+   <name>set range 40</name>
+   <button>0</button>
+   <x>-120</x>
+   <y>-120</y>
+   <w>35</w>
+   <h>35</h>
+   <condition>
+    <equals>
+     <property>/instrumentation/radar/range</property>
+     <value>20</value>
+    </equals>
+   </condition>
+   <binding>
+    <command>property-assign</command>
+    <property>/instrumentation/radar/range</property>
+    <value>40</value>
+   </binding>
+  </action>
+
+  <action>
+   <name>set range 20</name>
+   <button>0</button>
+   <x>-120</x>
+   <y>-120</y>
+   <w>35</w>
+   <h>35</h>
+   <condition>
+    <equals>
+     <property>/instrumentation/radar/range</property>
+     <value>40</value>
+    </equals>
+   </condition>
+   <binding>
+    <command>property-assign</command>
+    <property>/instrumentation/radar/range</property>
+    <value>20</value>
+   </binding>
+  </action>
+
+ </actions>
+
+
+
 </PropertyList>
\ No newline at end of file