Automatic merge of T1.6-186-g21d9ada29 and 12 pull requests

- Pull request #1082 at b191a54: Allow variable water level in glass gauge
- Pull request #1057 at 85bde8e: Switchable brake system
- Pull request #1081 at a8127a1: Brake cuts power unification
- Pull request #1091 at 378be55: Automatic speed control
- Pull request #1122 at 73c47b4: Wagon Size and Centering Controls
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1128 at b6c197f: Particle Emitter Overhaul
- Pull request #1158 at 2599bfe: Temporary fix for bug 2121985: F9 TCO out-of-range after resume
- Pull request #1169 at 906f204: Revise TrainCar.SetUpWheels to Better Handle Unusual Rolling Stock
- Pull request #1175 at d28315e: Make Data Logger interval configurable
- Pull request #1176 at 4cd961b: Remove Implicit Requirement for Engine Name to Come After "Engine ("
- Pull request #1178 at 015769e: Fix Diesel RPM Rate of Change

Author: openrails-bot

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -31,6 +31,11 @@
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using ORTS.Common;
 using ORTS.Common.Input;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using Color = Microsoft.Xna.Framework.Color;
 using Point = Microsoft.Xna.Framework.Point;
 using Rectangle = Microsoft.Xna.Framework.Rectangle;
@@ -173,6 +178,12 @@ protected internal override void Save(BinaryWriter outf)
             outf.Write(Location.Width);
             outf.Write(Location.Height);
 
+            // rwf-rr: temporary fix for bug 2121985
+            if (CarPosition >= Owner.Viewer.PlayerTrain.Cars.Count)
+            {
+                Trace.TraceWarning("TrainCarOperationsViewerWindow.CarPosition {0} out of range [0..{1}]", CarPosition, Owner.Viewer.PlayerTrain.Cars.Count - 1);
+                CarPosition = Owner.Viewer.PlayerTrain.Cars.Count - 1;
+            }
             outf.Write(CarPosition);
             outf.Write(ResetAllSymbols);
         }

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

@@ -35,6 +35,10 @@
 using System.Linq;
 using static Orts.Viewer3D.Popups.TrainCarOperationsWindow;
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
+using Orts.Viewer3D.RollingStock;
+using Orts.MultiPlayer;
+using Orts.Viewer3D;
+using System.Diagnostics;
 using ORTS.Scripting.Api;
 
 namespace Orts.Viewer3D.Popups
@@ -176,6 +180,12 @@ protected internal override void Save(BinaryWriter outf)
             outf.Write(Location.Width);
             outf.Write(Location.Height);
 
+            // rwf-rr: temporary fix for bug 2121985
+            if (SelectedCarPosition >= Owner.Viewer.PlayerTrain.Cars.Count)
+            {
+                Trace.TraceWarning("TrainCarOperationsWindow.SelectedCarPosition {0} out of range [0..{1}]", SelectedCarPosition, Owner.Viewer.PlayerTrain.Cars.Count - 1);
+                SelectedCarPosition = Owner.Viewer.PlayerTrain.Cars.Count - 1;
+            }
             outf.Write(SelectedCarPosition);
             outf.Write(Owner.Viewer.FrontCamera.IsCameraFront);
         }
@@ -625,6 +635,13 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                     LastRowVisible = false;
                     Layout();
                     updateLayoutSize();
+
+                    // rwf-rr: potential partial fix for bug 2121985
+                    // if (trainCarViewer.CouplerChanged && CarPosition >= Owner.Viewer.PlayerTrain.Cars.Count)
+                    // {
+                    //     SelectedCarPosition = CarPosition = Owner.Viewer.PlayerTrain.Cars.Count - 1;
+                    //     LastCarIDSelected = PlayerTrain.Cars[SelectedCarPosition].CarID;
+                    // }
                 }
                 if (OldPositionHeight != Vbox.Position.Height)
                 {

Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs

@@ -232,6 +232,12 @@ public void handleReceiveAndSend()
         public void Save(BinaryWriter outf) 
         {
             outf.Write(TrainCarSelected);
+            // rwf-rr: temporary fix for bug 2121985
+            if (TrainCarSelectedPosition >= Viewer.PlayerTrain.Cars.Count)
+            {
+                Trace.TraceWarning("TrainCarOperationsWebpage.TrainCarSelectedPosition {0} out of range [0..{1}]", TrainCarSelectedPosition, Viewer.PlayerTrain.Cars.Count - 1);
+                TrainCarSelectedPosition = Viewer.PlayerTrain.Cars.Count - 1;
+            }
             outf.Write(TrainCarSelectedPosition);
         }