Fixed GoldenSpiralZoomed / FibonacciRectanglesZoomed grid creating in case of rotated grid

Author: apdevelop

Src/ScreenGrid.Models/Grids/GridCreator.cs

@@ -80,8 +80,9 @@ public static Point TransformPoint(
         /// <param name="gridType">Selected type of grid</param>
         /// <param name="width">Width of output image</param>
         /// <param name="height">Height of output image</param>
+        /// <param name="isRotated">Output grid is rotated (width swapped with height)</param>
         /// <returns>List of lines</returns>
-        public static IEnumerable<Line> CreateGrid(GridType gridType, double width, double height)
+        public static IEnumerable<Line> CreateGrid(GridType gridType, double width, double height, bool isRotated)
         {
             switch (gridType)
             {
@@ -256,7 +257,8 @@ public static IEnumerable<Line> CreateGrid(GridType gridType, double width, doub
 
                         if (gridType == GridType.FibonacciRectanglesZoomed)
                         {
-                            lines = StretchToRectangleWithAspectRatio(lines, width, height, left, right, top, bottom);
+                            var aspect = (isRotated) ? (height / width) : (width / height);
+                            lines = StretchToRectangleWithAspectRatio(lines, aspect, left, right, top, bottom);
                         }
                         else if (gridType == GridType.FibonacciRectanglesStretched)
                         {
@@ -341,11 +343,11 @@ public static IEnumerable<Line> CreateGrid(GridType gridType, double width, doub
 
                         if (gridType == GridType.GoldenSpiralZoomed)
                         {
-                            lines = StretchToRectangleWithAspectRatio(lines, width, height, minX, maxX, minY, maxY);
+                            var aspect = (isRotated) ? (height / width) : (width / height);
+                            lines = StretchToRectangleWithAspectRatio(lines, aspect, minX, maxX, minY, maxY);
 
                             // Adding extents lines
                             var extents = GetExtents(lines);
-                            var aspect = (width / height);
                             if (aspect < RatioConstants.Phi)
                             {
                                 lines.Add(new Line(RatioConstants.Zero, extents.Top, RatioConstants.One, extents.Top));
@@ -375,10 +377,8 @@ public static IEnumerable<Line> CreateGrid(GridType gridType, double width, doub
             }
         }
 
-        private static List<Line> StretchToRectangleWithAspectRatio(List<Line> lines, double width, double height, double left, double right, double top, double bottom)
+        private static List<Line> StretchToRectangleWithAspectRatio(List<Line> lines, double aspect, double left, double right, double top, double bottom)
         {
-            var aspect = (width / height);
-
             if (aspect < RatioConstants.Phi)
             {
                 lines = StretchToRectangle(1.0, (RatioConstants.Phi - 1.0) * aspect, lines, left, top, right, bottom);

Src/ScreenGrid.ViewModels/ScreenGridViewModel.cs

@@ -259,7 +259,8 @@ public void UpdateContentControl()
             this.contentControl.Children.Clear();
 
             // TODO: place calculated results in cache
-            var gridLines = GridCreator.CreateGrid(this.gridMode, this.RenderWidth, this.RenderHeight);
+            var isRotated = ((this.Rot == Rotation.R90) || (this.Rot == Rotation.R270));
+            var gridLines = GridCreator.CreateGrid(this.gridMode, this.RenderWidth, this.RenderHeight, isRotated);
 
             var lines = GridCreator.Transform(gridLines, this.rotation, this.isFlippedHorizontal, this.isFlippedVertical, this.RenderWidth, this.RenderHeight);
             for (var i = 0; i < lines.Length; i++)