Added DisabledIfCabPowerSupplyOff and DisabledIfLowVoltagePowerSupplyOff parameters to ETCS DMI

Author: Sharpe49

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -15,21 +15,20 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
+using Microsoft.Xna.Framework;
+using Orts.Parsers.Msts;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using Microsoft.Xna.Framework;
-using Orts.Parsers.Msts;
 
 namespace Orts.Formats.Msts
 {
 
-	// TODO - this is an incomplete parse of the cvf file.
-	public class CabViewFile
-	{
+    // TODO - this is an incomplete parse of the cvf file.
+    public class CabViewFile
+    {
         public List<Vector3> Locations = new List<Vector3>();   // Head locations for front, left and right views
         public List<Vector3> Directions = new List<Vector3>();  // Head directions for each view
         public List<string> TwoDViews = new List<string>();     // 2D CAB Views - by GeorgeS
@@ -38,7 +37,7 @@ public class CabViewFile
         public CabViewControls CabViewControls;                 // Controls in CAB - by GeorgeS
 
         public CabViewFile(string filePath, string basePath)
-		{
+        {
             using (STFReader stf = new STFReader(filePath, false))
                 stf.ParseFile(new STFReader.TokenProcessor[] {
                     new STFReader.TokenProcessor("tr_cabviewfile", ()=>{ stf.MustMatch("("); stf.ParseBlock(new STFReader.TokenProcessor[] {
@@ -1276,6 +1275,8 @@ public CVCScreen(STFReader stf, string basepath)
                 new STFReader.TokenProcessor("graphic", ()=>{ ParseGraphic(stf, basepath); }),
                 new STFReader.TokenProcessor("units", ()=>{ ParseUnits(stf); }),
                 new STFReader.TokenProcessor("parameters", ()=>{ ParseCustomParameters(stf); }),
+                new STFReader.TokenProcessor("disablediflowvoltagepowersupplyoff", ()=>{ ParseDisabledIfLowVoltagePowerSupplyOff(stf); }),
+                new STFReader.TokenProcessor("disabledifcabpowersupplyoff", ()=>{ ParseDisabledIfCabPowerSupplyOff(stf); }),
             });
         }
         protected void ParseCustomParameters(STFReader stf)

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

@@ -765,28 +765,32 @@ public DriverMachineInterfaceRenderer(Viewer viewer, MSTSLocomotive locomotive,
 
         public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
         {
-            base.PrepareFrame(frame, elapsedTime);
-            var xScale = Viewer.CabWidthPixels / 640f;
-            var yScale = Viewer.CabHeightPixels / 480f;
-            DrawPosition.X = (int)(Position.X * xScale) - Viewer.CabXOffsetPixels + Viewer.CabXLetterboxPixels;
-            DrawPosition.Y = (int)(Position.Y * yScale) + Viewer.CabYOffsetPixels + Viewer.CabYLetterboxPixels;
-            DrawPosition.Width = (int)(Control.Width * xScale);
-            DrawPosition.Height = (int)(Control.Height * yScale);
-            if (Zoomed)
-            {
-                DrawPosition.Width = 640;
-                DrawPosition.Height = 480;
-                DMI.SizeTo(DrawPosition.Width, DrawPosition.Height);
-                DrawPosition.X -= 320;
-                DrawPosition.Y -= 240;
-                DMI.ETCSDefaultWindow.BackgroundColor = ColorBackground;
-            }
-            else
-            {
-                DMI.SizeTo(DrawPosition.Width, DrawPosition.Height);
-                DMI.ETCSDefaultWindow.BackgroundColor = Color.Transparent;
+            if ((!Control.DisabledIfLowVoltagePowerSupplyOff || Locomotive.LocomotivePowerSupply.LowVoltagePowerSupplyOn) &&
+                (!Control.DisabledIfCabPowerSupplyOff || Locomotive.LocomotivePowerSupply.CabPowerSupplyOn))
+            {
+                base.PrepareFrame(frame, elapsedTime);
+                var xScale = Viewer.CabWidthPixels / 640f;
+                var yScale = Viewer.CabHeightPixels / 480f;
+                DrawPosition.X = (int)(Position.X * xScale) - Viewer.CabXOffsetPixels + Viewer.CabXLetterboxPixels;
+                DrawPosition.Y = (int)(Position.Y * yScale) + Viewer.CabYOffsetPixels + Viewer.CabYLetterboxPixels;
+                DrawPosition.Width = (int)(Control.Width * xScale);
+                DrawPosition.Height = (int)(Control.Height * yScale);
+                if (Zoomed)
+                {
+                    DrawPosition.Width = 640;
+                    DrawPosition.Height = 480;
+                    DMI.SizeTo(DrawPosition.Width, DrawPosition.Height);
+                    DrawPosition.X -= 320;
+                    DrawPosition.Y -= 240;
+                    DMI.ETCSDefaultWindow.BackgroundColor = ColorBackground;
+                }
+                else
+                {
+                    DMI.SizeTo(DrawPosition.Width, DrawPosition.Height);
+                    DMI.ETCSDefaultWindow.BackgroundColor = Color.Transparent;
+                }
+                DMI.PrepareFrame(elapsedTime.ClockSeconds);
             }
-            DMI.PrepareFrame(elapsedTime.ClockSeconds);
         }
 
         public bool IsMouseWithin()