Fix incorrectly disabled options in train operations window

cesarBLG · cesarBLG · commit c5f1627c2752 · 2025-08-22T10:38:09.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -5073,6 +5073,33 @@ public override string GetDPDynamicBrakeStatus()
                 return string.Format("{0:F0}% {1}", DynamicBrakePercent, dpStatus);
             return string.Format("{0} {1}", DynamicBrakeController.GetStatus(), dpStatus);
         }
+
+        public override string GetMultipleUnitsConfiguration()
+        {
+            if (Train == null)
+                return base.GetMultipleUnitsConfiguration();
+            var numberOfLocomotives = 0;
+            var group = 0;
+            var configuration = "";
+
+            var remoteControlGroup = 0;
+            for (var i = 0; i < Train.Cars.Count; i++)
+            {
+                if (Train.Cars[i] is MSTSLocomotive)
+                {
+                    if (remoteControlGroup != (remoteControlGroup = Train.Cars[i].RemoteControlGroup) && i != 0)
+                    {
+                        configuration += string.Format("{0} | ", group);
+                        group = 0;
+                    }
+                    group++;
+                    numberOfLocomotives++;
+                }
+            }
+            if (group > 0)
+                configuration += string.Format("{0}", group);
+            return numberOfLocomotives > 0 ? configuration : null;
+        }
         #endregion
 
         public override void SignalEvent(TCSEvent evt)
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
@@ -442,6 +442,7 @@ void AddSpace(bool full)
                             line.Add(new buttonToggleMU(0, 0, textHeight, Owner.Viewer, CarPosition));
                             AddSpace(false);
                         }
+
                         line.Add(new buttonTogglePower(0, 0, textHeight, Owner.Viewer, CarPosition));
                         AddSpace(false);
                         if ((wagon != null) && (wagon.PowerSupply is IPowerSupply))
@@ -894,7 +895,6 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
                 Viewer = viewer;
                 TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;
                 CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
-                var first = car == Viewer.PlayerTrain.Cars.First();
 
                 if (CurrentCar.BrakeSystem is VacuumSinglePipe)
                 {
@@ -904,15 +904,11 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
                 {
                     var carAngleCockAOpenAmount = CurrentCar.BrakeSystem.AngleCockAOpenAmount;
                     var carAngleCockAOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockAOpen;
-                    Texture = !TrainCarViewer.TrainCarOperationsChanged && first ? FrontAngleCockClosed
-                        : carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial
+                    Texture = carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial
                         : carAngleCockAOpen ? FrontAngleCockOpened
                         : FrontAngleCockClosed;
 
-                    if (!first)
-                    {
-                        Click += new Action<Control, Point>(buttonFrontAngleCock_Click);
-                    }
+                    Click += new Action<Control, Point>(buttonFrontAngleCock_Click);
                 }
                 Source = new Rectangle(0, 0, size, size);
             }
@@ -945,7 +941,6 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
                 Viewer = viewer;
                 TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;
                 CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
-                var last = car == Viewer.PlayerTrain.Cars.Last();
 
                 if (CurrentCar.BrakeSystem is VacuumSinglePipe)
                 {
@@ -955,15 +950,11 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
                 {
                     var carAngleCockBOpenAmount = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpenAmount;
                     var carAngleCockBOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpen;
-                    Texture = last ? RearAngleCockClosed
-                        : carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial
+                    Texture = carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial
                         : carAngleCockBOpen ? RearAngleCockOpened
                         : RearAngleCockClosed;
 
-                    if (!last)
-                    {
-                        Click += new Action<Control, Point>(buttonRearAngleCock_Click);
-                    }
+                    Click += new Action<Control, Point>(buttonRearAngleCock_Click);
                 }
                 Source = new Rectangle(0, 0, size, size);
             }
@@ -1099,7 +1090,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)
                 CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
 
                 MultipleUnitsConfiguration = Viewer.PlayerLocomotive.GetMultipleUnitsConfiguration();
-                if (CurrentCar is MSTSDieselLocomotive && MultipleUnitsConfiguration != null)
+                if (CurrentCar is MSTSLocomotive && MultipleUnitsConfiguration != null)
                 {
                     Texture = Viewer.TrainCarOperationsWindow.ModifiedSetting || ((CurrentCar as MSTSLocomotive).RemoteControlGroup == 0 && MultipleUnitsConfiguration != "1") ? MUconnected : MUdisconnected;
                 }
@@ -1112,7 +1103,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)
             }
             void buttonToggleMU_Click(Control arg1, Point arg2)
             {
-                if (CurrentCar is MSTSDieselLocomotive)
+                if (CurrentCar is MSTSLocomotive)
                 {
                     MSTSLocomotive locomotive = CurrentCar as MSTSLocomotive;
 
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
@@ -490,6 +490,7 @@ void AddSpace()
                                         line.Add(new buttonToggleMU(0, 0, SymbolSize, Owner.Viewer, carPosition));
                                         AddSpace();
                                     }
+
                                     line.Add(new buttonTogglePower(0, 0, SymbolSize, Owner.Viewer, carPosition));
                                     AddSpace();
 
@@ -1097,7 +1098,6 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
         {
             Viewer = viewer;
             TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;
-            var First = car == viewer.PlayerTrain.Cars.First();
             var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
 
             if (CurrentCar.BrakeSystem is VacuumSinglePipe)
@@ -1108,15 +1108,14 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
             {
                 var carAngleCockAOpenAmount = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockAOpenAmount;
                 var carAngleCockAOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockAOpen;
-                Texture = !TrainCarViewer.TrainCarOperationsChanged && First ? FrontAngleCockClosed
-                    : carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial
+                Texture = carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial
                     : carAngleCockAOpen ? FrontAngleCockOpened
                     : FrontAngleCockClosed;
             }
             Source = new Rectangle(0, 0, size, size);
 
             var trainCarOperations = Viewer.TrainCarOperationsWindow;
-            if (!First && !trainCarOperations.WarningCarPosition[carPosition])
+            if (!trainCarOperations.WarningCarPosition[carPosition])
             {
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockClosed);
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockPartial);
@@ -1130,7 +1129,6 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
             : base(x, y, size, size)
         {
             Viewer = viewer;
-            var Last = car == viewer.PlayerTrain.Cars.Last();
             var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
 
             if (CurrentCar.BrakeSystem is VacuumSinglePipe)
@@ -1141,15 +1139,14 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
             {
                 var carAngleCockBOpenAmount = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpenAmount;
                 var carAngleCockBOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpen;
-                Texture = Last ? RearAngleCockClosed
-                    : carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial
+                Texture = carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial
                     : carAngleCockBOpen ? RearAngleCockOpened
                     : RearAngleCockClosed;
             }
             Source = new Rectangle(0, 0, size, size);
 
             var trainCarOperations = Viewer.TrainCarOperationsWindow;
-            if (!Last && !trainCarOperations.WarningCarPosition[carPosition])
+            if (!trainCarOperations.WarningCarPosition[carPosition])
             {
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockClosed);
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockPartial);
@@ -1266,7 +1263,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)
             CarPosition = carPosition;
 
             var multipleUnitsConfiguration = Viewer.PlayerLocomotive.GetMultipleUnitsConfiguration();
-            if ((Viewer.PlayerTrain.Cars[CarPosition] is MSTSDieselLocomotive) && multipleUnitsConfiguration != null)
+            if ((Viewer.PlayerTrain.Cars[CarPosition] is MSTSLocomotive) && multipleUnitsConfiguration != null)
             {
                 Texture = (Viewer.PlayerTrain.Cars[CarPosition] as MSTSLocomotive).RemoteControlGroup == 0 && multipleUnitsConfiguration != "1" ? MUconnected : MUdisconnected;
             }

Original file line number	Diff line number	Diff line change
`@@ -442,6 +442,7 @@ void AddSpace(bool full)`
`442`	`442`	`line.Add(new buttonToggleMU(0, 0, textHeight, Owner.Viewer, CarPosition));`
`443`	`443`	`AddSpace(false);`
`444`	`444`	`}`
	`445`	`+`
`445`	`446`	`line.Add(new buttonTogglePower(0, 0, textHeight, Owner.Viewer, CarPosition));`
`446`	`447`	`AddSpace(false);`
`447`	`448`	`if ((wagon != null) && (wagon.PowerSupply is IPowerSupply))`
`@@ -894,7 +895,6 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`894`	`895`	`Viewer = viewer;`
`895`	`896`	`TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;`
`896`	`897`	`CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
`897`		`- var first = car == Viewer.PlayerTrain.Cars.First();`
`898`	`898`
`899`	`899`	`if (CurrentCar.BrakeSystem is VacuumSinglePipe)`
`900`	`900`	`{`
`@@ -904,15 +904,11 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`904`	`904`	`{`
`905`	`905`	`var carAngleCockAOpenAmount = CurrentCar.BrakeSystem.AngleCockAOpenAmount;`
`906`	`906`	`var carAngleCockAOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockAOpen;`
`907`		`- Texture = !TrainCarViewer.TrainCarOperationsChanged && first ? FrontAngleCockClosed`
`908`		`- : carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial`
	`907`	`+ Texture = carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial`
`909`	`908`	`: carAngleCockAOpen ? FrontAngleCockOpened`
`910`	`909`	`: FrontAngleCockClosed;`
`911`	`910`
`912`		`- if (!first)`
`913`		`- {`
`914`		`- Click += new Action<Control, Point>(buttonFrontAngleCock_Click);`
`915`		`- }`
	`911`	`+ Click += new Action<Control, Point>(buttonFrontAngleCock_Click);`
`916`	`912`	`}`
`917`	`913`	`Source = new Rectangle(0, 0, size, size);`
`918`	`914`	`}`
`@@ -945,7 +941,6 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`945`	`941`	`Viewer = viewer;`
`946`	`942`	`TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;`
`947`	`943`	`CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
`948`		`- var last = car == Viewer.PlayerTrain.Cars.Last();`
`949`	`944`
`950`	`945`	`if (CurrentCar.BrakeSystem is VacuumSinglePipe)`
`951`	`946`	`{`
`@@ -955,15 +950,11 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`955`	`950`	`{`
`956`	`951`	`var carAngleCockBOpenAmount = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpenAmount;`
`957`	`952`	`var carAngleCockBOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpen;`
`958`		`- Texture = last ? RearAngleCockClosed`
`959`		`- : carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial`
	`953`	`+ Texture = carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial`
`960`	`954`	`: carAngleCockBOpen ? RearAngleCockOpened`
`961`	`955`	`: RearAngleCockClosed;`
`962`	`956`
`963`		`- if (!last)`
`964`		`- {`
`965`		`- Click += new Action<Control, Point>(buttonRearAngleCock_Click);`
`966`		`- }`
	`957`	`+ Click += new Action<Control, Point>(buttonRearAngleCock_Click);`
`967`	`958`	`}`
`968`	`959`	`Source = new Rectangle(0, 0, size, size);`
`969`	`960`	`}`
`@@ -1099,7 +1090,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)`
`1099`	`1090`	`CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
`1100`	`1091`
`1101`	`1092`	`MultipleUnitsConfiguration = Viewer.PlayerLocomotive.GetMultipleUnitsConfiguration();`
`1102`		`- if (CurrentCar is MSTSDieselLocomotive && MultipleUnitsConfiguration != null)`
	`1093`	`+ if (CurrentCar is MSTSLocomotive && MultipleUnitsConfiguration != null)`
`1103`	`1094`	`{`
`1104`	`1095`	`Texture = Viewer.TrainCarOperationsWindow.ModifiedSetting \|\| ((CurrentCar as MSTSLocomotive).RemoteControlGroup == 0 && MultipleUnitsConfiguration != "1") ? MUconnected : MUdisconnected;`
`1105`	`1096`	`}`
`@@ -1112,7 +1103,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)`
`1112`	`1103`	`}`
`1113`	`1104`	`void buttonToggleMU_Click(Control arg1, Point arg2)`
`1114`	`1105`	`{`
`1115`		`- if (CurrentCar is MSTSDieselLocomotive)`
	`1106`	`+ if (CurrentCar is MSTSLocomotive)`
`1116`	`1107`	`{`
`1117`	`1108`	`MSTSLocomotive locomotive = CurrentCar as MSTSLocomotive;`
`1118`	`1109`
Original file line number	Diff line number	Diff line change
`@@ -490,6 +490,7 @@ void AddSpace()`
`490`	`490`	`line.Add(new buttonToggleMU(0, 0, SymbolSize, Owner.Viewer, carPosition));`
`491`	`491`	`AddSpace();`
`492`	`492`	`}`
	`493`	`+`
`493`	`494`	`line.Add(new buttonTogglePower(0, 0, SymbolSize, Owner.Viewer, carPosition));`
`494`	`495`	`AddSpace();`
`495`	`496`
`@@ -1097,7 +1098,6 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1097`	`1098`	`{`
`1098`	`1099`	`Viewer = viewer;`
`1099`	`1100`	`TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;`
`1100`		`- var First = car == viewer.PlayerTrain.Cars.First();`
`1101`	`1101`	`var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
`1102`	`1102`
`1103`	`1103`	`if (CurrentCar.BrakeSystem is VacuumSinglePipe)`
`@@ -1108,15 +1108,14 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1108`	`1108`	`{`
`1109`	`1109`	`var carAngleCockAOpenAmount = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockAOpenAmount;`
`1110`	`1110`	`var carAngleCockAOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockAOpen;`
`1111`		`- Texture = !TrainCarViewer.TrainCarOperationsChanged && First ? FrontAngleCockClosed`
`1112`		`- : carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial`
	`1111`	`+ Texture = carAngleCockAOpenAmount > 0 && carAngleCockAOpenAmount < 1 ? FrontAngleCockPartial`
`1113`	`1112`	`: carAngleCockAOpen ? FrontAngleCockOpened`
`1114`	`1113`	`: FrontAngleCockClosed;`
`1115`	`1114`	`}`
`1116`	`1115`	`Source = new Rectangle(0, 0, size, size);`
`1117`	`1116`
`1118`	`1117`	`var trainCarOperations = Viewer.TrainCarOperationsWindow;`
`1119`		`- if (!First && !trainCarOperations.WarningCarPosition[carPosition])`
	`1118`	`+ if (!trainCarOperations.WarningCarPosition[carPosition])`
`1120`	`1119`	`{`
`1121`	`1120`	`trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockClosed);`
`1122`	`1121`	`trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockPartial);`
`@@ -1130,7 +1129,6 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1130`	`1129`	`: base(x, y, size, size)`
`1131`	`1130`	`{`
`1132`	`1131`	`Viewer = viewer;`
`1133`		`- var Last = car == viewer.PlayerTrain.Cars.Last();`
`1134`	`1132`	`var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
`1135`	`1133`
`1136`	`1134`	`if (CurrentCar.BrakeSystem is VacuumSinglePipe)`
`@@ -1141,15 +1139,14 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1141`	`1139`	`{`
`1142`	`1140`	`var carAngleCockBOpenAmount = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpenAmount;`
`1143`	`1141`	`var carAngleCockBOpen = (CurrentCar as MSTSWagon).BrakeSystem.AngleCockBOpen;`
`1144`		`- Texture = Last ? RearAngleCockClosed`
`1145`		`- : carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial`
	`1142`	`+ Texture = carAngleCockBOpenAmount > 0 && carAngleCockBOpenAmount < 1 ? RearAngleCockPartial`
`1146`	`1143`	`: carAngleCockBOpen ? RearAngleCockOpened`
`1147`	`1144`	`: RearAngleCockClosed;`
`1148`	`1145`	`}`
`1149`	`1146`	`Source = new Rectangle(0, 0, size, size);`
`1150`	`1147`
`1151`	`1148`	`var trainCarOperations = Viewer.TrainCarOperationsWindow;`
`1152`		`- if (!Last && !trainCarOperations.WarningCarPosition[carPosition])`
	`1149`	`+ if (!trainCarOperations.WarningCarPosition[carPosition])`
`1153`	`1150`	`{`
`1154`	`1151`	`trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockClosed);`
`1155`	`1152`	`trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockPartial);`
`@@ -1266,7 +1263,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)`
`1266`	`1263`	`CarPosition = carPosition;`
`1267`	`1264`
`1268`	`1265`	`var multipleUnitsConfiguration = Viewer.PlayerLocomotive.GetMultipleUnitsConfiguration();`
`1269`		`- if ((Viewer.PlayerTrain.Cars[CarPosition] is MSTSDieselLocomotive) && multipleUnitsConfiguration != null)`
	`1266`	`+ if ((Viewer.PlayerTrain.Cars[CarPosition] is MSTSLocomotive) && multipleUnitsConfiguration != null)`
`1270`	`1267`	`{`
`1271`	`1268`	`Texture = (Viewer.PlayerTrain.Cars[CarPosition] as MSTSLocomotive).RemoteControlGroup == 0 && multipleUnitsConfiguration != "1" ? MUconnected : MUdisconnected;`
`1272`	`1269`	`}`