Skip to content

Commit 24637fd

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-974-g2634ac3be and 15 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 537db1a: Blueprint/train car operations UI window - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at cda1d74: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #923 at 4c27204: Add curve squeal to route - Pull request #943 at 8745029: Dynamic Brakes Behavior & Display Improvements - Pull request #945 at 8e37638: Display tractive force instead of compensated out force
17 parents 195b52b + 2634ac3 + dfc715e + d00beb9 + f92de76 + 537db1a + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + cda1d74 + 26cc6a8 + abe2e52 + 4c27204 + 8745029 + 8e37638 commit 24637fd

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,8 +1120,8 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
11201120

11211121
// Load
11221122
var data = 0f;
1123-
if (FilteredMotiveForceN != 0)
1124-
data = Math.Abs(this.FilteredMotiveForceN);
1123+
if (FilteredTractiveForceN != 0)
1124+
data = Math.Abs(this.FilteredTractiveForceN);
11251125
else
11261126
data = Math.Abs(TractiveForceN);
11271127
if (DynamicBrakePercent > 0)

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ public enum TractionMotorTypes
498498
public float SaveAdhesionFilter;
499499
public float AdhesionConditions;
500500

501-
public float FilteredMotiveForceN;
501+
public float FilteredTractiveForceN;
502502

503503
public double CommandStartTime;
504504

@@ -2173,7 +2173,7 @@ public override void Update(float elapsedClockSeconds)
21732173
AntiSlip = true; // Always set AI trains to AntiSlip
21742174
SimpleAdhesion(); // Simple adhesion model used for AI trains
21752175
AdvancedAdhesionModel = false;
2176-
if (Train.IsActualPlayerTrain) FilteredMotiveForceN = CurrentFilter.Filter(MotiveForceN, elapsedClockSeconds);
2176+
if (Train.IsActualPlayerTrain) FilteredTractiveForceN = CurrentFilter.Filter(TractiveForceN, elapsedClockSeconds);
21772177
WheelSpeedMpS = Flipped ? -AbsSpeedMpS : AbsSpeedMpS; //make the wheels go round
21782178
break;
21792179
case Train.TRAINTYPE.STATIC:
@@ -2233,7 +2233,7 @@ public override void Update(float elapsedClockSeconds)
22332233
}
22342234

22352235
//Force to display
2236-
FilteredMotiveForceN = CurrentFilter.Filter(MotiveForceN, elapsedClockSeconds);
2236+
FilteredTractiveForceN = CurrentFilter.Filter(TractiveForceN, elapsedClockSeconds);
22372237
break;
22382238
default:
22392239
break;
@@ -5266,10 +5266,10 @@ public virtual float GetDataOf(CabViewControl cvc)
52665266
{
52675267
//float rangeFactor = direction == 0 ? (float)cvc.MaxValue : (float)cvc.MinValue;
52685268
float rangeFactor = direction == 0 ? MaxCurrentA : (float)cvc.MinValue;
5269-
if (FilteredMotiveForceN != 0)
5270-
data = this.FilteredMotiveForceN / MaxForceN * rangeFactor;
5269+
if (FilteredTractiveForceN != 0)
5270+
data = FilteredTractiveForceN / MaxForceN * rangeFactor;
52715271
else
5272-
data = this.LocomotiveAxles[cvc.ControlId].DriveForceN / MaxForceN * rangeFactor;
5272+
data = TractiveForceN / MaxForceN * rangeFactor;
52735273
data = Math.Abs(data);
52745274
}
52755275
if (DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)
@@ -5296,7 +5296,7 @@ public virtual float GetDataOf(CabViewControl cvc)
52965296
if (cvc.ControlType.Type == CABViewControlTypes.AMMETER_ABS) data = Math.Abs(data);
52975297
break;
52985298
}
5299-
data = this.MotiveForceN / MaxForceN * MaxCurrentA;
5299+
data = TractiveForceN / MaxForceN * MaxCurrentA;
53005300
if (cvc.ControlType.Type == CABViewControlTypes.AMMETER_ABS) data = Math.Abs(data);
53015301
break;
53025302
}
@@ -5312,10 +5312,10 @@ public virtual float GetDataOf(CabViewControl cvc)
53125312
data = 0.0f;
53135313
if (ThrottlePercent > 0)
53145314
{
5315-
if (FilteredMotiveForceN != 0)
5316-
data = this.FilteredMotiveForceN / MaxForceN * MaxCurrentA;
5315+
if (FilteredTractiveForceN != 0)
5316+
data = FilteredTractiveForceN / MaxForceN * MaxCurrentA;
53175317
else
5318-
data = this.LocomotiveAxles[cvc.ControlId].DriveForceN / MaxForceN * MaxCurrentA;
5318+
data = TractiveForceN / MaxForceN * MaxCurrentA;
53195319
data = Math.Abs(data);
53205320
}
53215321
if (DynamicBrake && DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)
@@ -5333,10 +5333,10 @@ public virtual float GetDataOf(CabViewControl cvc)
53335333
if (cvc is CVCGauge && ((CVCGauge)cvc).Orientation == 0)
53345334
direction = ((CVCGauge)cvc).Direction;
53355335
data = 0.0f;
5336-
if (FilteredMotiveForceN != 0)
5337-
data = this.FilteredMotiveForceN;
5336+
if (FilteredTractiveForceN != 0)
5337+
data = FilteredTractiveForceN;
53385338
else
5339-
data = this.LocomotiveAxles[cvc.ControlId].DriveForceN;
5339+
data = TractiveForceN;
53405340
if (DynamicBrake && DynamicBrakePercent > 0)
53415341
{
53425342
data = DynamicBrakeForceN;
@@ -5381,10 +5381,10 @@ public virtual float GetDataOf(CabViewControl cvc)
53815381
if (cvc is CVCGauge && ((CVCGauge)cvc).Orientation == 0)
53825382
direction = ((CVCGauge)cvc).Direction;
53835383
data = 0.0f;
5384-
if (FilteredMotiveForceN != 0)
5385-
data = Math.Abs(this.FilteredMotiveForceN);
5384+
if (FilteredTractiveForceN != 0)
5385+
data = Math.Abs(FilteredTractiveForceN);
53865386
else
5387-
data = Math.Abs(this.LocomotiveAxles[cvc.ControlId].DriveForceN);
5387+
data = Math.Abs(TractiveForceN);
53885388
if (DynamicBrake && DynamicBrakePercent > 0)
53895389
{
53905390
data = -Math.Abs(DynamicBrakeForceN);
@@ -5430,9 +5430,9 @@ public virtual float GetDataOf(CabViewControl cvc)
54305430
data = 0.0f;
54315431
if (Math.Abs(SpeedMpS) == 0.0f)
54325432
data = 0.0f;
5433-
else if (Math.Abs(FilteredMotiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) > 0)
5434-
data = Math.Abs(this.FilteredMotiveForceN);
5435-
else if (Math.Abs(FilteredMotiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) < 0)
5433+
else if (Math.Abs(FilteredTractiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) > 0)
5434+
data = Math.Abs(FilteredTractiveForceN);
5435+
else if (Math.Abs(FilteredTractiveForceN) - Math.Abs(BrakeForceN + DynamicBrakeForceN) < 0)
54365436
data = -Math.Abs(BrakeForceN + DynamicBrakeForceN);
54375437
switch (cvc.Units)
54385438
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,11 +1473,11 @@ public float GetDataOf(CabViewControl cvc)
14731473
}
14741474
break;
14751475
case CABViewControlTypes.ORTS_MOTIVE_FORCE:
1476-
data = Locomotive.FilteredMotiveForceN;
1476+
data = Locomotive.FilteredTractiveForceN;
14771477
break;
14781478
case CABViewControlTypes.ORTS_MOTIVE_FORCE_KILONEWTON:
1479-
if (Locomotive.FilteredMotiveForceN > Locomotive.DynamicBrakeForceN)
1480-
data = (float)Math.Round(Locomotive.FilteredMotiveForceN / 1000, 0);
1479+
if (Locomotive.FilteredTractiveForceN > Locomotive.DynamicBrakeForceN)
1480+
data = (float)Math.Round(Locomotive.FilteredTractiveForceN / 1000, 0);
14811481
else if (Locomotive.DynamicBrakeForceN > 0)
14821482
data = -(float)Math.Round(Locomotive.DynamicBrakeForceN / 1000, 0);
14831483
break;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2222,8 +2222,8 @@ public virtual string GetDebugStatus()
22222222
String.Format("{0}", FormatStrings.FormatSpeedDisplay(SpeedMpS, IsMetric)),
22232223
loco.DieselEngines[0].GearBox.HuDShaftRPM,
22242224
// For Locomotive HUD display shows "forward" motive power (& force) as a positive value, braking power (& force) will be shown as negative values.
2225-
FormatStrings.FormatPower((MotiveForceN) * SpeedMpS, IsMetric, false, false),
2226-
String.Format("{0}{1}", FormatStrings.FormatForce(MotiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
2225+
FormatStrings.FormatPower(TractiveForceN * SpeedMpS, IsMetric, false, false),
2226+
String.Format("{0}{1}", FormatStrings.FormatForce(TractiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
22272227
Simulator.Catalog.GetString(locomotivetypetext)
22282228
);
22292229
}
@@ -2237,8 +2237,8 @@ public virtual string GetDebugStatus()
22372237
ThrottlePercent,
22382238
String.Format("{0}", FormatStrings.FormatSpeedDisplay(SpeedMpS, IsMetric)),
22392239
// For Locomotive HUD display shows "forward" motive power (& force) as a positive value, braking power (& force) will be shown as negative values.
2240-
FormatStrings.FormatPower((MotiveForceN) * SpeedMpS, IsMetric, false, false),
2241-
String.Format("{0}{1}", FormatStrings.FormatForce(MotiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
2240+
FormatStrings.FormatPower(TractiveForceN * SpeedMpS, IsMetric, false, false),
2241+
String.Format("{0}{1}", FormatStrings.FormatForce(TractiveForceN, IsMetric), WheelSlip ? "!!!" : WheelSlipWarning ? "???" : ""),
22422242
Simulator.Catalog.GetString(locomotivetypetext)
22432243
);
22442244
}

0 commit comments

Comments
 (0)