Display tractive force instead of compensated out force

Author: cesarBLG

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -1120,8 +1120,8 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
 
             // Load
             var data = 0f;
-            if (FilteredMotiveForceN != 0)
-                data = Math.Abs(this.FilteredMotiveForceN);
+            if (FilteredTractiveForceN != 0)
+                data = Math.Abs(this.FilteredTractiveForceN);
             else
                 data = Math.Abs(TractiveForceN);
             if (DynamicBrakePercent > 0)

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -494,7 +494,7 @@ public enum TractionMotorTypes
         public float SaveAdhesionFilter;
         public float AdhesionConditions;
 
-        public float FilteredMotiveForceN;
+        public float FilteredTractiveForceN;
 
         public double CommandStartTime;
 
@@ -2170,7 +2170,7 @@ public override void Update(float elapsedClockSeconds)
                     AntiSlip = true; // Always set AI trains to AntiSlip
                     SimpleAdhesion();   // Simple adhesion model used for AI trains
                     AdvancedAdhesionModel = false;
-                    if (Train.IsActualPlayerTrain) FilteredMotiveForceN = CurrentFilter.Filter(MotiveForceN, elapsedClockSeconds);
+                    if (Train.IsActualPlayerTrain) FilteredTractiveForceN = CurrentFilter.Filter(TractiveForceN, elapsedClockSeconds);
                     WheelSpeedMpS = Flipped ? -AbsSpeedMpS : AbsSpeedMpS;            //make the wheels go round
                     break;
                 case Train.TRAINTYPE.STATIC:
@@ -2228,7 +2228,7 @@ public override void Update(float elapsedClockSeconds)
                     }
 
                     //Force to display
-                    FilteredMotiveForceN = CurrentFilter.Filter(MotiveForceN, elapsedClockSeconds);
+                    FilteredTractiveForceN = CurrentFilter.Filter(TractiveForceN, elapsedClockSeconds);
                     break;
                 default:
                     break;
@@ -5243,10 +5243,10 @@ public virtual float GetDataOf(CabViewControl cvc)
                             {
                                 //float rangeFactor = direction == 0 ? (float)cvc.MaxValue : (float)cvc.MinValue;
                                 float rangeFactor = direction == 0 ? MaxCurrentA : (float)cvc.MinValue;
-                                if (FilteredMotiveForceN != 0)
-                                    data = this.FilteredMotiveForceN / MaxForceN * rangeFactor;
+                                if (FilteredTractiveForceN != 0)
+                                    data = FilteredTractiveForceN / MaxForceN * rangeFactor;
                                 else
-                                    data = this.LocomotiveAxles[cvc.ControlId].DriveForceN / MaxForceN * rangeFactor;
+                                    data = TractiveForceN / MaxForceN * rangeFactor;
                                 data = Math.Abs(data);
                             }
                             if (DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)
@@ -5273,7 +5273,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                             if (cvc.ControlType.Type == CABViewControlTypes.AMMETER_ABS) data = Math.Abs(data);
                             break;
                         }
-                        data = this.MotiveForceN / MaxForceN * MaxCurrentA;
+                        data = TractiveForceN / MaxForceN * MaxCurrentA;
                         if (cvc.ControlType.Type == CABViewControlTypes.AMMETER_ABS) data = Math.Abs(data);
                         break;
                     }
@@ -5289,10 +5289,10 @@ public virtual float GetDataOf(CabViewControl cvc)
                         data = 0.0f;
                         if (ThrottlePercent > 0)
                         {
-                            if (FilteredMotiveForceN != 0)
-                                data = this.FilteredMotiveForceN / MaxForceN * MaxCurrentA;
+                            if (FilteredTractiveForceN != 0)
+                                data = FilteredTractiveForceN / MaxForceN * MaxCurrentA;
                             else
-                                data = this.LocomotiveAxles[cvc.ControlId].DriveForceN / MaxForceN * MaxCurrentA;
+                                data = TractiveForceN / MaxForceN * MaxCurrentA;
                             data = Math.Abs(data);
                         }
                         if (DynamicBrake && DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)
@@ -5310,10 +5310,10 @@ public virtual float GetDataOf(CabViewControl cvc)
                         if (cvc is CVCGauge && ((CVCGauge)cvc).Orientation == 0)
                             direction = ((CVCGauge)cvc).Direction;
                         data = 0.0f;
-                        if (FilteredMotiveForceN != 0)
-                            data = this.FilteredMotiveForceN;
+                        if (FilteredTractiveForceN != 0)
+                            data = FilteredTractiveForceN;
                         else
-                            data = this.LocomotiveAxles[cvc.ControlId].DriveForceN;
+                            data = TractiveForceN;
                         if (DynamicBrake && DynamicBrakePercent > 0)
                         {
                             data = DynamicBrakeForceN;
@@ -5358,10 +5358,10 @@ public virtual float GetDataOf(CabViewControl cvc)
                         if (cvc is CVCGauge && ((CVCGauge)cvc).Orientation == 0)
                             direction = ((CVCGauge)cvc).Direction;
                         data = 0.0f;
-                        if (FilteredMotiveForceN != 0)
-                            data = Math.Abs(this.FilteredMotiveForceN);
+                        if (FilteredTractiveForceN != 0)
+                            data = Math.Abs(FilteredTractiveForceN);
                         else
-                            data = Math.Abs(this.LocomotiveAxles[cvc.ControlId].DriveForceN);
+                            data = Math.Abs(TractiveForceN);
                         if (DynamicBrake && DynamicBrakePercent > 0)
                         {
                             data = -Math.Abs(DynamicBrakeForceN);
@@ -5407,9 +5407,9 @@ public virtual float GetDataOf(CabViewControl cvc)
                         data = 0.0f;
                         if (Math.Abs(SpeedMpS) == 0.0f)
                             data = 0.0f;
-                        else if (Math.Abs(FilteredMotiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) > 0)
-                            data = Math.Abs(this.FilteredMotiveForceN);
-                        else if (Math.Abs(FilteredMotiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) < 0)
+                        else if (Math.Abs(FilteredTractiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) > 0)
+                            data = Math.Abs(FilteredTractiveForceN);
+                        else if (Math.Abs(FilteredTractiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) < 0)
                             data = -Math.Abs(BrakeForceN + DynamicBrakeForceN);
                         switch (cvc.Units)
                         {

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

@@ -1465,11 +1465,11 @@ public float GetDataOf(CabViewControl cvc)
                     }
                     break;
                 case CABViewControlTypes.ORTS_MOTIVE_FORCE:
-                    data = Locomotive.FilteredMotiveForceN;
+                    data = Locomotive.FilteredTractiveForceN;
                     break;
                 case CABViewControlTypes.ORTS_MOTIVE_FORCE_KILONEWTON:
-                    if (Locomotive.FilteredMotiveForceN > Locomotive.DynamicBrakeForceN)
-                        data = (float)Math.Round(Locomotive.FilteredMotiveForceN / 1000, 0);
+                    if (Locomotive.FilteredTractiveForceN > Locomotive.DynamicBrakeForceN)
+                        data = (float)Math.Round(Locomotive.FilteredTractiveForceN / 1000, 0);
                     else if (Locomotive.DynamicBrakeForceN > 0)
                         data = -(float)Math.Round(Locomotive.DynamicBrakeForceN / 1000, 0);
                     break;

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

@@ -2198,8 +2198,8 @@ public virtual string GetDebugStatus()
                 String.Format("{0}", FormatStrings.FormatSpeedDisplay(SpeedMpS, IsMetric)),
                 loco.DieselEngines[0].GearBox.HuDShaftRPM,
                 // For Locomotive HUD display shows "forward" motive power (& force) as a positive value, braking power (& force) will be shown as negative values.
-                FormatStrings.FormatPower((MotiveForceN) * SpeedMpS, IsMetric, false, false),
-                String.Format("{0}{1}", FormatStrings.FormatForce(MotiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
+                FormatStrings.FormatPower(TractiveForceN * SpeedMpS, IsMetric, false, false),
+                String.Format("{0}{1}", FormatStrings.FormatForce(TractiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
                 Simulator.Catalog.GetString(locomotivetypetext)
                 );
             }
@@ -2213,8 +2213,8 @@ public virtual string GetDebugStatus()
                 ThrottlePercent,
                 String.Format("{0}", FormatStrings.FormatSpeedDisplay(SpeedMpS, IsMetric)),
                 // For Locomotive HUD display shows "forward" motive power (& force) as a positive value, braking power (& force) will be shown as negative values.
-                FormatStrings.FormatPower((MotiveForceN) * SpeedMpS, IsMetric, false, false),
-                String.Format("{0}{1}", FormatStrings.FormatForce(MotiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
+                FormatStrings.FormatPower(TractiveForceN * SpeedMpS, IsMetric, false, false),
+                String.Format("{0}{1}", FormatStrings.FormatForce(TractiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
                 Simulator.Catalog.GetString(locomotivetypetext)
                 );
             }