Automatic merge of T1.5.1-957-g4fd63a327 and 16 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 3ca0eb1: 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 7af1f91: Downloading route content (Github, zip)
- Pull request #912 at 596a03a: 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 #929 at a406a69: Add support for common circuit breaker variants
- Pull request #939 at 6c8095a: Add KM/HOUR/MIN to Cabview Units
- Pull request #941 at 50378f6: AI Penalty Lights Fix

Author: openrails-bot

Source/Contrib/TrackViewer/Drawing/Labels/DrawLabels.cs

@@ -24,7 +24,6 @@
 using Newtonsoft.Json;
 
 using ORTS.Common;
-using ORTS.TrackViewer.UserInterface;
 
 namespace ORTS.TrackViewer.Drawing.Labels
 {
@@ -35,7 +34,7 @@ namespace ORTS.TrackViewer.Drawing.Labels
     /// The list of labels can be saved or loaded to .json. This will not be done automatically.
     /// The labels can be modified either w.r.t. to their location (dragging) or w.r.t. their text.
     /// </summary>
-    public class DrawLabels
+    class DrawLabels
     {
         #region private fields
         /// <summary>This is the list of labels that we need to draw and possibly modify </summary>
@@ -57,15 +56,6 @@ public class DrawLabels
         private WorldLocation draggingStartLocation;
         /// <summary>Are we currently dragging?</summary>
         private bool dragging = false;   // draggingLabelToReplace is not nullable, so we cannot use that
-
-        private TrackViewer TrackViewer;
-
-        private ContextMenu ContextMenu;
-
-        private MenuItem EditLabelMenuItem;
-
-        public MenuItem SetLocationMenuItem;
-
         #endregion
 
         #region Constructor
@@ -74,12 +64,9 @@ public class DrawLabels
         /// Constructor
         /// </summary>
         /// <param name="fontHeight">The height of the font so we can correct during drawing</param>
-        public DrawLabels(TrackViewer trackViewer, int fontHeight)
+        public DrawLabels(int fontHeight)
         {
             this.fontHeight = fontHeight;
-            TrackViewer = trackViewer;
-
-            CreateContextMenu();
         }
         #endregion
 
@@ -101,7 +88,7 @@ public void Draw(DrawArea drawArea)
                     DrawLabel(label);
                 }
                 float distanceSquared = WorldLocation.GetDistanceSquared2D(label.WorldLocation, drawArea.MouseLocation);
-                if (distanceSquared < closestDistanceSquared)
+                if (distanceSquared < closestDistanceSquared )
                 {
                     closestDistanceSquared = distanceSquared;
                     closestToMouseLabel = label;
@@ -120,7 +107,7 @@ public void Draw(DrawArea drawArea)
         /// <param name="label">The lable to draw</param>
         private void DrawLabel(StorableLabel label)
         {
-            drawArea.DrawExpandingString(label.WorldLocation, label.LabelText, 0, -fontHeight / 2);
+            drawArea.DrawExpandingString(label.WorldLocation, label.LabelText, 0, -fontHeight/2);
         }
 
         #endregion
@@ -133,58 +120,36 @@ private void DrawLabel(StorableLabel label)
         /// <param name="mouseY">Current Y-location of the mouse to determine popu location</param>
         internal void AddLabel(int mouseX, int mouseY)
         {
-            var labelInputPopup = new EditLabel("<label>", mouseX, mouseY,
+            var labelInputPopup = new EditLabel("<label>", mouseX, mouseY, 
                 (newLabelText) => labels.Add(drawArea.MouseLocation, newLabelText),
                 allowDelete: false);
             TrackViewer.Localize(labelInputPopup);
             labelInputPopup.ShowDialog();
         }
 
-        private void CreateContextMenu()
-        {
-            ContextMenu = new ContextMenu();
-            EditLabelMenuItem = new MenuItem
-            {
-                Header = "Edit label",
-                IsCheckable = false
-            };
-            EditLabelMenuItem.Click += new RoutedEventHandler((sender, e) => ModifyLabel(closestToMouseLabel,
-                TrackViewer.Window.ClientBounds.Left + TVUserInput.MouseLocationX,
-                TrackViewer.Window.ClientBounds.Left + TVUserInput.MouseLocationY));
-
-            ContextMenu.Items.Add(EditLabelMenuItem);
-
-            SetLocationMenuItem = new MenuItem() { Header = "View scene here" };
-            SetLocationMenuItem.Icon = TrackViewer.menuControl.ThreeDSceneIcon;
-            SetLocationMenuItem.Click += new RoutedEventHandler((sender, e) => TrackViewer.menuControl.MenuSceneWindow_Click(sender, e));
-            SetLocationMenuItem.Click += new RoutedEventHandler(async (sender, e) => await TrackViewer.SceneView?.SetCameraLocation(
-                SetLocationMenuItem.CommandParameter as WorldLocation? ?? new WorldLocation()));
-            ContextMenu.Items.Add(SetLocationMenuItem);
-        }
-
         /// <summary>
         /// Popup a context menu that allows you to edit the text of a label
         /// </summary>
         /// <param name="mouseX">Current X-location of the mouse to determine popup location</param>
-        /// <param name="mouseY">Current Y-location of the mouse to determine popup location</param>
-        internal void PopupContextMenu(int mouseX, int mouseY, WorldLocation mouseLocation)
+        /// <param name="mouseY">Current Y-location of the mouse to determine popu location</param>
+        internal void PopupContextMenu(int mouseX, int mouseY)
         {
-            if (!Properties.Settings.Default.showLabels || labels.Labels.Count() == 0)
-                EditLabelMenuItem.Visibility = Visibility.Collapsed;
-            else
-                EditLabelMenuItem.Visibility = Visibility.Visible;
-
-            SetLocationMenuItem.CommandParameter = mouseLocation;
+            if (!Properties.Settings.Default.showLabels) return;
+            if (labels.Labels.Count() == 0) return;
+            var editingLabel = closestToMouseLabel;
 
-            var visible = false;
-            foreach (MenuItem item in ContextMenu.Items)
-                visible |= item.Visibility == Visibility.Visible;
+            var contextMenu = new ContextMenu();
 
-            if (visible)
+            var editLabelMenuItem = new MenuItem
             {
-                ContextMenu.PlacementRectangle = new Rect((double)mouseX, (double)mouseY, 20, 20);
-                ContextMenu.IsOpen = true;
-            }
+                Header = "Edit label",
+                IsCheckable = false
+            };
+            editLabelMenuItem.Click += new RoutedEventHandler((sender, e) => ModifyLabel(closestToMouseLabel, mouseX, mouseY));
+
+            contextMenu.Items.Add(editLabelMenuItem);
+            contextMenu.PlacementRectangle = new Rect((double)mouseX, (double)mouseY, 20, 20);
+            contextMenu.IsOpen = true;
         }
 
         /// <summary>
@@ -301,7 +266,7 @@ private void LoadJson(string fileName)
                 MessageBox.Show(TrackViewer.catalog.GetString("The .json file could not be read properly."));
                 return;
             }
-
+            
             bool itemsWereRemoved = labelsNew.Sanitize();
             int itemsLeft = labelsNew.Labels.Count();
             string message = string.Empty;
@@ -355,8 +320,8 @@ internal void OnLeftMouseMoved()
             //The new location is then 'original' + 'current' - 'start'.
             draggingStartLocation.NormalizeTo(drawArea.MouseLocation.TileX, drawArea.MouseLocation.TileZ);
             WorldLocation shiftedLocation = new WorldLocation(
-                draggingLabelToReplace.WorldLocation.TileX + drawArea.MouseLocation.TileX - draggingStartLocation.TileX,
-                draggingLabelToReplace.WorldLocation.TileZ + drawArea.MouseLocation.TileZ - draggingStartLocation.TileZ,
+                draggingLabelToReplace.WorldLocation.TileX      + drawArea.MouseLocation.TileX      - draggingStartLocation.TileX,
+                draggingLabelToReplace.WorldLocation.TileZ      + drawArea.MouseLocation.TileZ      - draggingStartLocation.TileZ,
                 draggingLabelToReplace.WorldLocation.Location.X + drawArea.MouseLocation.Location.X - draggingStartLocation.Location.X,
                 0,
                 draggingLabelToReplace.WorldLocation.Location.Z + drawArea.MouseLocation.Location.Z - draggingStartLocation.Location.Z