Minor change in handling of ORTSTrackSuperElevation, add SuperElev column to debug display

Author: SteelFill

Source/ORTS.Common/Conversions.cs

@@ -682,6 +682,13 @@ public static string FormatVeryShortDistanceDisplay(float distanceM, bool isMetr
             return String.Format(CultureInfo.CurrentCulture, "{0:N3} {1}", Me.ToFt(distanceM), ft);
         }
 
+        public static string FormatMillimeterDistanceDisplay(float distanceM, bool isMetric)
+        {
+            if (isMetric)
+                return String.Format(CultureInfo.CurrentCulture, "{0:N0} {1}", distanceM * 1000.0f, mm);
+            return String.Format(CultureInfo.CurrentCulture, "{0:N1} {1}", Me.ToIn(distanceM), "in");
+        }
+
         /// <summary>
         /// format localized mass string, as displayed in in-game windows.
         /// </summary>

Source/Orts.Formats.Msts/RouteFile.cs

@@ -106,7 +106,7 @@ public Tr_RouteFile(STFReader stf)
                 // values for superelevation
                 new STFReader.TokenProcessor("ortstracksuperelevation", ()=>{ SuperElevationHgtpRadiusM = new Interpolator(stf); }),
                 // New superelevation standard, will overwrite ORTSTrackSuperElevation
-                new STFReader.TokenProcessor("ortssuperelevation", ()=>{ SuperElevationHgtpRadiusM = null; SuperElevation.Add(new SuperElevationStandard(stf)); }),
+                new STFReader.TokenProcessor("ortssuperelevation", ()=>{ SuperElevation.Add(new SuperElevationStandard(stf)); }),
                 // images
                 new STFReader.TokenProcessor("graphic", ()=>{ Thumbnail = stf.ReadStringBlock(null); }),
                 new STFReader.TokenProcessor("loadingscreen", ()=>{ LoadingScreen = stf.ReadStringBlock(null); }),
@@ -132,6 +132,7 @@ public Tr_RouteFile(STFReader stf)
             if (RouteStart == null) throw new STFException(stf, "Missing RouteStart");
             if (ForestClearDistance == 0 && RemoveForestTreesFromRoads) Trace.TraceWarning("You must define also ORTSUserPreferenceForestClearDistance to avoid trees on roads");
             if (SuperElevation.Count <= 0) SuperElevation.Add(new SuperElevationStandard());
+            else SuperElevationHgtpRadiusM = null; // Disable legacy superelevation system if newer system is defined
         }
 
         public string RouteID;  // ie JAPAN1  - used for TRK file and route folder name

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -636,7 +636,7 @@ public Direction Direction
         protected float TrackGaugeM = 1.435f;  // Track gauge - read in MSTSWagon
         protected Vector3 InitialCentreOfGravityM = new Vector3(0, 1.8f, 0); // get centre of gravity - read in MSTSWagon
         protected Vector3 CentreOfGravityM = new Vector3(0, 1.8f, 0); // get centre of gravity after adjusted for freight animation
-        protected float SuperelevationM; // Super elevation on the curve
+        public float SuperelevationM; // Super elevation on the curve
         protected float MaxUnbalancedSuperElevationM;  // Maximum comfortable cant deficiency, read from MSTS Wagon File
         public float SuperElevationAngleRad;
         protected bool IsMaxSafeCurveSpeed = false; // Has equal loading speed around the curve been exceeded, ie are all the wheesl still on the track?

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -1234,12 +1234,13 @@ void TextPageForceInfo(TableData table)
                 Viewer.Catalog.GetString("Mass"),
                 Viewer.Catalog.GetString("Gradient"),
                 Viewer.Catalog.GetString("Curve"),
+                Viewer.Catalog.GetString("SuperElev"),
                 Viewer.Catalog.GetString("Brk Frict."),
                 Viewer.Catalog.GetString("Brk Slide"),
                 Viewer.Catalog.GetString("Bear Temp"),
                 Viewer.Catalog.GetString(" "),
-                Viewer.Catalog.GetString("DerailCoeff")
-                
+                Viewer.Catalog.GetString("DerailCoeff"),
+                Viewer.Catalog.GetString(" ")
                 );
             TableAddLine(table);
 
@@ -1263,11 +1264,13 @@ void TextPageForceInfo(TableData table)
                 TableSetCell(table, 12, "{0}", FormatStrings.FormatLargeMass(car.MassKG, car.IsMetric, car.IsUK));
                 TableSetCell(table, 13, "{0:F2}%", -car.CurrentElevationPercent);
                 TableSetCell(table, 14, "{0}", FormatStrings.FormatDistance(car.CurrentCurveRadiusM, car.IsMetric));
-                TableSetCell(table, 15, "{0:F0}%", car.HuDBrakeShoeFriction * 100.0f);
-                TableSetCell(table, 16, car.HUDBrakeSkid ? Viewer.Catalog.GetString("Yes") : Viewer.Catalog.GetString("No"));
-                TableSetCell(table, 17, "{0} {1}", FormatStrings.FormatTemperature(car.WheelBearingTemperatureDegC, car.IsMetric, false), car.DisplayWheelBearingTemperatureStatus);
-                TableSetCell(table, 18, car.Flipped ? Viewer.Catalog.GetString("Flipped") : "");
-                TableSetCell(table, 19, "{0:F2}{1}", car.DerailmentCoefficient, car.DerailExpected ? "!!!" : car.DerailPossible ? "???" : "");
+                TableSetCell(table, 15, "{0}", FormatStrings.FormatMillimeterDistanceDisplay(car.SuperelevationM, car.IsMetric));
+                TableSetCell(table, 16, "{0:F0}%", car.HuDBrakeShoeFriction * 100.0f);
+                TableSetCell(table, 17, car.HUDBrakeSkid ? Viewer.Catalog.GetString("Yes") : Viewer.Catalog.GetString("No"));
+                TableSetCell(table, 18, "{0} {1}", FormatStrings.FormatTemperature(car.WheelBearingTemperatureDegC, car.IsMetric, false), car.DisplayWheelBearingTemperatureStatus);
+                TableSetCell(table, 19, " ");
+                TableSetCell(table, 20, "{0:F2}{1}", car.DerailmentCoefficient, car.DerailExpected ? "!!!" : car.DerailPossible ? "???" : "");
+                TableSetCell(table, 21, car.Flipped ? Viewer.Catalog.GetString("Flipped") : "");
                 TableAddLine(table);
 
             }