Distributed power: manage yellow colour for dynamic brake display

Author: Csantucci

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

@@ -990,25 +990,32 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
                     {
                         data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
                     }
-                    status.AppendFormat("{0:F0} amps\t", data);
+                    status.AppendFormat("{0:F0} amps", data);
                     break;
 
                 case CABViewControlUnits.NEWTONS:
-                    status.AppendFormat("{0:F0} N\t", data);
+                    status.AppendFormat("{0:F0} N", data);
                     break;
 
                 case CABViewControlUnits.KILO_NEWTONS:
                     data = data / 1000.0f;
-                    status.AppendFormat("{0:F0} kN\t", data);
+                    status.AppendFormat("{0:F0} kN", data);
+                    break;
+
+                case CABViewControlUnits.LBS:
+                    data = N.ToLbf(data);
+                    status.AppendFormat("{0:F0} lbf", data);
                     break;
 
                 case CABViewControlUnits.KILO_LBS:
                 default:
                     data = N.ToLbf(data) * 0.001f;
-                    status.AppendFormat("{0:F0} klbf\t", data);
+                    status.AppendFormat("{0:F0} klbf", data);
                     break;
             }
 
+            status.AppendFormat((data < 0 ? "???" : " ") + "\t");
+
             // BP
             var brakeInfoValue = brakeValue(Simulator.Catalog.GetString("BP"), Simulator.Catalog.GetString("EOT"));
             status.AppendFormat("{0:F0}\t", brakeInfoValue);

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

@@ -473,8 +473,12 @@ public override void PrepareFrame(DPIStatus dpiStatus)
                                 tempStatus[k, 0] = fence + status[0].Split('(').First();
                                 for (var j = 1; j < status.Length; j++)
                                 {
-                                    // fence
                                     tempStatus[k, j] = fence + status[j].Split(' ').First();
+                                    // move color code from after the Units to after the value
+                                    if (ColorCodeCtrl.Keys.Any(status[j].EndsWith) && !ColorCodeCtrl.Keys.Any(tempStatus[k, j].EndsWith))
+                                    {
+                                        tempStatus[k, j] += status[j].Substring(status[j].Length - 3);
+                                    }
                                 }
                                 dpUId = (train.Cars[i] as MSTSLocomotive).DPUnitID;
                                 k++;