Added brake hose control

Author: sweiland-openrails

Source/ORTS.Common/Input/UserCommand.cs

@@ -143,7 +143,7 @@ public enum UserCommand
         [GetString("Control Odometer Direction")] [GetParticularString("SwitchPanel", "")] ControlOdoMeterDirection,
         [GetString("Control Retainers On")] [GetParticularString("SwitchPanel", "")] ControlRetainersOn,
         [GetString("Control Retainers Off")] [GetParticularString("SwitchPanel", "")] ControlRetainersOff,
-        [GetString("Control Brake Hose Connect")] [GetParticularString("SwitchPanel", "")] ControlBrakeHoseConnect,
+        [GetString("Control Brake Hose Connect")] [GetParticularString("SwitchPanel", "Brake hose")] ControlBrakeHoseConnect,
         [GetString("Control Brake Hose Disconnect")] [GetParticularString("SwitchPanel", "")] ControlBrakeHoseDisconnect,
         [GetString("Control Alerter")] [GetParticularString("SwitchPanel", "Alerter")] ControlAlerter,
         [GetString("Control Emergency Push Button")] [GetParticularString("SwitchPanel", "Emergency")] ControlEmergencyPushButton,

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs

@@ -119,6 +119,10 @@ public void init(UserCommand userCommand)
                         init0(ORTS.Common.Input.UserCommand.ControlHandbrakeFull);
                     break;
 
+                case ORTS.Common.Input.UserCommand.ControlBrakeHoseConnect:
+                    init2(ORTS.Common.Input.UserCommand.ControlBrakeHoseConnect, ORTS.Common.Input.UserCommand.ControlBrakeHoseDisconnect);
+                    break;
+
                 default:
                     init1(userCommand);
                     break;

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs

@@ -383,7 +383,6 @@ private static void getStatusHandbrake(ref SwitchOnPanelStatus switchOnPanelStat
                 }
             }
 
-            switchOnPanelStatus.Color = "";
             if ((handBrakeOn > 0) && (handBrakeCount != handBrakeOn))
             {
                 switchOnPanelStatus.Status = Viewer.Catalog.GetString("On") + "/" + Viewer.Catalog.GetString("Off");
@@ -405,6 +404,32 @@ private static void getStatusHandbrake(ref SwitchOnPanelStatus switchOnPanelStat
             }
         }
 
+        private static void getStatusBrakehose(ref SwitchOnPanelStatus switchOnPanelStatus)
+        {
+            Train train = Viewer.PlayerLocomotive.Train;
+            int brakeHoseConnectedCount = 0;
+            int angleCockAOpenCount = 0;
+            int angleCockBOpenCount = 0;
+
+            for (int i = 0; i < train.Cars.Count; i++)
+            {
+                TrainCar car = train.Cars[i];
+                if ((train.Cars[i].BrakeSystem.FrontBrakeHoseConnected) && (i > 0))
+                    brakeHoseConnectedCount++;
+                if ((train.Cars[i].BrakeSystem.AngleCockAOpen) && (i > 0))
+                    angleCockAOpenCount++;
+                if ((train.Cars[i].BrakeSystem.AngleCockBOpen) && (i < (train.Cars.Count - 1)))
+                    angleCockBOpenCount++;
+            }
+
+            if ((brakeHoseConnectedCount == (train.Cars.Count - 1)) &&
+                (angleCockAOpenCount == (train.Cars.Count - 1)) &&
+                (angleCockBOpenCount == (train.Cars.Count - 1))) {
+                switchOnPanelStatus.Status = Viewer.Catalog.GetString("Connected");
+                switchOnPanelStatus.Color = "lightgreen";
+            }
+        }
+
         public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus switchOnPanelStatus)
         {
             switchOnPanelStatus.Status = "";
@@ -470,6 +495,9 @@ public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus sw
                 case UserCommand.ControlHandbrakeFull:
                     getStatusHandbrake(ref switchOnPanelStatus);
                     break;
+                case UserCommand.ControlBrakeHoseConnect:
+                    getStatusBrakehose(ref switchOnPanelStatus);
+                    break;
             }
         }
 

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs

@@ -76,6 +76,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlCircuitBreakerClosingOrder);
                     SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
                     SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
+                    SwitchesOnPanelArray[1, 7].initDefinition(UserCommand.ControlBrakeHoseConnect);
                     break;
 
                 case TrainCar.EngineTypes.Diesel:
@@ -96,6 +97,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlTractionCutOffRelayClosingOrder);
                     SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
                     SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
+                    SwitchesOnPanelArray[1, 7].initDefinition(UserCommand.ControlBrakeHoseConnect);
                     break;
 
                 case TrainCar.EngineTypes.Steam: