Skip to content

Commit 9d945d0

Browse files
authored
Merge pull request #1064 from rwf-rr/help-add-train-info-tab
Add Train Info tab to Help window (F1)
2 parents 9d6ee35 + 1be1fc4 commit 9d945d0

File tree

6 files changed

+283
-2
lines changed

6 files changed

+283
-2
lines changed

Source/Documentation/Manual/driving.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ F1 Information Monitor
202202
----------------------
203203

204204
The F1 key displays the following set of panels in a tabbed format,
205-
selected by clicking with the mouse on the desired heading:
205+
selected by clicking with the mouse on the desired heading or
206+
using ``<Shift+F1>`` to step through the tabs:
206207

207208
``Key Commands``: displays the actions of the keyboard keys
208209

@@ -231,6 +232,11 @@ completed, the string ``Done`` appears in the last column:
231232

232233
``Procedures``: basic instructions for driving trains in Open Rails.
233234

235+
``Train Info``: information about the player train.
236+
237+
.. image:: images/driving-traininfo.png
238+
:align: center
239+
:scale: 80%
234240

235241
F3
236242
----------------
Loading

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3489,6 +3489,10 @@ public LatLonDirection GetLatLonDirection()
34893489
return new LatLonDirection(latLon, directionDeg); ;
34903490
}
34913491

3492+
public int GetWagonNumAxles() { return WagonNumAxles; }
3493+
3494+
public float GetGravitationalAccelerationMpS2() { return GravitationalAccelerationMpS2; }
3495+
34923496
/// <summary>
34933497
/// Update the gravity force and % gradient of this train car at the current position
34943498
/// </summary>
373 Bytes
Loading

Source/RunActivity/RunActivity.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,9 @@
537537
<Content Include="Content\TrackMonitorImages.png">
538538
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
539539
</Content>
540+
<Content Include="Content\TrainInfoSprites.png">
541+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
542+
</Content>
540543
<Content Include="Content\TrainOperationsCoupler.png">
541544
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
542545
</Content>

0 commit comments

Comments
 (0)