Merge pull request #1114 from rwf-rr/fix-db-setup-color-with-dpu

Fix color of DB in DrivingInfo when in setup with DPU fenced. (r1.6)

Author: twpol

Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs

@@ -771,7 +771,7 @@ void AddSeparator() => AddLabel(new ListLabel
                 {
                     FirstCol = Viewer.Catalog.GetString(locomotive is MSTSSteamLocomotive ? "Regulator" : "Throttle"),
                     LastCol = $"{Round(locomotive.ThrottlePercent)}%" +
-                    (locomotive is MSTSDieselLocomotive && train.DPMode == 1 ? $"({Round(train.DPThrottlePercent)}%)" : ""),
+                        (locomotive is MSTSDieselLocomotive && train.DPMode == 1 ? $" | {Round(train.DPThrottlePercent)}%" : ""),
                     KeyPressed = throttleKey,
                     SymbolCol = ""//throttleKey,
                 });
@@ -1048,23 +1048,27 @@ void AddSeparator() => AddLabel(new ListLabel
 
             if (dynamicBrakeStatus != null && locomotive.IsLeadLocomotive())
             {
-                if (locomotive.DynamicBrakePercent >= 0)
+                var dynBrakeString = "";
+                var dynBrakeColor = "";
+
+                if (locomotive.DynamicBrakePercent < 0)
+                    dynBrakeString = Viewer.Catalog.GetString("Off");
+                else if (!locomotive.DynamicBrake)
                 {
-                    AddLabel(new ListLabel
-                    {
-                        FirstCol = Viewer.Catalog.GetString("Dynamic brake"),
-                        LastCol = locomotive.DynamicBrake ? dynamicBrakeStatus : Viewer.Catalog.GetString("Setup") + ColorCode[Color.Cyan] +
-                         (locomotive is MSTSDieselLocomotive && train.DPMode == -1 ? string.Format("({0:F0}%)", train.DPDynamicBrakePercent) : string.Empty),
-                    });
+                    dynBrakeString = Viewer.Catalog.GetString("Setup");
+                    dynBrakeColor = ColorCode[Color.Cyan];
                 }
                 else
+                    dynBrakeString = dynamicBrakeStatus;
+
+                if (locomotive is MSTSDieselLocomotive && train.DPMode == -1)
+                    dynBrakeString += string.Format(" | {0:F0}%", train.DPDynamicBrakePercent);
+
+                AddLabel(new ListLabel
                 {
-                    AddLabel(new ListLabel
-                    {
-                        FirstCol = Viewer.Catalog.GetString("Dynamic brake"),
-                        LastCol = Viewer.Catalog.GetString("Off") + (locomotive is MSTSDieselLocomotive && train.DPMode == -1 ? string.Format("({0:F0}%)", train.DPDynamicBrakePercent) : string.Empty),
-                    });
-                }
+                    FirstCol = Viewer.Catalog.GetString("Dynamic brake"),
+                    LastCol = dynBrakeString + dynBrakeColor,
+                });
             }
 
             AddSeparator();

Source/RunActivity/Viewer3D/WebServices/TrainDrivingDisplay.cs

@@ -314,7 +314,8 @@ void AddSeparator() => AddLabel(new ListLabel
                 AddLabel(new ListLabel
                 {
                     FirstCol = Viewer.Catalog.GetString(locomotive is MSTSSteamLocomotive ? "Regulator" : "Throttle"),
-                    LastCol = $"{Round(locomotive.ThrottlePercent)}%",
+                    LastCol = $"{Round(locomotive.ThrottlePercent)}%" +
+                        (locomotive is MSTSDieselLocomotive && train.DPMode == 1 ? $" | {Round(train.DPThrottlePercent)}%" : ""),
                     KeyPressed = throttleKey,
                     SymbolCol = throttleKey,
                 });
@@ -589,23 +590,27 @@ void AddSeparator() => AddLabel(new ListLabel
 
             if (dynamicBrakeStatus != null && locomotive.IsLeadLocomotive())
             {
-                if (locomotive.DynamicBrakePercent >= 0)
+                var dynBrakeString = "";
+                var dynBrakeColor = "";
+
+                if (locomotive.DynamicBrakePercent < 0)
+                    dynBrakeString = Viewer.Catalog.GetString("Off");
+                else if (!locomotive.DynamicBrake)
                 {
-                    AddLabel(new ListLabel
-                    {
-                        FirstCol = Viewer.Catalog.GetString("Dynamic brake"),
-                        LastCol = locomotive.DynamicBrake ? dynamicBrakeStatus : Viewer.Catalog.GetString("Setup") + ColorCode[Color.Cyan] +
-                         (locomotive is MSTSDieselLocomotive && train.DPMode == -1 ? string.Format("({0:F0}%)", train.DPDynamicBrakePercent) : string.Empty),
-                    });
+                    dynBrakeString = Viewer.Catalog.GetString("Setup");
+                    dynBrakeColor = ColorCode[Color.Cyan];
                 }
                 else
+                    dynBrakeString = dynamicBrakeStatus;
+
+                if (locomotive is MSTSDieselLocomotive && train.DPMode == -1)
+                    dynBrakeString += string.Format(" | {0:F0}%", train.DPDynamicBrakePercent);
+
+                AddLabel(new ListLabel
                 {
-                    AddLabel(new ListLabel
-                    {
-                        FirstCol = Viewer.Catalog.GetString("Dynamic brake"),
-                        LastCol = Viewer.Catalog.GetString("Off") + (locomotive is MSTSDieselLocomotive && train.DPMode == -1 ? string.Format("({0:F0}%)", train.DPDynamicBrakePercent) : string.Empty),
-                    });
-                }
+                    FirstCol = Viewer.Catalog.GetString("Dynamic brake"),
+                    LastCol = dynBrakeString + dynBrakeColor,
+                });
             }
 
             AddSeparator();