Automatic merge of T1.6-59-g2eb7441b0 and 11 pull requests

- Pull request #1156 at c1f443e: Fix incorrectly disabled options in train operations window
- Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at e813c42: Automatic speed control
- Pull request #1104 at 7919243: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul

Author: openrails-bot

Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs

@@ -49,6 +49,7 @@ protected override void SetCurrentMainPowerSupplyState(PowerSupplyState state) {
         protected override void SetCurrentAuxiliaryPowerSupplyState(PowerSupplyState state) {}
         protected override void SetCurrentElectricTrainSupplyState(PowerSupplyState state) {}
         protected override void SetCurrentDynamicBrakeAvailability(bool avail) {}
+        public override PowerSupplyState GetPowerStatus() => PowerSupplyState.Unavailable;
         public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt)
         {
             ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt);

Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs

@@ -90,7 +90,27 @@ public float DieselEngineMinRpm
         /// Closing authorization of the traction cut-off relay
         /// </summary>
         public bool TractionCutOffRelayClosingAuthorization() => TractionCutOffRelay.ClosingAuthorization;
-        
+
+        public override PowerSupplyState GetPowerStatus()
+        {
+            var status = base.GetPowerStatus();
+            PowerSupplyState engineStatus;
+            switch (CurrentDieselEnginesState())
+            {
+                case DieselEngineState.Running:
+                    engineStatus = PowerSupplyState.PowerOn;
+                    break;
+                case DieselEngineState.Starting:
+                    engineStatus = PowerSupplyState.PowerOnOngoing;
+                    break;
+                default:
+                    engineStatus = PowerSupplyState.PowerOff;
+                    break;
+            }
+            if (status == engineStatus) return status;
+            return PowerSupplyState.PowerOnOngoing;
+        }
+
         /// <summary>
         /// Sends an event to all diesel engines
         /// </summary>

Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs

@@ -128,6 +128,34 @@ protected float PantographVoltageVDC
         /// </summary>
         protected void SetFilterVoltageV(float voltage) => EpsHost.FilterVoltageV = voltage;
 
+        public override PowerSupplyState GetPowerStatus()
+        {
+            var status = base.GetPowerStatus();
+            PowerSupplyState electricStatus;
+            switch (CurrentPantographState())
+            {
+                case PantographState.Up:
+                    switch (CurrentCircuitBreakerState())
+                    {
+                        case CircuitBreakerState.Closed:
+                            electricStatus = PowerSupplyState.PowerOn;
+                            break;
+                        default:
+                            electricStatus = PowerSupplyState.PowerOnOngoing;
+                            break;
+                    }
+                    break;
+                case PantographState.Raising:
+                    electricStatus = PowerSupplyState.PowerOnOngoing;
+                    break;
+                default:
+                    electricStatus = PowerSupplyState.PowerOff;
+                    break;
+            }
+            if (status == electricStatus) return status;
+            return PowerSupplyState.PowerOnOngoing;
+        }
+
         /// <summary>
         /// Sends an event to the circuit breaker
         /// </summary>

Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs

@@ -312,6 +312,20 @@ protected void SetCustomizedCabviewControlName(int index, string name)
         /// </summary>
         protected virtual void SetCurrentDynamicBrakeAvailability(bool avail) => LpsHost.DynamicBrakeAvailable = avail;
 
+        /// <summary>
+        /// Called by other subsystems to determine whether the locomotive is powered
+        /// </summary>
+        /// <returns>
+        /// PowerSupplyState.PowerOff if the locomotive is unpowered
+        /// PowerSupplyState.PowerOnOngoing if the locomotive is in a power on sequence, but not all subsystems are ready
+        /// PowerSupplyState.PowerOn if the locomotive is ready for service (all necessary subystems are connected)
+        /// </returns>
+        public virtual PowerSupplyState GetPowerStatus()
+        {
+            if (LpsHost.MainPowerSupplyState == LpsHost.AuxiliaryPowerSupplyState) return LpsHost.MainPowerSupplyState;
+            return PowerSupplyState.PowerOnOngoing;
+        }
+
         /// <summary>
         /// Sends an event to the master switch
         /// </summary>

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs

@@ -47,6 +47,8 @@ public interface ILocomotivePowerSupply : IPowerSupply
         bool ServiceRetentionCancellationButton { get; set; }
         bool ServiceRetentionActive { get; set; }
 
+        PowerSupplyState GetPowerStatus();
+
         void HandleEventFromTcs(PowerSupplyEvent evt);
         void HandleEventFromTcs(PowerSupplyEvent evt, int id);
         void HandleEventFromTcs(PowerSupplyEvent evt, string message);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs

@@ -266,6 +266,8 @@ public virtual void Update(float elapsedClockSeconds)
             ElectricTrainSupplySwitch.Update(elapsedClockSeconds);
         }
 
+        public PowerSupplyState GetPowerStatus() => AbstractScript?.GetPowerStatus() ?? PowerSupplyState.Unavailable;
+
         public void HandleEvent(PowerSupplyEvent evt)
         {
             AbstractScript?.HandleEvent(evt);

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -1840,15 +1840,14 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
             train.activityClearingDistanceM = train.Cars.Count < Train.standardTrainMinCarNo ? Train.shortClearingDistanceM : Train.standardClearingDistanceM;
             train2.activityClearingDistanceM = train2.Cars.Count < Train.standardTrainMinCarNo ? Train.shortClearingDistanceM : Train.standardClearingDistanceM;
 
+
             train.UncoupledFrom = train2;
             train2.UncoupledFrom = train;
 
             train2.SpeedMpS = train.SpeedMpS;
 
-            train.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
             train.Cars[train.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
             train2.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
-            train2.Cars[train2.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
 
             train2.AITrainDirectionForward = train.AITrainDirectionForward;
 

Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png

@@ -1083,24 +1083,8 @@ protected override void OnActivate(bool sameCamera)
                 isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
             }
 
-            if (isVisibleTrainCarViewerOrWebpage)
-            {
-                // Update the camera view
-                oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
-            }
-
-            if (attachedCar != null && !isVisibleTrainCarViewerOrWebpage)
-            {   // Reset behaviour of camera 2 and camera 3, after closing F9-window and F9-web.
-                var attachedCarPosition = attachedCar.Train.Cars.TakeWhile(x => x.CarID != attachedCar.CarID).Count();
-                if (Front && attachedCarPosition == carPosition)
-                {
-                    attachedCar = trainCars.First();
-                }
-                if (!Front && attachedCarPosition == carPosition)
-                {
-                    attachedCar = trainCars.Last();
-                }
-            }
+            // Update the camera view
+            oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)
             {