slight ETCS DMI refactoring

Author: YoRyan

Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs

@@ -27,6 +27,7 @@
 using ORTS.Scripting.Api.ETCS;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using static Orts.Viewer3D.RollingStock.Subsystems.ETCS.DriverMachineInterface;
 
 namespace Orts.Viewer3D.RollingStock.Subsystems.ETCS
@@ -36,9 +37,9 @@ public class DriverMachineInterface
         public readonly MSTSLocomotive Locomotive;
         public readonly bool GaugeOnly;
         public readonly Viewer Viewer;
-        public List<DMIWindow> Windows = new List<DMIWindow>();
+        public IList<DMIWindow> Windows = new List<DMIWindow>();
         float PrevScale = 1;
-        public ETCSStatus ETCSStatus;
+        public ETCSStatus ETCSStatus { get; private set; }
 
         bool Active;
         public float Scale { get; private set; }
@@ -67,8 +68,8 @@ public class DriverMachineInterface
 
         public Texture2D ColorTexture { get; private set; }
 
-        public bool Blinker2Hz;
-        public bool Blinker4Hz;
+        public bool Blinker2Hz { get; private set; }
+        public bool Blinker4Hz { get; private set; }
         float BlinkerTime;
 
         public float CurrentTime => (float)Viewer.Simulator.ClockTime;
@@ -114,8 +115,12 @@ public void AddToLayout(DMIWindow window, Point position)
         }
         public Texture2D LoadTexture(string name)
         {
-            if (MipMapScale == 2) return SharedTextureManager.Get(Viewer.RenderProcess.GraphicsDevice, System.IO.Path.Combine(Viewer.ContentPath, "ETCS", "mipmap-2", name));
-            else return SharedTextureManager.Get(Viewer.RenderProcess.GraphicsDevice, System.IO.Path.Combine(Viewer.ContentPath, "ETCS", name));
+            string path;
+            if (MipMapScale == 2)
+                path = System.IO.Path.Combine(Viewer.ContentPath, "ETCS", "mipmap-2", name);
+            else
+                path = System.IO.Path.Combine(Viewer.ContentPath, "ETCS", name);
+            return SharedTextureManager.Get(Viewer.RenderProcess.GraphicsDevice, path);
         }
         public void PrepareFrame(float elapsedSeconds)
         {
@@ -306,7 +311,7 @@ public ETCSDefaultWindow(DriverMachineInterface dmi, CabViewControl control) : b
             AddToLayout(MessageArea, new Point(54, DMI.IsSoftLayout ? 350 : 365));
             AddToLayout(MessageArea.ButtonScrollUp, new Point(54+234, DMI.IsSoftLayout ? 350 : 365));
             AddToLayout(MessageArea.ButtonScrollDown, new Point(54+234, MessageArea.Height / 2 + (DMI.IsSoftLayout ? 350 : 365)));
-            for (int i=0; i<MenuBar.Buttons.Count; i++)
+            foreach (int i in Enumerable.Range(0, MenuBar.Buttons.Count))
             {
                 AddToLayout(MenuBar.Buttons[i], new Point(580, 15 + 50*i));
             }
@@ -603,7 +608,7 @@ public DMITextButton(string caption, string displayName, bool upType, Action pre
         }
         void SetText()
         {
-            for (int i=0; i<Caption.Length; i++)
+            foreach (int i in Enumerable.Range(0, Caption.Length))
             {
                 int fontWidth = (int)(CaptionFont.MeasureString(Caption[i]) / Scale);
                 CaptionText[i] = new TextPrimitive(new Point((Width - fontWidth) / 2, (Height - FontHeightButton) / 2 + FontHeightButton * (2 * i - Caption.Length + 1)), Color.White, Caption[i], CaptionFont);
@@ -684,7 +689,7 @@ public DMITextLabel(string caption, int width, int height, DriverMachineInterfac
         }
         void SetText()
         {
-            for (int i = 0; i < Caption.Length; i++)
+            foreach (int i in Enumerable.Range(0, Caption.Length))
             {
                 int fontWidth = (int)(CaptionFont.MeasureString(Caption[i]) / Scale);
                 CaptionText[i] = new TextPrimitive(new Point((Width - fontWidth) / 2, (Height - FontHeightButton) / 2 + FontHeightButton * (2 * i - Caption.Length + 1)), ColorGrey, Caption[i], CaptionFont);