Open Rails

Merge ~mauribachi/or:OR-Git-F4-Reversal-distance into or:master

  1. Git
  2. lp:~mauribachi/or
  3. OR-Git-F4-Reversal-distance
  4. Merge into master
Proposed by mbm_OR
Status: Merged
Approved by: James Ross
Approved revision: e7d4fdf539165ad1a4ca550b8b40cd5f4096afdf
Merged at revision: f1917757f6bca8e6a5d651c3401cfc2fc676e582
Proposed branch: ~mauribachi/or:OR-Git-F4-Reversal-distance
Merge into: or:master
Diff against target: 29 lines (+11/-0)
1 file modified
Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs (+11/-0)
Reviewer Review Type Date Requested Status
James Ross Approve
Review via email: mp+363146@code.launchpad.net

Commit message

Bug fix for https://bugs.launchpad.net/or/+bug/1815644 The reversal point distance was not displayed in Track Monitor.

Description of the change

Since version x1.3.1-18, the reversal point distance was not displayed in the Track Monitor (F4).

To post a comment you must log in.
Revision history for this message
James Ross (twpol) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
2index 69be1f3..740f1f5 100644
3--- a/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
4+++ b/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
5@@ -654,6 +654,14 @@ namespace Orts.Viewer3D.Popups
6 lastLabelPosition = drawMilePost(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
7 break;
8
9+ case Train.TrainObjectItem.TRAINOBJECTTYPE.FACING_SWITCH:
10+ drawSwitch(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
11+ break;
12+
13+ case Train.TrainObjectItem.TRAINOBJECTTYPE.REVERSAL:
14+ drawReversal(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
15+ break;
16+
17 default: // capture unkown item
18 break;
19 }
20@@ -670,6 +678,9 @@ namespace Orts.Viewer3D.Popups
21 case Train.TrainObjectItem.TRAINOBJECTTYPE.REVERSAL:
22 drawReversal(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
23 break;
24+
25+ default:
26+ break;
27 }
28 }
29 // reverse display of signals to have correct superposition

Subscribers

People subscribed via source and target branches

to all changes: