Merge pull request #1152 from twpol/feature/data-logger-columns

fix: Clean up multiple issues with data logger

Author: cjakeman

Source/Menu/Options.Designer.cs

@@ -210,8 +210,8 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, Telemetry
             checkDataLogger.Checked = Settings.DataLogger;
             checkDataLogPerformance.Checked = Settings.DataLogPerformance;
             checkDataLogPhysics.Checked = Settings.DataLogPhysics;
-            checkDataLogMisc.Checked = Settings.DataLogMisc;
-            checkDataLogSteamPerformance.Checked = Settings.DataLogSteamPerformance;
+            checkDataLogSteamPerformance.Checked = Settings.DataLogExclusiveSteamPerformance;
+            checkDataLogSteamPowerCurve.Checked = Settings.DataLogExclusiveSteamPowerCurve;
             checkVerboseConfigurationMessages.Checked = Settings.VerboseConfigurationMessages;
 
             // Evaluation tab
@@ -474,8 +474,8 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.DataLogger = checkDataLogger.Checked;
             Settings.DataLogPerformance = checkDataLogPerformance.Checked;
             Settings.DataLogPhysics = checkDataLogPhysics.Checked;
-            Settings.DataLogMisc = checkDataLogMisc.Checked;
-            Settings.DataLogSteamPerformance = checkDataLogSteamPerformance.Checked;
+            Settings.DataLogExclusiveSteamPerformance = checkDataLogSteamPerformance.Checked;
+            Settings.DataLogExclusiveSteamPowerCurve = checkDataLogSteamPowerCurve.Checked;
             Settings.VerboseConfigurationMessages = checkVerboseConfigurationMessages.Checked;
 
             // Evaluation tab

Source/Menu/Options.cs

@@ -144,7 +144,7 @@ public enum DirectXFeature
         public bool DisableTCSScripts { get; set; }
         [Default(false)]
         public bool AutoSaveActive { get; set; }
-        [Default (15)]
+        [Default(15)]
         public int AutoSaveInterval { get; set; }
 
         // Audio settings:
@@ -215,9 +215,9 @@ public enum DirectXFeature
         [Default(false)]
         public bool DataLogPhysics { get; set; }
         [Default(false)]
-        public bool DataLogMisc { get; set; }
+        public bool DataLogExclusiveSteamPerformance { get; set; }
         [Default(false)]
-        public bool DataLogSteamPerformance { get; set; }
+        public bool DataLogExclusiveSteamPowerCurve { get; set; }
         [Default(false)]
         public bool VerboseConfigurationMessages { get; set; }
 

Source/Orts.Settings/UserSettings.cs

@@ -2326,7 +2326,7 @@ public override void Initialize()
 
             ApplyBoilerPressure();
 
-            if (Simulator.Settings.DataLogSteamPerformance)
+            if (Simulator.Settings.DataLogExclusiveSteamPerformance)
             {
                 Trace.TraceInformation("============================================= Steam Locomotive Performance - Locomotive Details =========================================================");
                 Trace.TraceInformation("Version - {0}", VersionInfo.VersionOrBuild);
@@ -6477,7 +6477,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
                 }
 
                 // Calculate the elapse time for the steam performance monitoring
-                if (Simulator.Settings.DataLogSteamPerformance)
+                if (Simulator.Settings.DataLogExclusiveSteamPerformance)
                 {
                     if (SpeedMpS > 0.05)
                     {