Merge branch 'master' of git://gitorious.org/fg/fgdata

Aircraft/Generic/WalkView/walkview.nas

@@ -362,7 +362,7 @@ var TO_DEG = 180/math.pi;
 var walkers = {};
 
 var closerXY = func (pos, p1, p2) {
-    l1 = [p1[0] - pos[0], p1[1] - pos[1]];
+    var l1 = [p1[0] - pos[0], p1[1] - pos[1]];
-    l2 = [p2[0] - pos[0], p2[1] - pos[1]];
+    var l2 = [p2[0] - pos[0], p2[1] - pos[1]];
     return (l1[0]*l1[0] + l1[1]*l1[1]) - (l2[0]*l2[0] + l2[1]*l2[1]);
 }

Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml

@@ -279,7 +279,10 @@ properties' values.
   <animation>
     <type>select</type>
     <object-name>vs-minus</object-name>
-    <object-name>vs-digits-minus</object-name>
+    <object-name>vs-digit2-minus</object-name>
+    <object-name>vs-digit3-minus</object-name>
+    <object-name>vs-digit4-minus</object-name>
+    <object-name>vs-digit5-minus</object-name>
     <condition>
       <and>
         <equals>
@@ -287,15 +290,18 @@ properties' values.
           <value type="bool">true</value>
         </equals>
         <greater-than>
-          <value>0</value>
           <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+          <value>0</value>
         </greater-than>
       </and>
     </condition>
   </animation>
   <animation>
     <type>select</type>
-    <object-name>vs-digits</object-name>
+    <object-name>vs-digit2</object-name>
+    <object-name>vs-digit3</object-name>
+    <object-name>vs-digit4</object-name>
+    <object-name>vs-digit5</object-name>
     <condition>
       <and>
         <equals>
@@ -303,8 +309,8 @@ properties' values.
           <value type="bool">true</value>
         </equals>
         <less-than>
-          <value>0</value>
           <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+          <value>0</value>
         </less-than>
       </and>
     </condition>
@@ -312,11 +318,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit5</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -331,11 +336,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit4</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -350,11 +354,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit3</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -369,11 +372,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit2</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -388,11 +390,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit5-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -407,11 +408,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit4-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -426,11 +426,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit3-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -445,11 +444,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit2-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>

Environment/metarinterpolator.xml

@@ -28,7 +28,7 @@
     -->
     <name>MetarController:pressure-sea-level-inhg</name>
     <type>noise-spike</type>
-    <max-rate-of-change>0.0003</max-rate-of-change>
+    <max-rate-of-change>0.006</max-rate-of-change>
     <enable>
       <condition>
         <property>/environment/metar/valid</property>

Input/Keyboard/multikey.xml

@@ -89,16 +89,6 @@
 			</binding>
 		</key>
 
-		<key n="99">
-			<name>c</name>
-			<desc>Clouds</desc>
-			<exit/>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>clouds</dialog-name>
-			</binding>
-		</key>
-
 		<key n="102">
 			<name>f</name>
 			<desc>Fuel and Payload</desc>
@@ -241,7 +231,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "Fair weather");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -253,7 +242,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "METAR");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -265,7 +253,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "none");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -277,7 +264,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "Thunderstorm");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>

Nasal/mp_broadcast.nas

@@ -45,24 +45,25 @@ BroadcastChannel.new = func (mpp_path, process,
                              accept_predicate = nil,
                              on_disconnect = nil,
                              enable_send=1) {
-  obj = { parents      : [BroadcastChannel],
+  var obj = { parents      : [BroadcastChannel],
-          mpp_path     : mpp_path,
+              mpp_path     : mpp_path,
-          send_node    : enable_send ? props.globals.getNode(mpp_path, 1) 
+              send_node    : enable_send ? props.globals.getNode(mpp_path, 1) 
-                                     : nil,
+                                         : nil,
-          process_msg  : process,
+              process_msg  : process,
-          send_to_self : send_to_self,
+              send_to_self : send_to_self,
-          accept_predicate : (accept_predicate != nil) ? accept_predicate :
+              accept_predicate :
-                                                         func (p) { return 1; },
+                (accept_predicate != nil) ? accept_predicate
-          on_disconnect    : (on_disconnect != nil) ? on_disconnect :
+                                          : func (p) { return 1; },
-                                                      func (p) { return; },
+              on_disconnect : (on_disconnect != nil) ? on_disconnect
-          # Internal state.
+                                                     : func (p) { return; },
-          send_buf     : [],
+              # Internal state.
-          peers        : {},
+              send_buf     : [],
-          loopid       : 0,
+              peers        : {},
-          PERIOD       : 1.3,
+              loopid       : 0,
-          last_time    : 0.0,  # For join handling.
+              PERIOD       : 1.3,
-          last_send    : 0.0,  # For the send queue 
+              last_time    : 0.0,  # For join handling.
-          SEND_TIME    : 0.5 };
+              last_send    : 0.0,  # For the send queue 
+              SEND_TIME    : 0.5 };
   if (enable_send and (obj.send_node == nil)) {
     printlog("warn",
              "BroadcastChannel invalid send node.");
@@ -232,10 +233,10 @@ Binary.decodeCoord = func (str) {
 #       The same object is seldom used for both sending and receiving.
 var MessageChannel = {};
 MessageChannel.new = func (n = nil, process = nil) {
-  obj = { parents     : [MessageChannel],
+  var obj = { parents     : [MessageChannel],
-          node        : n, 
+              node        : n, 
-          process_msg : process,
+              process_msg : process,
-          old         : "" };
+              old         : "" };
   return obj;
 }
 MessageChannel.update = func {

Nasal/startup.nas

@@ -1,6 +1,4 @@
 var set_runway_from_metar_wind = func {
-	if (!getprop("/environment/realwx/enabled"))
-		return printlog("info", "metar-rwy: no live weather");
 	if (!getprop("/environment/metar/valid"))
 		return printlog("info", "metar-rwy: no valid metar");
 	if (!getprop("/sim/startup/options/airport"))

gui/dialogs/display.xml

@@ -42,13 +42,23 @@
       </binding>
     </checkbox>
 
-    <item>
+    <checkbox>
+      <halign>left</halign>
       <label>Show 2D Panel</label>
       <property>/sim/panel/visibility</property>
       <binding>
         <command>dialog-apply</command>
       </binding>
-    </item>
+    </checkbox>
+
+    <checkbox>
+      <halign>left</halign>
+      <label>Autohide Menubar</label>
+      <property>/sim/menubar/autovisibility/enabled</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
   </group>
 
   <hrule/>

gui/dialogs/weather.xml

@@ -1467,7 +1467,6 @@
           <command>dialog-apply</command>
           <object-name>metar-updates-winds-aloft</object-name>
         </binding>
-        <name>aloft</name>
       </checkbox>
 
     </group>
@@ -1493,6 +1492,12 @@
       <empty>
         <stretch>true</stretch>
       </empty>
+      <checkbox>
+        <property>/environment/metar/valid</property>
+        <label>valid</label>
+        <live>true</live>
+        <editable>false</editable>
+      </checkbox>
     </group>
 
     <textbox>

preferences.xml

@@ -290,14 +290,14 @@ Started September 2000 by David Megginson, david@megginson.com
     <name>autopilot helpers</name>
     <path>Aircraft/Generic/generic-autopilot-helper.xml</path>
    </autopilot>
-   <property-rule>
-     <name>Environment Interpolation Rule</name>
-     <path>Environment/interpolator.xml</path>
-   </property-rule>
    <property-rule>
      <name>Environment METAR Interpolation Rule</name>
      <path>Environment/metarinterpolator.xml</path>
    </property-rule>
+   <property-rule>
+     <name>Environment Interpolation Rule</name>
+     <path>Environment/interpolator.xml</path>
+   </property-rule>
   </systems>
   <instrumentation>
    <path>Aircraft/Generic/generic-instrumentation.xml</path>