Merge pull request #603 from mbm-OR/bugfix/Fix-HUD-DPinfo

Bug fix for https://bugs.launchpad.net/or/+bug/1961304. HUD - DPI extended page, misaligned.

Author: cjakeman

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -919,9 +919,9 @@ public string GetDPDebugStatus()
 
             var status = new StringBuilder();
             status.AppendFormat("{0}({1})\t", CarID, DPUnitID);
+            status.AppendFormat("{0}\t", throttle);
             status.AppendFormat("{0} {1}\t", GetStringAttribute.GetPrettyName(Direction), Flipped ? Simulator.Catalog.GetString("(flipped)") : "");
             status.AppendFormat("{0}\t", IsLeadLocomotive() || RemoteControlGroup < 0 ? "———" : RemoteControlGroup == 0 ? Simulator.Catalog.GetString("Sync") : Simulator.Catalog.GetString("Async"));
-            status.AppendFormat("{0}\t", throttle);
             status.AppendFormat("{0}\t", FormatStrings.FormatFuelVolume(DieselLevelL, IsMetric, IsUK));
             status.AppendFormat("{0}{1}", FormatStrings.FormatForce(MotiveForceN, IsMetric), CouplerOverloaded ? "???" : "");
             status.Append(DieselEngines.GetDPStatus());
@@ -1098,17 +1098,16 @@ public override string GetMultipleUnitsConfiguration()
         private static string[] DpuLabels;
         private static string[] DPULabels;
 
-        private static void SetDebugLabels(int numberOfEngines)
+        private static void SetDebugLabels()
         {
-            MaxNumberOfEngines = numberOfEngines;
             var labels = new StringBuilder();
             labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("ID"));
             labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Throttle"));
             labels.AppendFormat("{0}\t", Simulator.Catalog.GetParticularString("NonSteam", "Reverser"));
             labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Remote"));
             labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Fuel"));
             labels.AppendFormat("{0}\t", Simulator.Catalog.GetString("Tractive Effort"));
-            labels.Append(DieselEngines.SetDebugLabels(numberOfEngines));
+            labels.Append(DieselEngines.SetDebugLabels());
             DebugLabels = labels.ToString().Split('\t');
         }
 
@@ -1135,10 +1134,11 @@ private static void SetDPULabels(bool dpuFull, int numberOfEngines)
             }
         }
 
-        public static string GetDebugTableBase(int locomotivesInTrain, int maxNumberOfEngines)
+        public static string GetDebugTableBase(int locomotivesInTrain)
         {
-            if (MaxNumberOfEngines != maxNumberOfEngines || DebugLabels == null)
-                SetDebugLabels(maxNumberOfEngines);
+            if (DebugLabels == null)
+                SetDebugLabels();
+
             string table = "";
             for (var i = 0; i < DebugLabels.Length; i++)
             {

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs

@@ -377,11 +377,10 @@ public DieselEnum GetEnumerator()
             return new DieselEnum(DEList.ToArray());
         }
 
-        public static string SetDebugLabels(int numberOfEngines)
+        public static string SetDebugLabels()
         {
             var labels = new StringBuilder();
             var tabs = "\t";
-            for (var i = 1; i < numberOfEngines; i++) tabs += "\t";
             labels.AppendFormat("{0}{1}", Simulator.Catalog.GetString("Status"), tabs);
             labels.AppendFormat("{0}{1}", Simulator.Catalog.GetParticularString("HUD", "Power"), tabs);
             labels.AppendFormat("{0}{1}", Simulator.Catalog.GetString("Load"), tabs);

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -718,19 +718,17 @@ void TextPageDistributedPowerInfo(TableData table)
             var train = locomotive.Train;
 
             int numberOfDieselLocomotives = 0;
-            int maxNumberOfEngines = 0;
             for (var i = 0; i<train.Cars.Count; i++)
             {
                 if (train.Cars[i] is MSTSDieselLocomotive)
                 {
                     numberOfDieselLocomotives++;
-                    maxNumberOfEngines = Math.Max(maxNumberOfEngines, (train.Cars[i] as MSTSDieselLocomotive).DieselEngines.Count);
                 }
             }
             if (numberOfDieselLocomotives > 0)
             {
                 var row = table.CurrentRow;
-                TableAddLines(table, MSTSDieselLocomotive.GetDebugTableBase(numberOfDieselLocomotives, maxNumberOfEngines));
+                TableAddLines(table, MSTSDieselLocomotive.GetDebugTableBase(numberOfDieselLocomotives));
                 var k = 0;
                 var dpUnitId = 0;
                 for (var i = 0; i<train.Cars.Count; i++)