Distributed Power: use ORTS_SIGNED_TRACTION_BRAKING to compute load

Author: Csantucci

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

@@ -929,7 +929,7 @@ public string GetDPDebugStatus()
             return status.ToString();
         }
 
-        public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABViewControlUnits.KILO_LBS)// used by the TrainDpuInfo window
+        public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABViewControlUnits.NONE)// used by the TrainDpuInfo window
         {
             string throttle = "";
             if (ThrottlePercent > 0)
@@ -968,15 +968,46 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
             status.AppendFormat("{0}\t", throttle);
 
             // Load
-            var data = 0.0f;
-            if (ThrottlePercent > 0)
+            var data = 0f;
+            if (FilteredMotiveForceN != 0)
+                data = Math.Abs(this.FilteredMotiveForceN);
+            else
+                data = Math.Abs(this.LocomotiveAxle.DriveForceN);
+            if (DynamicBrakePercent > 0)
             {
-                if (FilteredMotiveForceN != 0)
-                    data = FilteredMotiveForceN / MaxForceN * MaxCurrentA;
-                else
-                    data = LocomotiveAxle.DriveForceN / MaxForceN * MaxCurrentA;
+                data = -Math.Abs(DynamicBrakeForceN);
+            }
+            if (loadUnits == CABViewControlUnits.NONE)
+                loadUnits = IsMetric ? CABViewControlUnits.AMPS : CABViewControlUnits.KILO_LBS;
+            switch (loadUnits)
+            {
+                case CABViewControlUnits.AMPS:
+                    if (ThrottlePercent > 0)
+                    {
+                        data = (data / MaxForceN) * MaxCurrentA;
+                    }
+                    if (DynamicBrakePercent > 0)
+                    {
+                        data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
+                    }
+                    status.AppendFormat("{0:F0} amps\t", data);
+                    break;
+
+                case CABViewControlUnits.NEWTONS:
+                    status.AppendFormat("{0:F0} N\t", data);
+                    break;
+
+                case CABViewControlUnits.KILO_NEWTONS:
+                    data = data / 1000.0f;
+                    status.AppendFormat("{0:F0} kN\t", data);
+                    break;
+
+                case CABViewControlUnits.KILO_LBS:
+                default:
+                    data = N.ToLbf(data) * 0.001f;
+                    status.AppendFormat("{0:F0} klbf\t", data);
+                    break;
             }
-            status.AppendFormat("{0:F0} amps\t", Math.Abs(data));
 
             // BP
             var brakeInfoValue = brakeValue(Simulator.Catalog.GetString("BP"), Simulator.Catalog.GetString("EOT"));

Source/RunActivity/Viewer3D/RollingStock/SubSystems/DistributedPowerInterface.cs

@@ -157,7 +157,7 @@ public void ExitWindow(DPIWindow window)
     public class DPDefaultWindow : DPIWindow
     {
         public bool FullTable;
-        public CABViewControlUnits LoadUnits = CABViewControlUnits.KILO_LBS;
+        public CABViewControlUnits LoadUnits = CABViewControlUnits.NONE;
         public DPDefaultWindow(DistributedPowerInterface dpi, CabViewControl control) : base(dpi, 640, 240)
         {
             var param = (control as CVCScreen).CustomParameters;