Automatic merge of T1.6-126-gc9409918f and 11 pull requests

- Pull request #1082 at 8538170: Allow variable water level in glass gauge
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1122 at b9b077b: Wagon Size and Centering Controls
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1128 at d116396: Particle Emitter Overhaul
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler
- Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9.
- Pull request #1164 at 1ad9889: Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
- Pull request #1165 at aacd11b: docs: Add code guidelines for logging

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -1424,13 +1424,13 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                         InitialCentreOfGravityM.Y = stf.ReadFloat(STFReader.UNITS.Distance, 0);
                         InitialCentreOfGravityM.Z = stf.ReadFloat(STFReader.UNITS.Distance, 0);
 
-                        if (Math.Abs(InitialCentreOfGravityM.Z) > 2)
-                        {
-                            STFException.TraceWarning(stf, string.Format("CentreOfGravity Z set to zero because value {0} outside range -2 to +2", InitialCentreOfGravityM.Z));
-                            InitialCentreOfGravityM.Z = 0;
-                        }
+                    if (Math.Abs(InitialCentreOfGravityM.Z) > 2)
+                    {
+                        STFException.TraceWarning(stf, string.Format("CentreOfGravity Z set to zero because value {0} outside range -2 to +2", InitialCentreOfGravityM.Z));
+                        InitialCentreOfGravityM.Z = 0;
+                    }
 
-                        stf.SkipRestOfBlock();
+                    stf.SkipRestOfBlock();
                     }
                     else // User has entered a single value, only set the Y component to this value, leave other components unchanged
                     {

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -816,10 +816,10 @@ public virtual void Initialize()
 
                 if (maxBrakeShoeForcekN > 20 && Simulator.Settings.VerboseConfigurationMessages)
                 {
-                    Trace.TraceInformation("Maximum force per brakeshoe is {0} and has exceeded {1}, check MaxBrakeShoeForceN {2} or NumberCarBrakeShoes {3}",  FormatStrings.FormatForce(maxBrakeShoeForcekN * 1000, IsMetric), FormatStrings.FormatForce(20 * 1000, IsMetric), FormatStrings.FormatForce(MaxBrakeShoeForceN, IsMetric), NumberCarBrakeShoes);
+                    Trace.TraceInformation("Maximum force per brakeshoe is {0} and has exceeded {1}, check MaxBrakeShoeForceN {2} or NumberCarBrakeShoes {3}", FormatStrings.FormatForce(maxBrakeShoeForcekN * 1000, IsMetric), FormatStrings.FormatForce(20 * 1000, IsMetric), FormatStrings.FormatForce(MaxBrakeShoeForceN, IsMetric), NumberCarBrakeShoes);
                 }
-            } 
-            
+            }
+
             //CurveForceFilter.Initialize();
 
             // Initialize tunnel resistance values
@@ -1029,7 +1029,7 @@ public virtual void Update(float elapsedClockSeconds)
                 InitializeCarTemperatures();
                 AmbientTemperatureInitialised = true;
             }
-            
+
             // Update temperature variation for height of car above sea level
             // Typically in clear conditions there is a 9.8 DegC variation for every 1000m (1km) rise, in snow/rain there is approx 5.5 DegC variation for every 1000m (1km) rise
             float TemperatureHeightVariationDegC = 0;
@@ -1044,9 +1044,9 @@ public virtual void Update(float elapsedClockSeconds)
             {
                 TemperatureHeightVariationDegC = Me.ToKiloM(CarHeightAboveSeaLevelM) * DryLapseTemperatureC;
             }
-            
+
             TemperatureHeightVariationDegC = MathHelper.Clamp(TemperatureHeightVariationDegC, 0.00f, 30.0f);
-            
+
             CarOutsideTempC = InitialCarOutsideTempC - TemperatureHeightVariationDegC;
 
             AbsSpeedMpS = Math.Abs(_SpeedMpS);