Merge branch 'master' into feature/less-windows-forms

Author: twpol

Source/ContentChecker/ContentChecker.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Content Checker</AssemblyTitle>

Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>Contrib.ActivityEditor</AssemblyName>
     <ApplicationIcon>..\..\..\ORTS.ico</ApplicationIcon>

Source/Contrib/ActivityEditor/LibAE/LibAE.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Library</OutputType>
     <AssemblyName>Contrib.LibAE</AssemblyName>
     <IsPublishable>False</IsPublishable>

Source/Contrib/ContentManager/ContentManager.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>WinExe</OutputType>
     <RootNamespace>ORTS.ContentManager</RootNamespace>
     <AssemblyName>Contrib.ContentManager</AssemblyName>

Source/Contrib/DataCollector/DataCollector.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>ORTS.DataCollector</RootNamespace>
     <AssemblyName>Contrib.DataCollector</AssemblyName>

Source/Contrib/DataConverter/DataConverter.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>Orts.DataConverter</RootNamespace>
     <AssemblyName>Contrib.DataConverter</AssemblyName>

Source/Contrib/DataValidator/DataValidator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>Contrib.DataValidator</AssemblyName>
     <IsPublishable>False</IsPublishable>

Source/Contrib/SimulatorTester/SimulatorTester.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>Orts.SimulatorTester</RootNamespace>
     <AssemblyName>Contrib.SimulatorTester</AssemblyName>

Source/Contrib/TrackViewer/Drawing/DrawTerrain.cs

@@ -486,8 +486,14 @@ void UpdateCamera(DrawArea drawArea)
             float camHeight = width / device.Viewport.AspectRatio / 2;
             Vector3 cameraPosition = cameraTarget;
             cameraPosition.Y = -camHeight;
+            float nearPlaneDistance = camHeight / 2;
+            if (nearPlaneDistance <= 0)
+            {
+                // distance is too close for CreatePerspectiveFieldOfView
+                return;
+            }
             basicEffect.View = Matrix.CreateLookAt(cameraPosition, cameraTarget, new Vector3(0, 0, 1));
-            basicEffect.Projection = Matrix.CreatePerspectiveFieldOfView(MathHelper.PiOver2, device.Viewport.AspectRatio, camHeight / 2, camHeight * 2);
+            basicEffect.Projection = Matrix.CreatePerspectiveFieldOfView(MathHelper.PiOver2, device.Viewport.AspectRatio, nearPlaneDistance, camHeight * 2);
 
         }
         #endregion

Source/Contrib/TrackViewer/TrackViewer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
+    <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>WinExe</OutputType>
     <RootNamespace>ORTS.TrackViewer</RootNamespace>
     <AssemblyName>Contrib.TrackViewer</AssemblyName>

Source/Documentation/Manual/_static/readme.txt

@@ -0,0 +1 @@
+this empty directory supresses a warning during sphinx build

Source/Documentation/Manual/driving.rst

@@ -38,7 +38,7 @@ can select different views using the keyboard, as described in
 :ref:`Changing the View <driving-changing-view>`.
 
 Cab Letter-Boxing
-----------------
+-----------------
 
 OR manages not only cab interiors using 2D images in a MSTS-compatible
 way, but also supports 3D models. Most 2D cab images follow MSTS practice,
@@ -576,6 +576,97 @@ appears on the car's display line until the air pressure has fallen to zero.
 More information about manipulating the brakes during coupling and 
 uncoupling can also be found :ref:`here <driving-hud-brake>`.
 
+.. _train-operations-monitor:
+
+Ctrl-Alt-F9 Train Operations Monitor
+------------------------------------
+
+This Open Rails Train Operations window has a vertical view of the entire train:
+
+.. image:: images/TrainCarOperations-01.png
+  :align: center
+  :scale: 100%
+
+|
+
+This window shows the whole train in vertical mode. Any car can be selected by clicking on the Car ID. 
+Two arrows will then appear pointing to the selected car.
+
+By clicking on the selected CarId the "Train Operations Viewer" window will be displayed:
+
+.. image:: images/TrainOperationsViewer-02.png
+  :align: center
+  :scale: 100%
+
+|
+
+From the "Train Operations Viewer" window, we can set all the available systems, as in the “Car Operation menu”:
+
+- FrontBrakeHose
+- FrontAngleCock
+- CouplerFront
+- CouplerRear
+- RearAngleCock
+- RearBrakeHose
+- HandBrake
+- BleedOffValve
+- ToggleElectricTrainSupplyCable
+- ToggleMU
+- TogglePower
+- ToggleBatterySwitch
+
+This is where all the symbols are placed:
+
+.. image:: images/TrainOperationsViewer.png
+  :align: center
+  :scale: 100%
+
+|
+
+The red cross on the handbrake symbol (or another), indicates that it is not available.
+
+Any changes made in this window will also appear in the "Train Car Operations" window:
+
+.. image:: images/TrainOperationsViewer-03.png
+  :align: center
+  :scale: 100%
+
+|
+
+After a change in the braking system that keeps the train stopped, the CarID changes to a cyan colour. 
+In this way, it is easy for the user, to find out which car is stopping the train.
+
+A click on the right arrow hides all non-system brake symbols, inside the "Train Car Operations" window:
+
+.. image:: images/TrainCarOperations-04.png
+  :align: center
+  :scale: 100%
+
+|
+
+To make the text bold, click the left arrow:
+
+.. image:: images/TrainCarOperations-05.png
+  :align: center
+  :scale: 100%
+
+|
+
+While the "Train Operations Viewer" window is visible, we can modify the "Train Car Operations" window, 
+but if we open the "Train Operations" window <F9> and click on any CarID, the "Car Operation Menu" will 
+appear and it will point to the previously selected CarID in the "Train Operations Viewer" window.
+The "Car Operations Menu" is updated from the "Train Operations Viewer" window.
+A click on the CarID in the “Train Operations Viewer” will close the window.
+
+If the train is very long and not all the cars are displayed in the "Train Car Operations" window, we can scroll by clicking on the white down arrow (vertical scroll bar) at the bottom right.
+Once the required car has been selected, it will remain visible on the last row:
+
+.. image:: images/TrainCarOperations-06.png
+  :align: center
+  :scale: 100%
+
+|
+
 .. _driving-activity:
 
 F10 Activity Monitor
@@ -637,7 +728,7 @@ within the cabview, see :ref:`here <cabs-odometer>`.
 
 
 Activity Evaluation
-------------------
+-------------------
 
 ``Description``
 '''''''''''''''
@@ -710,8 +801,6 @@ This report is made up of several sections.
    :scale: 80%
    :align: center
 
-.. raw:: latex
-
 The report file OpenRailsEvaluation.txt is saved alongside the log file OpenRailsLog.txt and
 the default location for this is the Windows Desktop.
 
@@ -1262,8 +1351,7 @@ or unloading operation is ongoing.
 Autopilot Mode
 ==============
 
-When in activity mode or in Explore in activity mode, through this feature 
-it is possible to stay
+Through this feature it is possible to stay
 in the cab of the player train, but to let Open Rails move the train,
 respecting path, signals, speeds and station stops.
 
@@ -1276,8 +1364,8 @@ but it can also be used to run an activity (or part of it, as it is
 possible to turn autopilot mode on or off at runtime) as a trainspotter or 
 a visitor within the cab.
 
-Autopilot mode is active only in activity mode (i.e. not in explorer or 
-timetable modes).
+Autopilot mode is available in activity, timetable and explore in activity 
+mode (i.e. not in explorer mode).
 
 When starting the game with any activity, you are in player driving mode. 
 If you press Alt+A, you enter the autopilot mode: you are in the loco's 
@@ -1300,7 +1388,7 @@ auto mode.
 Station stops, waiting points and reverse points are synchronized as far as 
 possible in the two modes.
 
-Cars can also be uncoupled in autopilot mode (but check that the train will 
+In activity mode cars can also be uncoupled in autopilot mode (but check that the train will 
 stop in enough time, otherwise it is better to change to player driven 
 mode). A static consist can also be coupled in autopilot mode.
 

Source/Documentation/Manual/images/TrainCarOperations-01.png

@@ -15,6 +15,8 @@ What's been added
 -----------------
 
 - detailed map which tracks player train
+- self-installing content
+- new rolling stock lighting controls, including horn-activated flashing lights
 - partial turntables
 - cab controls operated remotely from a tablet or control desk
 - animations for cab windows
@@ -30,6 +32,7 @@ What's been improved
 --------------------
 
 - sky, sunrise and sunset appearance
+- auto-pilot extended to timetables
 - wheelslip, exhaust and steam
 - layout of map window
 - F9 menu for controlling cars and brakes

Source/Documentation/Manual/images/TrainCarOperations-04.png

@@ -83,20 +83,22 @@ The player can select the unit of measure of brake pressure in the
 When set to *automatic* the unit of measure is the same as that used in
 the cabview of the locomotive.
 
-Other units
------------
+Other units of measure
+----------------------
 
 This selects the units displayed for length, mass, pressure, etc. in the
 :ref:`F5 Train Driving Info Window and also the Alt+F5 HUD <driving-hud>` of the simulation.
 
+These windows use the abbreviations *t-us* for short tons (2000 lb),
+*t-uk* for long tons (2240 lb) and *t* for metric tons (1000 kg).
+
+The option *Route* sets the units based on the data in the route files. The route's TRK file may contain ``MilepostUnitsMiles ()`` or 
+``MilepostUnitsKilometers ()`` to specify the units of distance for this route.
+
 The option *Player's Location* sets the units according to the Windows
 *Language and Region* settings on the player's computer.
 
-The option *Route* sets the units based on the data in the route files.
-The other options are self-explanatory.
-
-These windows use the abbreviations *t-us* for short tons (2000 lb),
-*t-uk* for long tons (2240 lb) and *t* for metric tons (1000 kg).
+The other choices for units of measure are straightforward.
 
 Note: The units displayed by the :ref:`F4 Track Monitor <driving-track-monitor>` (e.g. velocity and
 distance) are always based on data read from the route files.

Source/Documentation/Manual/images/TrainCarOperations-05.png

@@ -159,6 +159,11 @@ If you choose to develop your own pages, please consider sharing them with the O
 
 .. image:: images/switch-panel.png
 
+- The Train Car Operations page has the same functionality as the :ref:`Ctrl-Alt-F9 Train Operations Monitor <train-operations-monitor>`.
+  Advantage of having this windows as a web page is that it can be shown outside the Open Rails main window.
+  Even on another display like for instance a tablet. It has more or less the same functionality, more details
+  to be found :ref:`here <train-operations-monitor>`.
+
 .. _web-server-api:
 
 Application Programming Interfaces (APIs)