Renamed DebugViewerBeta to MapViewer

Looky1173 · Looky1173 · commit 9b0470aff57e · 2023-08-28T15:55:31.000+02:00
diff --git a/Source/RunActivity/Program.cs b/Source/RunActivity/Program.cs
@@ -42,7 +42,7 @@ static class Program
         public static Simulator Simulator;
         public static Viewer Viewer;
         public static DispatchViewer DebugViewer;
-        public static DispatchViewerBeta DebugViewerBeta;
+        public static MapViewer DebugViewerBeta;
         public static SoundDebugForm SoundDebugForm;
         public static ORTraceListener ORTraceListener;
         public static string logFileName = "";          // contains path to file
diff --git a/Source/RunActivity/Viewer3D/Map/MapDataProvider.cs b/Source/RunActivity/Viewer3D/Map/MapDataProvider.cs
@@ -23,14 +23,15 @@
 using Orts.MultiPlayer;
 using Orts.Simulation.Physics;
 using Orts.Simulation.Signalling;
+using Orts.Viewer3D.Debugging;
 
-namespace Orts.Viewer3D.Debugging
+namespace Orts.Viewer3D.Map
 {
     public class MapDataProvider
     {
-        public DispatchViewerBeta F { get; set; } // Shortest possible abbreviation so code is easier to read
+        public MapViewer F { get; set; } // Shortest possible abbreviation so code is easier to read
 
-        public MapDataProvider(DispatchViewerBeta form)
+        public MapDataProvider(MapViewer form)
         {
             F = form;
         }
@@ -92,7 +93,7 @@ public void PopulateItemLists()
                         {
                             var oldSiding = F.sidings[oldSidingIndex];
                             var oldLocation = oldSiding.Location;
-                            var newLocation = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z);
+                            var newLocation = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z);
 
                             // Because these are structs, not classes, compiler won't let you overwrite them.
                             // Instead create a single item which replaces the 2 platform items.
@@ -117,15 +118,15 @@ public void PopulateItemLists()
                         {
                             var newPlatform = new PlatformWidget(item as PlatformItem)
                             {
-                                Extent1 = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z)
+                                Extent1 = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z)
                             };
                             F.platforms.Add(newPlatform);
                         }
                         else
                         {
                             var oldPlatform = F.platforms[oldPlatformIndex];
                             var oldLocation = oldPlatform.Location;
-                            var newLocation = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z);
+                            var newLocation = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z);
 
                             // Because these are structs, not classes, compiler won't let you overwrite them.
                             // Instead create a single item which replaces the 2 platform items.
@@ -174,7 +175,7 @@ private PointF GetMidPoint(PointF location1, PointF location2)
 
         private PointF GetRightHandPoint(PointF location1, PointF location2)
         {
-            return (location1.X > location2.X) ? location1 : location2;
+            return location1.X > location2.X ? location1 : location2;
         }
 
         public void ShowSimulationTime()
@@ -203,9 +204,9 @@ public void FixForBadData(float width, ref PointF scaledA, ref PointF scaledB, P
         public bool IsActiveTrain(Simulation.AIs.AITrain t)
         {
             return t != null
-&& ((t.MovementState != Simulation.AIs.AITrain.AI_MOVEMENT_STATE.AI_STATIC
+&& (t.MovementState != Simulation.AIs.AITrain.AI_MOVEMENT_STATE.AI_STATIC
                         && !(t.TrainType == Train.TRAINTYPE.AI_INCORPORATED && !t.IncorporatingTrain.IsPathless)
-                    )
+                    
                     || t.TrainType == Train.TRAINTYPE.PLAYER);
         }
 
@@ -249,19 +250,19 @@ public float GetUnusedYLocation(float startX, float wantY, string name)
             const float noFreeSlotFound = -1f;
 
             var desiredPositionY = (int)(wantY / DispatchViewer.spacing);  // The positionY of the ideal row for the text.
-            var endX = startX + (name.Length * F.trainFont.Size);
+            var endX = startX + name.Length * F.trainFont.Size;
             //out of drawing area
             if (endX < 0)
                 return noFreeSlotFound;
 
-            int positionY = desiredPositionY;
+            var positionY = desiredPositionY;
             while (positionY >= 0 && positionY < F.alignedTextY.Length)
             {
                 //if the line contains no text yet, put it there
                 if (F.alignedTextNum[positionY] == 0)
                     return SaveLabelLocation(startX, endX, positionY);
 
-                bool conflict = false;
+                var conflict = false;
 
                 //check if it intersects with any labels already in this row
                 for (var col = 0; col < F.alignedTextNum[positionY]; col++)
diff --git a/Source/RunActivity/Viewer3D/Map/MapForm.Designer.cs b/Source/RunActivity/Viewer3D/Map/MapForm.Designer.cs
diff --git a/Source/RunActivity/Viewer3D/Map/MapForm.cs b/Source/RunActivity/Viewer3D/Map/MapForm.cs
@@ -13,13 +13,14 @@
 using Orts.Simulation.RollingStocks;
 using Orts.Simulation.Signalling;
 using Orts.Simulation.Timetables;
+using Orts.Viewer3D.Map;
 using Orts.Viewer3D.Popups;
 using ORTS.Common;
 using Color = System.Drawing.Color;
 
 namespace Orts.Viewer3D.Debugging
 {
-    public partial class DispatchViewerBeta : Form
+    public partial class MapViewer : Form
     {
         #region Variables
         /// <summary>
@@ -104,7 +105,7 @@ public partial class DispatchViewerBeta : Form
         private bool MapCustomizationVisible = false;
         #endregion
 
-        public DispatchViewerBeta(Simulator simulator, Viewer viewer)
+        public MapViewer(Simulator simulator, Viewer viewer)
         {
             InitializeComponent();
 
diff --git a/Source/RunActivity/Viewer3D/Map/MapForm.resx b/Source/RunActivity/Viewer3D/Map/MapForm.resx
diff --git a/Source/RunActivity/Viewer3D/Map/MapThemeProvider.cs b/Source/RunActivity/Viewer3D/Map/MapThemeProvider.cs
@@ -3,13 +3,13 @@
 using System.Linq;
 using System.Windows.Forms;
 
-namespace Orts.Viewer3D.Debugging
+namespace Orts.Viewer3D.Map
 {
     public class MapThemeProvider
     {
         public void InitializeThemes()
         {
-            ThemeStyle LightTheme = new ThemeStyle
+            var LightTheme = new ThemeStyle
             {
                 BackColor = Color.Transparent,
                 ForeColor = SystemColors.ControlText,
@@ -19,7 +19,7 @@ public void InitializeThemes()
                 TrackColor = Color.FromArgb(46, 64, 83),
             };
 
-            ThemeStyle DarkTheme = new ThemeStyle
+            var DarkTheme = new ThemeStyle
             {
                 BackColor = Color.FromArgb(44, 62, 80),
                 ForeColor = Color.FromArgb(247, 249, 249),
@@ -30,7 +30,7 @@ public void InitializeThemes()
             };
 
             // Reference for "solarized" themes: https://github.com/altercation/solarized?tab=readme-ov-file#the-values
-            ThemeStyle LightSolarizedTheme = new ThemeStyle
+            var LightSolarizedTheme = new ThemeStyle
             {
                 BackColor = Color.FromArgb(253, 246, 227),
                 ForeColor = Color.FromArgb(101, 123, 131),
@@ -40,7 +40,7 @@ public void InitializeThemes()
                 TrackColor = Color.FromArgb(88, 110, 117),
             };
 
-            ThemeStyle DarkSolarizedTheme = new ThemeStyle
+            var DarkSolarizedTheme = new ThemeStyle
             {
                 BackColor = Color.FromArgb(0, 43, 54),
                 ForeColor = Color.FromArgb(131, 148, 150),
@@ -60,7 +60,7 @@ public void InitializeThemes()
 
         public ThemeStyle GetTheme(string themeName)
         {
-            if (Themes.TryGetValue(themeName, out ThemeStyle theme))
+            if (Themes.TryGetValue(themeName, out var theme))
             {
                 return theme;
             }
diff --git a/Source/RunActivity/Viewer3D/Processes/GameStateViewer3D.cs b/Source/RunActivity/Viewer3D/Processes/GameStateViewer3D.cs
@@ -56,7 +56,7 @@ internal override void BeginRender(RenderFrame frame)
                 Program.DebugViewer.Hide();
                 Viewer.DebugViewerEnabled = false;
 
-                Program.DebugViewerBeta = new DispatchViewerBeta(Viewer.Simulator, Viewer);
+                Program.DebugViewerBeta = new MapViewer(Viewer.Simulator, Viewer);
                 Program.DebugViewerBeta.Hide();
                 Viewer.DebugViewerBetaEnabled = false;
 

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,15 @@`
`23`	`23`	`using Orts.MultiPlayer;`
`24`	`24`	`using Orts.Simulation.Physics;`
`25`	`25`	`using Orts.Simulation.Signalling;`
	`26`	`+using Orts.Viewer3D.Debugging;`
`26`	`27`
`27`		`-namespace Orts.Viewer3D.Debugging`
	`28`	`+namespace Orts.Viewer3D.Map`
`28`	`29`	`{`
`29`	`30`	`public class MapDataProvider`
`30`	`31`	`{`
`31`		`- public DispatchViewerBeta F { get; set; } // Shortest possible abbreviation so code is easier to read`
	`32`	`+ public MapViewer F { get; set; } // Shortest possible abbreviation so code is easier to read`
`32`	`33`
`33`		`- public MapDataProvider(DispatchViewerBeta form)`
	`34`	`+ public MapDataProvider(MapViewer form)`
`34`	`35`	`{`
`35`	`36`	`F = form;`
`36`	`37`	`}`
`@@ -92,7 +93,7 @@ public void PopulateItemLists()`
`92`	`93`	`{`
`93`	`94`	`var oldSiding = F.sidings[oldSidingIndex];`
`94`	`95`	`var oldLocation = oldSiding.Location;`
`95`		`- var newLocation = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z);`
	`96`	`+ var newLocation = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z);`
`96`	`97`
`97`	`98`	`// Because these are structs, not classes, compiler won't let you overwrite them.`
`98`	`99`	`// Instead create a single item which replaces the 2 platform items.`
`@@ -117,15 +118,15 @@ public void PopulateItemLists()`
`117`	`118`	`{`
`118`	`119`	`var newPlatform = new PlatformWidget(item as PlatformItem)`
`119`	`120`	`{`
`120`		`- Extent1 = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z)`
	`121`	`+ Extent1 = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z)`
`121`	`122`	`};`
`122`	`123`	`F.platforms.Add(newPlatform);`
`123`	`124`	`}`
`124`	`125`	`else`
`125`	`126`	`{`
`126`	`127`	`var oldPlatform = F.platforms[oldPlatformIndex];`
`127`	`128`	`var oldLocation = oldPlatform.Location;`
`128`		`- var newLocation = new PointF((item.TileX * 2048) + item.X, (item.TileZ * 2048) + item.Z);`
	`129`	`+ var newLocation = new PointF(item.TileX * 2048 + item.X, item.TileZ * 2048 + item.Z);`
`129`	`130`
`130`	`131`	`// Because these are structs, not classes, compiler won't let you overwrite them.`
`131`	`132`	`// Instead create a single item which replaces the 2 platform items.`
`@@ -174,7 +175,7 @@ private PointF GetMidPoint(PointF location1, PointF location2)`
`174`	`175`
`175`	`176`	`private PointF GetRightHandPoint(PointF location1, PointF location2)`
`176`	`177`	`{`
`177`		`- return (location1.X > location2.X) ? location1 : location2;`
	`178`	`+ return location1.X > location2.X ? location1 : location2;`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`public void ShowSimulationTime()`
`@@ -203,9 +204,9 @@ public void FixForBadData(float width, ref PointF scaledA, ref PointF scaledB, P`
`203`	`204`	`public bool IsActiveTrain(Simulation.AIs.AITrain t)`
`204`	`205`	`{`
`205`	`206`	`return t != null`
`206`		`-&& ((t.MovementState != Simulation.AIs.AITrain.AI_MOVEMENT_STATE.AI_STATIC`
	`207`	`+&& (t.MovementState != Simulation.AIs.AITrain.AI_MOVEMENT_STATE.AI_STATIC`
`207`	`208`	`&& !(t.TrainType == Train.TRAINTYPE.AI_INCORPORATED && !t.IncorporatingTrain.IsPathless)`
`208`		`- )`
	`209`	`+`
`209`	`210`	`\|\| t.TrainType == Train.TRAINTYPE.PLAYER);`
`210`	`211`	`}`
`211`	`212`
`@@ -249,19 +250,19 @@ public float GetUnusedYLocation(float startX, float wantY, string name)`
`249`	`250`	`const float noFreeSlotFound = -1f;`
`250`	`251`
`251`	`252`	`var desiredPositionY = (int)(wantY / DispatchViewer.spacing); // The positionY of the ideal row for the text.`
`252`		`- var endX = startX + (name.Length * F.trainFont.Size);`
	`253`	`+ var endX = startX + name.Length * F.trainFont.Size;`
`253`	`254`	`//out of drawing area`
`254`	`255`	`if (endX < 0)`
`255`	`256`	`return noFreeSlotFound;`
`256`	`257`
`257`		`- int positionY = desiredPositionY;`
	`258`	`+ var positionY = desiredPositionY;`
`258`	`259`	`while (positionY >= 0 && positionY < F.alignedTextY.Length)`
`259`	`260`	`{`
`260`	`261`	`//if the line contains no text yet, put it there`
`261`	`262`	`if (F.alignedTextNum[positionY] == 0)`
`262`	`263`	`return SaveLabelLocation(startX, endX, positionY);`
`263`	`264`
`264`		`- bool conflict = false;`
	`265`	`+ var conflict = false;`
`265`	`266`
`266`	`267`	`//check if it intersects with any labels already in this row`
`267`	`268`	`for (var col = 0; col < F.alignedTextNum[positionY]; col++)`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Windows.Forms;`
`5`	`5`
`6`		`-namespace Orts.Viewer3D.Debugging`
	`6`	`+namespace Orts.Viewer3D.Map`
`7`	`7`	`{`
`8`	`8`	`public class MapThemeProvider`
`9`	`9`	`{`
`10`	`10`	`public void InitializeThemes()`
`11`	`11`	`{`
`12`		`- ThemeStyle LightTheme = new ThemeStyle`
	`12`	`+ var LightTheme = new ThemeStyle`
`13`	`13`	`{`
`14`	`14`	`BackColor = Color.Transparent,`
`15`	`15`	`ForeColor = SystemColors.ControlText,`
`@@ -19,7 +19,7 @@ public void InitializeThemes()`
`19`	`19`	`TrackColor = Color.FromArgb(46, 64, 83),`
`20`	`20`	`};`
`21`	`21`
`22`		`- ThemeStyle DarkTheme = new ThemeStyle`
	`22`	`+ var DarkTheme = new ThemeStyle`
`23`	`23`	`{`
`24`	`24`	`BackColor = Color.FromArgb(44, 62, 80),`
`25`	`25`	`ForeColor = Color.FromArgb(247, 249, 249),`
`@@ -30,7 +30,7 @@ public void InitializeThemes()`
`30`	`30`	`};`
`31`	`31`
`32`	`32`	`// Reference for "solarized" themes: https://github.com/altercation/solarized?tab=readme-ov-file#the-values`
`33`		`- ThemeStyle LightSolarizedTheme = new ThemeStyle`
	`33`	`+ var LightSolarizedTheme = new ThemeStyle`
`34`	`34`	`{`
`35`	`35`	`BackColor = Color.FromArgb(253, 246, 227),`
`36`	`36`	`ForeColor = Color.FromArgb(101, 123, 131),`
`@@ -40,7 +40,7 @@ public void InitializeThemes()`
`40`	`40`	`TrackColor = Color.FromArgb(88, 110, 117),`
`41`	`41`	`};`
`42`	`42`
`43`		`- ThemeStyle DarkSolarizedTheme = new ThemeStyle`
	`43`	`+ var DarkSolarizedTheme = new ThemeStyle`
`44`	`44`	`{`
`45`	`45`	`BackColor = Color.FromArgb(0, 43, 54),`
`46`	`46`	`ForeColor = Color.FromArgb(131, 148, 150),`
`@@ -60,7 +60,7 @@ public void InitializeThemes()`
`60`	`60`
`61`	`61`	`public ThemeStyle GetTheme(string themeName)`
`62`	`62`	`{`
`63`		`- if (Themes.TryGetValue(themeName, out ThemeStyle theme))`
	`63`	`+ if (Themes.TryGetValue(themeName, out var theme))`
`64`	`64`	`{`
`65`	`65`	`return theme;`
`66`	`66`	`}`