Merge pull request #1021 from sweiland-openrails/TrainCarOperationsBugfixes

Various traincar operations windows fixes

Author: sweiland-openrails

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -1522,13 +1522,11 @@ public void ReverseCars()
             // Reverse brake hose connections and angle cocks
             for (var i = 0; i < Cars.Count; i++)
             {
-                var ac = Cars[i].BrakeSystem.AngleCockAOpen;
-                Cars[i].BrakeSystem.AngleCockAOpen = Cars[i].BrakeSystem.AngleCockBOpen;
-                Cars[i].BrakeSystem.AngleCockBOpen = ac;
-                if (i == Cars.Count - 1)
-                    Cars[i].BrakeSystem.FrontBrakeHoseConnected = false;
-                else
-                    Cars[i].BrakeSystem.FrontBrakeHoseConnected = Cars[i + 1].BrakeSystem.FrontBrakeHoseConnected;
+                var bs = Cars[i].BrakeSystem;
+                (bs.AngleCockBOpen, bs.AngleCockAOpen) = (bs.AngleCockAOpen, bs.AngleCockBOpen);
+                (bs.AngleCockBOpenAmount, bs.AngleCockAOpenAmount) = (bs.AngleCockAOpenAmount, bs.AngleCockBOpenAmount);
+                (bs.AngleCockBOpenTime, bs.AngleCockAOpenTime) = (bs.AngleCockAOpenTime, bs.AngleCockBOpenTime);
+                (bs.RearBrakeHoseConnected, bs.FrontBrakeHoseConnected) = (bs.FrontBrakeHoseConnected, bs.RearBrakeHoseConnected);
             }
             // Reverse the actual order of the cars in the train.
             Cars.Reverse();

Source/RunActivity/Content/TrainOperations/TrainOperationsMap.png

@@ -29,6 +29,7 @@
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks;
 using Orts.Simulation.Signalling;
+using Orts.Viewer3D.Popups;
 using ORTS.Common;
 using ORTS.Common.Input;
 using ORTS.Settings;
@@ -129,7 +130,10 @@ public virtual void Reset()
         public void Activate()
         {
             ScreenChanged();
-            OnActivate(Viewer.Camera == this);
+            if (!Viewer.IsFormationReversed)// Avoids flickering
+            {
+                OnActivate(Viewer.Camera == this);
+            }
             Viewer.Camera = this;
             Viewer.Simulator.PlayerIsInCab = Style == Styles.Cab || Style == Styles.ThreeDimCab;
             Update(ElapsedTime.Zero);
@@ -1076,7 +1080,7 @@ protected override void OnActivate(bool sameCamera)
             }
             else
             {
-                isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+                isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
             }
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)

Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png

@@ -78,11 +78,17 @@ public override void PrepareFrame(RenderFrame frame, ORTS.Common.ElapsedTime ela
                 var newLabels = new Dictionary<TrainCar, LabelPrimitive>(labels.Count);
                 var cars = Owner.Viewer.World.Trains.Cars;
                 var cameraLocation = Owner.Viewer.Camera.CameraWorldLocation;
-                var carID = Owner.Viewer.TrainCarOperationsViewerWindow.CurrentCarID;
+
                 //data from Webpage
                 var trainCarWebpage = Owner.Viewer.TrainCarOperationsWebpage;
+                var trainCarWebpageActive = trainCarWebpage != null && trainCarWebpage.Connections > 0 && trainCarWebpage.TrainCarSelected;
                 var carIDWebpage = trainCarWebpage != null && trainCarWebpage.Connections > 0 ? trainCarWebpage.CurrentCarID : "";
-                bool isVisibleTrainCarViewerOrWebpage = Owner.Viewer.TrainCarOperationsViewerWindow.Visible || (trainCarWebpage != null && trainCarWebpage.Connections > 0 && Owner.Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+
+                //shows only one CarID label when traincaroperationsviewer is not visible
+                var trainCarOperationsViewer = Owner.Viewer.TrainCarOperationsViewerWindow;
+                var carID = Owner.Viewer.TrainCarOperationsViewerWindow.Visible ? trainCarOperationsViewer.CurrentCarID : trainCarWebpageActive ? trainCarWebpage.CurrentCarID : Owner.Viewer.TrainCarOperationsViewerWindow.CurrentCarID;
+
+                bool isVisibleTrainCarViewerOrWebpage = (Owner.Viewer.TrainCarOperationsWindow.Visible && !trainCarOperationsViewer.Visible) || trainCarOperationsViewer.Visible || trainCarWebpageActive;
                 foreach (var car in cars.Keys)
                 {
                     // Calculates distance between camera and platform label.