resize map according to window size

Author: mhwlng

Elite/Elite.csproj

@@ -239,6 +239,12 @@
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
     <Resource Include="Hourglass.ico" />
+    <Content Include="Templates\images\galaxyL.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\images\galaxyP.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Templates\images\powers\Aisling Duval.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -353,9 +359,6 @@
     <Content Include="Templates\images\init.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Templates\images\galaxy.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Templates\images\ships\Keelback.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

Elite/FipPanel.cs

@@ -135,7 +135,7 @@ internal class FipPanel
         private int[] _currentZoomLevel = new int[100];
 
 
-        private int _currentLcdyOffset;
+        private int _currentLcdYOffset;
         private int _currentLcdHeight;
 
         public IntPtr FipDevicePointer;
@@ -167,6 +167,32 @@ internal class FipPanel
 
         private double ScrollBarHeight => _htmlWindowHeight -7.0;
 
+        private int GalaxyImageDisplayWidth => _htmlWindowWidth - 10;
+
+        private int GalaxyImageDisplayHeight
+        {
+            get
+            {
+                double aspectRatio;
+
+                if (_htmlWindowWidth >= _htmlWindowHeight)
+                {
+                    aspectRatio = History.GalaxyImageLHeight / History.GalaxyImageLWidth;
+                }
+                else
+                {
+                    aspectRatio = History.GalaxyImagePHeight / History.GalaxyImagePWidth;
+                }
+
+                return (int)(GalaxyImageDisplayWidth * aspectRatio);
+
+            }
+        }
+
+        private string GalaxyImageFileName => _htmlWindowWidth >= _htmlWindowHeight ? "galaxyl.png" : "galaxyp.png";
+
+        private int GalaxyImageMarginTop => (int)((_htmlWindowHeight - GalaxyImageDisplayHeight) / 2.0);
+
         private DirectOutputClass.PageCallback _pageCallbackDelegate;
         private DirectOutputClass.SoftButtonCallback _softButtonCallbackDelegate;
 
@@ -307,7 +333,7 @@ private bool SetTab(LcdTab tab)
 
                 _currentTabCursor = LcdTab.None;
 
-                _currentLcdyOffset = 0;
+                _currentLcdYOffset = 0;
 
                 File.WriteAllText(_settingsPath, ((int)_currentTab).ToString());
             }
@@ -618,7 +644,7 @@ private void SoftButtonCallback(IntPtr device, IntPtr buttons, IntPtr context)
 
                             _currentCard[(int) _currentTab]++;
                             _currentZoomLevel[(int) _currentTab]++;
-                            _currentLcdyOffset = 0;
+                            _currentLcdYOffset = 0;
 
                             mustRefresh = true;
                         }
@@ -632,16 +658,16 @@ private void SoftButtonCallback(IntPtr device, IntPtr buttons, IntPtr context)
                         {
                             _currentCard[(int) _currentTab]--;
                             _currentZoomLevel[(int) _currentTab]--;
-                            _currentLcdyOffset = 0;
+                            _currentLcdYOffset = 0;
 
                             mustRefresh = true;
                         }
 
                         break;
                     case 2: // scroll clockwise
-                        if (state)
+                        if (state && _currentTab != LcdTab.Map)
                         {
-                            _currentLcdyOffset += 50;
+                            _currentLcdYOffset += 50;
 
                             mustRender = false;
 
@@ -651,14 +677,14 @@ private void SoftButtonCallback(IntPtr device, IntPtr buttons, IntPtr context)
                         break;
                     case 4: // scroll anti-clockwise
 
-                        if (_currentLcdyOffset == 0) return;
+                        if (_currentLcdYOffset == 0) return;
 
-                        if (state)
+                        if (state && _currentTab != LcdTab.Map)
                         {
-                            _currentLcdyOffset -= 50;
-                            if (_currentLcdyOffset < 0)
+                            _currentLcdYOffset -= 50;
+                            if (_currentLcdYOffset < 0)
                             {
-                                _currentLcdyOffset = 0;
+                                _currentLcdYOffset = 0;
                             }
 
                             mustRender = false;
@@ -825,15 +851,15 @@ private void CheckLcdOffset()
         {
             if (_currentLcdHeight <= _htmlWindowHeight)
             {
-                _currentLcdyOffset = 0;
+                _currentLcdYOffset = 0;
             }
 
-            if (_currentLcdyOffset + _htmlWindowHeight > _currentLcdHeight )
+            if (_currentLcdYOffset + _htmlWindowHeight > _currentLcdHeight )
             {
-                _currentLcdyOffset = _currentLcdHeight - _htmlWindowHeight + 4;
+                _currentLcdYOffset = _currentLcdHeight - _htmlWindowHeight + 4;
             }
 
-            if (_currentLcdyOffset < 0) _currentLcdyOffset = 0;
+            if (_currentLcdYOffset < 0) _currentLcdYOffset = 0;
         }
 
         private ReturnValues AddPage(uint pageNumber, bool setActive)
@@ -909,9 +935,16 @@ private void OnImageLoad(object sender, HtmlImageLoadEventArgs e)
 
                 using (var graphics = Graphics.FromImage(image))
                 {
-                    if (e.Src.ToLower() == "galaxy.png" && _currentTab == LcdTab.Map)
+                    if (e.Src.ToLower().StartsWith("galaxy") && _currentTab == LcdTab.Map)
                     {
-                        graphics.DrawPolygon(_whitePen, History.TravelHistoryPoints.ToArray());
+                        if (e.Src.ToLower().StartsWith("galaxyl"))
+                        {
+                            graphics.DrawPolygon(_whitePen, History.TravelHistoryPointsL.ToArray());
+                        }
+                        else
+                        {
+                            graphics.DrawPolygon(_whitePen, History.TravelHistoryPointsP.ToArray());
+                        }
 
                         var zoomLevel = _currentZoomLevel[(int)_currentTab] / 2.0 + 1;
 
@@ -929,8 +962,19 @@ private void OnImageLoad(object sender, HtmlImageLoadEventArgs e)
                             var spaceX = Data.LocationData.StarPos[0];
                             var spaceZ = Data.LocationData.StarPos[2];
 
-                            var imgX = (spaceX - History.SpaceMinX) / (History.SpaceMaxX - History.SpaceMinX) * image.Width;
-                            var imgY = (History.SpaceMaxZ - spaceZ) / (History.SpaceMaxZ - History.SpaceMinZ) * image.Height;
+                            var imgX = 0.0;
+                            var imgY = 0.0;
+
+                            if (e.Src.ToLower().StartsWith("galaxyl"))
+                            {
+                                imgX = (spaceX - History.SpaceMinXL) / (History.SpaceMaxXL - History.SpaceMinXL) * image.Width;
+                                imgY = (History.SpaceMaxZL - spaceZ) / (History.SpaceMaxZL - History.SpaceMinZL) * image.Height;
+                            }
+                            else
+                            {
+                                imgX = (spaceX - History.SpaceMinXP) / (History.SpaceMaxXP - History.SpaceMinXP) * image.Width;
+                                imgY = (History.SpaceMaxZP - spaceZ) / (History.SpaceMaxZP - History.SpaceMinZP) * image.Height;
+                            }
 
                             imgX -= markerWidth / 2.0;
                             imgY -= markerHeight / 2.0;
@@ -1388,6 +1432,10 @@ public void RefreshDevicePage(bool mustRender = true)
                                             {
                                                 CurrentTab = _currentTab,
                                                 CurrentPage = _currentPage,
+                                                GalaxyImageDisplayHeight = GalaxyImageDisplayHeight,
+                                                GalaxyImageDisplayWidth = GalaxyImageDisplayWidth,
+                                                GalaxyImageMarginTop = GalaxyImageMarginTop + "px",
+                                                GalaxyImageFileName = GalaxyImageFileName,
 
                                                 _currentZoomLevel = _currentZoomLevel[(int) _currentTab]
 
@@ -1562,16 +1610,16 @@ public void RefreshDevicePage(bool mustRender = true)
                                 {
                                     graphics.DrawImage(_htmlImage, new Rectangle(new Point(HtmlWindowXOffset, 0),
                                             new Size(HtmlWindowUsableWidth, _htmlWindowHeight + 20)),
-                                        new Rectangle(new Point(0, _currentLcdyOffset),
+                                        new Rectangle(new Point(0, _currentLcdYOffset),
                                             new Size(HtmlWindowUsableWidth, _htmlWindowHeight + 20)),
                                         GraphicsUnit.Pixel);
                                 }
                             }
 
-                            if (_currentLcdHeight > _htmlWindowHeight)
+                            if (_currentLcdHeight > _htmlWindowHeight && _currentTab != LcdTab.Map)
                             {
                                 var scrollThumbHeight = _htmlWindowHeight / (double)_currentLcdHeight * ScrollBarHeight;
-                                var scrollThumbYOffset = _currentLcdyOffset / (double)_currentLcdHeight * ScrollBarHeight;
+                                var scrollThumbYOffset = _currentLcdYOffset / (double)_currentLcdHeight * ScrollBarHeight;
 
                                 graphics.DrawRectangle(_scrollPen, new Rectangle(new Point(_htmlWindowWidth - 9, 2),
                                                                    new Size(5, (int)ScrollBarHeight)));

Elite/History.cs

@@ -11,18 +11,28 @@ namespace Elite
 {
     public static class History
     {
-        public const double SpaceMinX = -41715.0;
-        public const double SpaceMaxX = 41205.0;
-        public const double SpaceMinZ = -19737.0;
-        public const double SpaceMaxZ = 68073.0;
+        // 1478 x 1125
+
+        public const double SpaceMinXL = -41715.0;
+        public const double SpaceMaxXL = 41205.0;
+        public const double SpaceMinZL = -19737.0;
+        public const double SpaceMaxZL = 68073.0;
+
+        // 1125 x 1478
+
+        public const double SpaceMinXP = -31812.8;
+        public const double SpaceMaxXP = 31302.85;
+        public const double SpaceMinZP = -33513.4;
+        public const double SpaceMaxZP = 81849.41;
 
         public class FSDJumpInfo
         {
             public string StarSystem { get; set; }
             public List<double> StarPos { get; set; }
         }
 
-        public static List<PointF> TravelHistoryPoints = new List<PointF>();
+        public static List<PointF> TravelHistoryPointsL = new List<PointF>();
+        public static List<PointF> TravelHistoryPointsP = new List<PointF>();
 
         public class LocationInfo
 
@@ -47,8 +57,10 @@ public class DockedInfo
 
         public static Dictionary<string, List<double>> VisitedSystemList = new Dictionary<string, List<double>>();
 
-        private static double ImageWidth { get; set; }
-        private static double ImageHeight { get; set; }
+        public static double GalaxyImageLWidth { get; set; }
+        public static double GalaxyImageLHeight { get; set; }
+        public static double GalaxyImagePWidth { get; set; }
+        public static double GalaxyImagePHeight { get; set; }
 
         private class UnsafeNativeMethods
         {
@@ -94,14 +106,23 @@ public static void AddTravelPos(List<double> starPos)
                 var y = starPos[1];
                 var z = starPos[2];
 
-                var imgX = (x - SpaceMinX) / (SpaceMaxX - SpaceMinX) * ImageWidth;
-                var imgY = (SpaceMaxZ - z) / (SpaceMaxZ - SpaceMinZ) * ImageHeight;
+                var imgX = (x - SpaceMinXL) / (SpaceMaxXL - SpaceMinXL) * GalaxyImageLWidth;
+                var imgY = (SpaceMaxZL - z) / (SpaceMaxZL - SpaceMinZL) * GalaxyImageLHeight;
 
-                TravelHistoryPoints.Add(new PointF
+                TravelHistoryPointsL.Add(new PointF
                 {
                     X = (float) imgX,
                     Y = (float) imgY
                 });
+
+                imgX = (x - SpaceMinXP) / (SpaceMaxXP - SpaceMinXP) * GalaxyImagePWidth;
+                imgY = (SpaceMaxZP - z) / (SpaceMaxZP - SpaceMinZP) * GalaxyImagePHeight;
+
+                TravelHistoryPointsP.Add(new PointF
+                {
+                    X = (float)imgX,
+                    Y = (float)imgY
+                });
             }
         }
 
@@ -118,9 +139,13 @@ public static string GetEliteHistory()
 
             try
             {
-                var image = Image.FromFile(Path.Combine(App.ExePath, "Templates\\images\\galaxy.png"));
-                ImageWidth = image.Width;
-                ImageHeight = image.Height;
+                var imageL = Image.FromFile(Path.Combine(App.ExePath, "Templates\\images\\galaxyL.png"));
+                GalaxyImageLWidth = imageL.Width;
+                GalaxyImageLHeight = imageL.Height;
+
+                var imageP = Image.FromFile(Path.Combine(App.ExePath, "Templates\\images\\galaxyP.png"));
+                GalaxyImagePWidth = imageP.Width;
+                GalaxyImagePHeight = imageP.Height;
 
                 var journalFiles = journalDirectory.GetFiles("Journal.*").OrderBy(x => x.LastWriteTime);
 

Elite/NotifyIconResources.xaml

@@ -9,7 +9,7 @@
         reuse the same context menu (which is a resource) again (which will have its DataContext set to the old TaskbarIcon)
   -->
     <ContextMenu x:Shared="false" x:Key="SysTrayMenu">
-        <MenuItem Name="ToggleWindowMenuItem" Header="Toggle Mirror Window" Command="{Binding ToggleWindowCommand}"  />
+        <MenuItem Name="ToggleWindowMenuItem" Header="Toggle Window" Command="{Binding ToggleWindowCommand}"  />
         <Separator />
         <MenuItem Header="Exit" Command="{Binding ExitApplicationCommand}" />
     </ContextMenu>

Elite/Templates/images/galaxy.png

@@ -2,6 +2,6 @@
     Layout = "layout.cshtml";
 }
 
-<div class="main">
-    <div class="imgcenter"><img src="galaxy.png" width="310" height="236" /></div>
+<div class="main" style="margin-top:@Model.GalaxyImageMarginTop">
+    <div class="imgcenter"><img src="@Model.GalaxyImageFileName" width="@Model.GalaxyImageDisplayWidth" height="@Model.GalaxyImageDisplayHeight" /></div>
 </div>

Elite/Templates/images/galaxyL.png

@@ -35,7 +35,7 @@ The joystick is configured via joysticksettings.config
 </joystickSettings>
 ```
 
-There is a Toggle Mirror Window menu option in the tray icon context menu.
+There is a Toggle Window menu option in the tray icon context menu.
 This option mirrors the FIP display, that is being controlled by the HOTAS hat switch, to a window for use in VR.
 
 If FipSerialNumber in joysticksettings.config has the special value "window", then a separate window is created,