Heading tooltips unified 0->360

Heading should be given as 0=360. See https://sourceforge.net/p/flightgear/codetickets/2874/
HHS81 · Mar 26, 2024 · 560a99c · 560a99c
1 parent 1958e72
commit 560a99c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/Models/Instruments/hi.xml b/Models/Instruments/hi.xml
@@ -179,7 +179,7 @@
      <command>set-tooltip</command>
      <tooltip-id>heading-bug</tooltip-id>
      <mapping>heading</mapping>
-     <label>Heading Bug: %3.0f</label>
+     <label>Heading Bug: %3d</label>
      <property>autopilot/settings/heading-bug-deg</property>
    </binding>
   </hovered>
@@ -303,7 +303,9 @@
         <mapping>nasal</mapping>
         <script>
           var heading = getprop("instrumentation/heading-indicator/indicated-heading-deg");
-          var returnString = "Heading: " ~ sprintf("%3.0f", heading);
+          heading = math.round(heading);
+          if (heading == 0) heading = 360;
+          var returnString = "Heading: " ~ sprintf("%3d", heading);
           if (getprop("instrumentation/heading-indicator/caged-flag")) {
               returnString = returnString ~ "\n(caged)";
           }
@@ -408,7 +410,7 @@
         <command>set-tooltip</command>
         <tooltip-id>heading-bug</tooltip-id>
         <mapping>heading</mapping>
-        <label>Heading Bug: %3.0f</label>
+        <label>Heading Bug: %3d</label>
         <property>autopilot/settings/heading-bug-deg</property>
       </binding>
     </hovered>
@@ -508,7 +510,7 @@
         <command>set-tooltip</command>
         <tooltip-id>heading-bug</tooltip-id>
         <mapping>heading</mapping>
-        <label>Heading Bug: %3.0f</label>
+        <label>Heading Bug: %3d</label>
         <property>autopilot/settings/heading-bug-deg</property>
       </binding>
     </hovered>
@@ -726,7 +728,9 @@
         <mapping>nasal</mapping>
         <script>
           var heading = getprop("instrumentation/heading-indicator/indicated-heading-deg");
-          var returnString = "Heading: " ~ sprintf("%3.0f", heading);
+          heading = math.round(heading);
+          if (heading == 0) heading = 360;
+          var returnString = "Heading: " ~ sprintf("%3d", heading);
           if (getprop("instrumentation/heading-indicator/caged-flag")) {
               returnString = returnString ~ "\n(caged)";
           }
@@ -947,7 +951,9 @@
         <mapping>nasal</mapping>
         <script>
           var heading = getprop("instrumentation/heading-indicator/indicated-heading-deg");
-          var returnString = "Heading: " ~ sprintf("%3.0f", heading);
+          heading = math.round(heading);
+          if (heading == 0) heading = 360;
+          var returnString = "Heading: " ~ sprintf("%3d", heading);
           if (getprop("instrumentation/heading-indicator/caged-flag")) {
               returnString = returnString ~ "\n(caged)";
           }

diff --git a/Models/Instruments/ki227_228.xml b/Models/Instruments/ki227_228.xml
@@ -179,12 +179,13 @@
     </action>
 
     <hovered>
-     <binding>
-       <command>set-tooltip</command>
-       <tooltip-id>adf-hdg</tooltip-id>
-       <label>ADF Heading: %3d</label>
-       <property alias="../../../../params/rotation-deg"/>
-    </binding>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>adf-hdg</tooltip-id>
+        <mapping>heading</mapping>
+        <label>ADF Heading: %3d</label>
+        <property alias="../../../../params/rotation-deg"/>
+      </binding>
     </hovered>
   </animation>