Settings Exporter - private PR

Build.cmd

@@ -83,8 +83,9 @@ FOR /F "usebackq tokens=1* delims==" %%A IN (`CALL GetVersion.cmd %Mode%`) DO SE
 REM Restore NuGet packages.
 nuget restore Source\ORTS.sln || GOTO :error
 
-REM Recreate Program directory for output.
+REM Recreate Program directory for output and delete previous build files.
 CALL :recreate "Program" || GOTO :error
+CALL :delete "OpenRails-%Mode%*" || GOTO :error
 
 REM Build main program.
 REM Disable warning CS1591 "Missing XML comment for publicly visible type or member".
@@ -126,11 +127,14 @@ IF NOT "%Mode%" == "Unstable" (
 	NET stop ClickToRunSvc
 	NET start ClickToRunSvc
 
-	REM Recreate Documentation folder for output.
-	CALL :recreate "Program\Documentation" || GOTO :error
+	REM Create the documentation folders for output.
+	CALL :create "Program\Documentation" || GOTO :error
+	CALL :create "Program\Documentation\Online" || GOTO :error
+	CALL :create "Program\Documentation\es" || GOTO :error
 
 	REM Compile the documentation.
 	FOR %%E IN (doc docx docm xls xlsx xlsm odt) DO FOR %%F IN ("Source\Documentation\*.%%E") DO ECHO %%~F && OfficeToPDF.exe /bookmarks /print "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
+	FOR %%E IN (doc docx docm xls xlsx xlsm odt) DO FOR %%F IN ("Source\Documentation\Online\*.%%E") DO ECHO %%~F && OfficeToPDF.exe /bookmarks /print "%%~F" "Program\Documentation\Online\%%~nF.pdf" || GOTO :error
 	>"Source\Documentation\Manual\version.py" ECHO version = '%OpenRails_Version%' || GOTO :error
 	>>"Source\Documentation\Manual\version.py" ECHO release = '%OpenRails_Revision%' || GOTO :error
 	PUSHD "Source\Documentation\Manual" && CALL make.bat clean & POPD || GOTO :error
@@ -139,13 +143,13 @@ IF NOT "%Mode%" == "Unstable" (
 	REM Copy the documentation.
 	FOR %%F IN ("Source\Documentation\*.pdf") DO CALL :copy "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
 	CALL :copy "Source\Documentation\Manual\_build\latex\Manual.pdf" "Program\Documentation\Manual.pdf" || GOTO :error
-	CALL :create "Program\Documentation\es"
 	CALL :copy "Source\Documentation\Manual\es\Manual.pdf" "Program\Documentation\es\Manual.pdf" || GOTO :error
 	ROBOCOPY /MIR /NJH /NJS "Source\Documentation\SampleFiles" "Program\Documentation\SampleFiles"
 	IF %ERRORLEVEL% GEQ 8 GOTO :error
 
 	REM Copy the documentation separately.
 	FOR %%F IN ("Program\Documentation\*.pdf") DO CALL :copy "%%~F" "OpenRails-%Mode%-%%~nxF" || GOTO :error
+	FOR %%F IN ("Program\Documentation\Online\*.pdf") DO CALL :copy "%%~F" "OpenRails-%Mode%-%%~nxF" || GOTO :error
 )
 
 IF "%Mode%" == "Stable" (
@@ -161,8 +165,7 @@ IF "%Mode%" == "Stable" (
 )
 
 REM Create binary and source zips.
-CALL :delete "OpenRails-%Mode%*.zip" || GOTO :error
-PUSHD "Program" && 7za.exe a -r -tzip -x^^!*.xml "..\OpenRails-%Mode%.zip" . && POPD || GOTO :error
+PUSHD "Program" && 7za.exe a -r -tzip -x^^!*.xml -x^^!Online "..\OpenRails-%Mode%.zip" . && POPD || GOTO :error
 7za.exe a -r -tzip -x^^!.* -x^^!obj -x^^!lib -x^^!_build -x^^!*.bak "OpenRails-%Mode%-Source.zip" "Source" || GOTO :error
 
 ENDLOCAL

Source/Contrib/ContentManager/ContentInfo.cs

@@ -188,14 +188,24 @@ public static string GetText(Content content)
                     details.AppendFormat("Name:\t{1}{0}", Environment.NewLine, data.Name);
                     details.AppendFormat("NumEngines:\t{1}{0}", Environment.NewLine, data.NumEngines);
                     details.AppendFormat("NumCars:\t{1}{0}", Environment.NewLine, data.NumCars);
-                    details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric));
-                    details.AppendFormat("Weight:\t{1}{0}", Environment.NewLine, FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK));
+                    details.AppendFormat("Axles:\t{1}{0}", Environment.NewLine, data.NumAxles);
+                    details.AppendFormat("Weight:\t{1}  (trailing: {2}){0}", Environment.NewLine, FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK),
+                        FormatStrings.FormatLargeMass(data.TrailingMassKG, IsMetric, IsUK));
                     details.AppendFormat("Length:\t{1}{0}", Environment.NewLine, FormatStrings.FormatShortDistanceDisplay(data.LengthM, IsMetric));
-                    details.AppendFormat("Power:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
+                    details.AppendFormat("MaxPower:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
                     details.AppendFormat("MaxTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxTractiveForceN, IsMetric));
+                    details.AppendFormat("MaxContTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxContinuousTractiveForceN, IsMetric));
+                    details.AppendFormat("MaxDynBrk:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxDynamicBrakeForceN, IsMetric));
+                    if (!IsMetric && !IsUK)
+                    {
+                        details.AppendFormat("HPT:\t{1}{0}", Environment.NewLine, FormatHPT(data.MaxPowerW, data.TrailingMassKG));
+                        details.AppendFormat("TpOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.TrailingMassKG, data.NumOperativeBrakes));
+                        details.AppendFormat("TpEPA:\t{1}{0}", Environment.NewLine, FormatTonsPerEPA(data.TrailingMassKG, data.MaxContinuousTractiveForceN));
+                        details.AppendFormat("TpEDBA:\t{1}{0}", Environment.NewLine, FormatTonsPerEDBA(data.TrailingMassKG, data.MaxDynamicBrakeForceN));
+                    }
+                    details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric));
                     details.AppendFormat("MinCouplerStrength:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinCouplerStrengthN, IsMetric));
-                    if (!IsMetric && !IsUK) { details.AppendFormat("HPT:\t{1}{0}", Environment.NewLine, FormatHPT(data.MaxPowerW, data.MassKG)); }
-                    if (!IsMetric && !IsUK) { details.AppendFormat("TPOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.MassKG, data.NumOperativeBrakes)); }
+                    details.AppendFormat("MinDerailForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinDerailForceN, IsMetric));
                     details.AppendLine();
                     details.AppendFormat("Car ID:\tDirection:\tWeight:\tName:\t{0}", Environment.NewLine);
                     foreach (var car in data.Cars)
@@ -208,16 +218,24 @@ public static string GetText(Content content)
                     details.AppendFormat("Type:\t{1}{0}", Environment.NewLine, data.Type);
                     details.AppendFormat("SubType:\t{1}{0}", Environment.NewLine, data.SubType);
                     details.AppendFormat("Name:\t{1}{0}", Environment.NewLine, data.Name);
-                    details.AppendFormat("Weight:\t{1} ({2}){0}", Environment.NewLine, FormatStrings.FormatMass(data.MassKG, IsMetric), FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK));
+                    details.AppendFormat("Weight:\t{1}  ({2}){0}", Environment.NewLine, FormatStrings.FormatMass(data.MassKG, IsMetric), FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK));
                     details.AppendFormat("Length:\t{1}{0}", Environment.NewLine, FormatStrings.FormatShortDistanceDisplay(data.LengthM, IsMetric));
-                    if (data.Type == CarType.Engine)
+                    if (data.Type != CarType.Engine)
                     {
-                        details.AppendFormat("MaxPowerW:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
-                        details.AppendFormat("MaxForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxForceN, IsMetric));
-                        details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric));
+                        details.AppendFormat("Axles:\t{1}{0}", Environment.NewLine, data.NumAllAxles);
                     }
-                    details.AppendFormat("MaxBrakeF:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxBarkeForceN, IsMetric));
+                    else
+                    {
+                        details.AppendFormat("Axles:\t{1}+{2}{0}", Environment.NewLine, data.NumDriveAxles, data.NumAllAxles - data.NumDriveAxles);
+                        details.AppendFormat("MaxPower:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
+                        details.AppendFormat("MaxTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxForceN, IsMetric));
+                        details.AppendFormat("MaxContTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxContinuousForceN, IsMetric));
+                        details.AppendFormat("MaxDynBrk:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxDynamicBrakeForceN, IsMetric));
+                    }
+                    details.AppendFormat("MaxBrakeF:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxBrakeForceN, IsMetric));
+                    if (data.MaxSpeedMps > 0f) { details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric)); }
                     details.AppendFormat("MinCouplerStrength:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinCouplerStrengthN, IsMetric));
+                    details.AppendFormat("MinDerailForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinDerailForceN, IsMetric));
                     details.AppendLine();
                     details.AppendFormat("Description:\t{0}{0}{1}{0}{0}", Environment.NewLine, data.Description);
                 }
@@ -264,9 +282,6 @@ static string FormatMassBar(float massKg)
         /// <summary>
         /// Calculate and format horsepower per ton for consist, rounded to one decimal.
         /// </summary>
-        /// <param name="consistPowerW"></param>
-        /// <param name="consistMassKG"></param>
-        /// <returns>horsepower-per-ton formated to one decimal.</returns>
         //TODO: implement UK and metric version
         static string FormatHPT(float consistPowerW, float consistMassKG)
         {
@@ -277,14 +292,33 @@ static string FormatHPT(float consistPowerW, float consistMassKG)
         /// <summary>
         /// Calculate and format tons per operative brake for consist, rounded to an integer.
         /// </summary>
-        /// <param name="consistMassKG"></param>
-        /// <param name="consistNumOpBrakes"></param>
-        /// <returns>tons-per-operative-brake formated to an integer.</returns>
         //TODO: implement UK and metric version
         static string FormatTPOB(float consistMassKG, float consistNumOpBrakes)
         {
             var tpob = consistNumOpBrakes > 0 ? Kg.ToTUS(consistMassKG) / consistNumOpBrakes : 0;
             return string.Format("{0:0}", tpob);
         }
+
+        /// <summary>
+        /// Calculate and format tons per equivalent powered axle, rounded to an integer.
+        /// Based on UP convention, of 10k lbf counting as one axle.
+        /// Strictly, EPA should be defined in the eng file. May be done in future.
+        /// </summary>
+        static string FormatTonsPerEPA(float consistMassKG, float consistMaxTractiveEffortN)
+        {
+            var tpepa = consistMaxTractiveEffortN > 0 ? Kg.ToTUS(consistMassKG) / (N.ToLbf(consistMaxTractiveEffortN) / 10000f) : 0;
+            return string.Format("{0:0}", tpepa);
+        }
+
+        /// <summary>
+        /// Calculate and format tons per equivalent dynamic brake axle, rounded to an integer.
+        /// Based on UP convention, of 10k lbf counting as one axle.
+        /// Strictly, EDBA should be defined in the eng file. May be done in future.
+        /// </summary>
+        static string FormatTonsPerEDBA(float consistMassKG, float consistMaxDynamicBrakeForceN)
+        {
+            var tpedba = consistMaxDynamicBrakeForceN > 0 ? Kg.ToTUS(consistMassKG) / (N.ToLbf(consistMaxDynamicBrakeForceN) / 10000f) : 0;
+            return string.Format("{0:0}", tpedba);
+        }
     }
 }

Source/Contrib/ContentManager/ContentMSTS.cs

@@ -127,6 +127,13 @@ public override IEnumerable<Content> Get(ContentType type)
                     foreach (var item in Enumerable.Concat(Directory.GetFiles(pathOR, "*.timetable_or"), Directory.GetFiles(pathOR, "*.timetable-or")))
                         yield return new ContentORTimetableActivity(this, Path.Combine(pathOR, item));
             }
+            else if (type == ContentType.Path)
+            {
+                var path = Path.Combine(PathName, "Paths");
+                if (Directory.Exists(path))
+                    foreach (var item in Directory.GetFiles(path, "*.pat"))
+                        yield return new ContentMSTSPath(this, Path.Combine(path, item));
+            }
         }
 
         public override Content Get(string name, ContentType type)

Source/Contrib/ContentManager/Models/Car.cs

@@ -15,12 +15,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
+// MSTS Wheels and ORTS Axles
+// * ORTS uses unpowered and drive axles. Eg. 2 and 4 for an ES44C4
+// * MSTS uses a mix of wheels and axle. The Wagon section has the total,
+//   the Engine section the driven only.
+//   Values greater than 6 are wheels, less than 6 are axles. Some are
+//   intentionally wrong to work around MSTS issues.
+
 using Orts.Formats.Msts;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace ORTS.ContentManager.Models
 {
@@ -38,24 +42,32 @@ public class Car
         public readonly string Description;
         public readonly float MassKG;
         public readonly float LengthM;
-        public readonly float MaxBarkeForceN;
+        public readonly int NumDriveAxles;
+        public readonly int NumIdleAxles;
+        public readonly int NumAllAxles;
+        public readonly float MaxBrakeForceN;
         public readonly float MaxPowerW;
         public readonly float MaxForceN;
+        public readonly float MaxContinuousForceN;
+        public readonly float MaxDynamicBrakeForceN;
         public readonly float MaxSpeedMps;
         public readonly float MinCouplerStrengthN;
+        public readonly float MinDerailForceN;
 
         public Car(Content content)
         {
             Debug.Assert(content.Type == ContentType.Car);
 
+            const float GravitationalAccelerationMpS2 = 9.80665f;
+
             // .eng files also have a wagon block
             var wagFile = new WagonFile(content.PathName);
             Type = CarType.Wagon;
             SubType = wagFile.WagonType;
             Name = wagFile.Name;
             MassKG = wagFile.MassKG;
             LengthM = wagFile.WagonSize.LengthM;
-            MaxBarkeForceN = wagFile.MaxBrakeForceN;
+            MaxBrakeForceN = wagFile.MaxBrakeForceN;
             MinCouplerStrengthN = wagFile.MinCouplerStrengthN;
 
             if (System.IO.Path.GetExtension(content.PathName).Equals(".eng", StringComparison.OrdinalIgnoreCase))
@@ -66,9 +78,38 @@ public Car(Content content)
                 Name = engFile.Name;
                 MaxPowerW = engFile.MaxPowerW;
                 MaxForceN = engFile.MaxForceN;
+                MaxContinuousForceN = engFile.MaxContinuousForceN;
+                MaxDynamicBrakeForceN = engFile.MaxDynamicBrakeForceN;
                 MaxSpeedMps = engFile.MaxSpeedMps;
                 Description = engFile.Description;
+
+                // see MSTSLocomotive.Initialize()
+                NumDriveAxles = engFile.NumDriveAxles;
+                if (NumDriveAxles == 0)
+                {
+                    if (engFile.NumEngWheels != 0 && engFile.NumEngWheels < 7) { NumDriveAxles = (int)engFile.NumEngWheels; }
+                    else { NumDriveAxles = 4; }
+                }
             }
+
+            // see MSTSWagon.LoadFromWagFile()
+            NumIdleAxles = wagFile.NumWagAxles;
+            if ((NumIdleAxles == 0) && Type != CarType.Engine)
+            {
+                if (wagFile.NumWagWheels != 0 && wagFile.NumWagWheels < 6) { NumIdleAxles = (int)wagFile.NumWagWheels; }
+                else { NumIdleAxles = 4; }
+            }
+
+            // correction for steam engines; see TrainCar.Update()
+            // this is not always correct as TrainCar uses the WheelAxles array for the count; that is too complex to do here
+            if (SubType.Equals("Steam") && NumDriveAxles >= (NumDriveAxles + NumIdleAxles)) { NumDriveAxles /= 2; }
+
+            // see TrainCar.UpdateTrainDerailmentRisk(), ~ line 1609
+            NumAllAxles = NumDriveAxles + NumIdleAxles;
+
+            // see TrainCar.UpdateTrainDerailmentRisk()
+            var numWheels = NumAllAxles * 2;
+            if (numWheels > 0) { MinDerailForceN = MassKG / numWheels * GravitationalAccelerationMpS2; }
         }
     }
 }