Merge pull request #831 from sweiland-openrails/SwitchPanel

poor mans switch panel on tablet

Author: sweiland-openrails

Source/Documentation/Manual/images/switch-panel.png

@@ -147,6 +147,13 @@ If you choose to develop your own pages, please consider sharing them with the O
 
 .. image:: images/web-page-map.png
 
+- | The Switch Panel page shows a html panel with a selection of 40 buttons. Buttons which can be used to issue Open Rails commands, normally entered via the keyboard.
+  | This panel is most usefull when used on a touch enabled device, such as a tablet.
+  | The adress of the panel is "<OR host>:2150/SwitchPanel/index.html", where <OR host> must be replaced with the hostname or ip adress of the host where Open Rails is running. 
+  | Not all buttons are yet filled. Depends also on the type of locomotive.
+
+.. image:: images/switch-panel.png
+
 .. _web-server-api:
 
 Application Programming Interfaces (APIs)

Source/Documentation/Manual/software-platform.rst

@@ -35,7 +35,7 @@ public static string GetPrettyName(Enum value)
             return type.GetField(Enum.GetName(type, value))
                 .GetCustomAttributes(false)
                 .OfType<GetStringAttribute>()
-                .SingleOrDefault()
+                .FirstOrDefault()
                 .Name;
         }
     }
@@ -48,5 +48,17 @@ public class GetParticularStringAttribute : GetStringAttribute
     {
         public string Context { get; protected set; }
         public GetParticularStringAttribute(string context, string name) : base(name) { Context = context; }
+
+        public static string GetParticularPrettyName(string context, Enum value)
+        {
+            var type = value.GetType();
+            string toBeReturned = type.GetField(Enum.GetName(type, value))
+                .GetCustomAttributes(false)
+                .OfType<GetParticularStringAttribute>()
+                .SingleOrDefault()
+                .Name;
+
+            return toBeReturned;
+        }
     }
 }

Source/ORTS.Common/GetStringAttribute.cs

@@ -319,14 +319,14 @@ public bool IsPlayerDriven
 
         public enum TRAIN_CONTROL
         {
-            AUTO_SIGNAL,
-            AUTO_NODE,
-            MANUAL,
-            EXPLORER,
-            OUT_OF_CONTROL,
-            INACTIVE,
-            TURNTABLE,
-            UNDEFINED
+            [GetParticularString("TrainControl", "Auto Signal")] AUTO_SIGNAL,
+            [GetParticularString("TrainControl", "Auto Node")] AUTO_NODE,
+            [GetParticularString("TrainControl", "Manual")] MANUAL,
+            [GetParticularString("TrainControl", "Explorer")] EXPLORER,
+            [GetParticularString("TrainControl", "Out of Control")] OUT_OF_CONTROL,
+            [GetParticularString("TrainControl", "Inactive")] INACTIVE,
+            [GetParticularString("TrainControl", "Turntable")] TURNTABLE,
+            [GetParticularString("TrainControl", "Undefined")] UNDEFINED
         }
 
         private TRAIN_CONTROL controlMode = TRAIN_CONTROL.UNDEFINED;

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

@@ -17,17 +17,18 @@
 using System.IO;
 using Orts.Common;
 using Orts.Parsers.Msts;
+using ORTS.Common;
 using ORTS.Scripting.Api;
 
 namespace Orts.Simulation.RollingStocks.SubSystems
 {
     // Door state: do not change the order of this enum
     public enum DoorState
     {
-        Closed,
-        Closing,
-        Opening,
-        Open,
+        [GetParticularString("Door", "Closed")] Closed,
+        [GetParticularString("Door", "Closing")] Closing,
+        [GetParticularString("Door", "Opening")] Opening,
+        [GetParticularString("Door", "Open")] Open,
     }
     public enum DoorSide
     {

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Door.cs

@@ -33,7 +33,7 @@ public class ScriptedCircuitBreaker : ITractionCutOffSubsystem
         public Simulator Simulator => Locomotive.Simulator;
 
         public bool Activated = false;
-        string ScriptName = "Automatic";
+        public string ScriptName { get; protected set; } = "Automatic";
         CircuitBreaker Script;
 
         public float DelayS { get; protected set; } = 0f;

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

@@ -34,7 +34,7 @@ public class ScriptedTractionCutOffRelay : ITractionCutOffSubsystem
         public Simulator Simulator => LocomotivePowerSupply.Locomotive.Simulator;
 
         public bool Activated = false;
-        string ScriptName = "Automatic";
+        public string ScriptName { get; protected set; } = "Automatic";
         TractionCutOffRelay Script;
 
         public float DelayS { get; protected set; } = 0f;

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

@@ -49,10 +49,11 @@ public class HUDWindow : LayeredWindow
 
         readonly Viewer Viewer;
         readonly Action<TableData>[] TextPages;
+        public readonly int TextPagesLength;
         readonly WindowTextFont TextFont;
         readonly HUDGraphMaterial HUDGraphMaterial;
 
-        int TextPage;
+        public int TextPage;
         int LocomotivePage = 2;
         int LastTextPage;
         TableData TextTable = new TableData() { Cells = new string[0, 0] };
@@ -96,6 +97,7 @@ public HUDWindow(WindowManager owner)
             textPages.Add(TextPageWeather);
             textPages.Add(TextPageDebugInfo);
             TextPages = textPages.ToArray();
+            TextPagesLength = TextPages.Length;
 
             TextFont = owner.TextFontDefaultOutlined;
             ColumnWidth *= TextFont.Height;

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -39,7 +39,7 @@ public class TrackMonitorWindow : Window
         Label SpeedAllowed;
         Label ControlMode;
         Label Gradient;
-        TrackMonitor Monitor;
+        public TrackMonitor Monitor { get; private set; }
 
         readonly Dictionary<Train.TRAIN_CONTROL, string> ControlModeLabels;
 
@@ -191,10 +191,10 @@ public class TrackMonitor : Control
         readonly Viewer Viewer;
         private bool metric => Viewer.MilepostUnitsMetric;
         private readonly SavingProperty<int> StateProperty;
-        private DisplayMode Mode
+        public DisplayMode Mode
         {
             get => (DisplayMode)StateProperty.Value;
-            set
+            private set
             {
                 StateProperty.Value = (int)value;
             }

Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs

@@ -33,7 +33,7 @@
 namespace Orts.Viewer3D.Processes
 {
     public class WebServerProcess
-    {
+    { 
         public readonly Profiler Profiler = new Profiler("WebServer");
         private readonly ProcessState State = new ProcessState("WebServer");
         private readonly Game Game;
@@ -64,11 +64,10 @@ void WebServerThread()
             Profiler.SetThread();
             Game.SetThreadLanguage();
 
-            string myWebContentPath = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Content\\Web");
             EndPointManager.UseIpv6 = true;
             try
             {
-                using (EmbedIO.WebServer server = WebServer.CreateWebServer($"http://*:{Game.Settings.WebServerPort}", myWebContentPath))
+                using (EmbedIO.WebServer server = WebServer.CreateWebServer($"http://*:{Game.Settings.WebServerPort}", myWebContentPath()))
                     server.RunAsync(StopServer.Token).Wait();
             }
             catch(AggregateException ex)
@@ -83,5 +82,19 @@ void WebServerThread()
                 }
             }
         }
+
+        private string myWebContentPath()
+        {
+            string exePath = Path.GetDirectoryName(Application.ExecutablePath);
+            if (!System.Diagnostics.Debugger.IsAttached)
+            {
+                // no debugger attached, not developing
+                return Path.Combine(exePath, "Content", "Web");
+            }
+            else
+            {
+                return Path.Combine(Directory.GetParent(exePath).FullName, "Source", "RunActivity", "Viewer3D", "WebServices", "Web");
+            }
+        }
     }
 }