Merge pull request ScottPlot#1736 from ScottPlot/1732-resetlayout

Axis: ResetLayout()
IntegerMan · Mar 19, 2022 · bbae257 · bbae257
2 parents 3581f8c + 0bfe83c
commit bbae257
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/src/ScottPlot4/ScottPlot.Tests/Colormap/ColormapTests.cs b/src/ScottPlot4/ScottPlot.Tests/Colormap/ColormapTests.cs
@@ -10,6 +10,24 @@ namespace ScottPlotTests.ColormapTests
 {
     class ColormapTests
     {
+        [Test]
+        public void Test_Colormap_LayoutCanBeReset()
+        {
+            var plt = new ScottPlot.Plot(400, 300);
+            plt.Style(figureBackground: System.Drawing.ColorTranslator.FromHtml("#dadada"));
+            var bmpOriginal = new MeanPixel(plt.GetBitmap());
+
+            var cb = plt.AddColorbar();
+            var bmpWithColorbar = new MeanPixel(plt.GetBitmap());
+
+            plt.Remove(cb);
+            plt.YAxis2.ResetLayout();
+            var bmpWithColorbarRemoved = new MeanPixel(plt.GetBitmap());
+
+            Assert.AreNotEqual(bmpOriginal, bmpWithColorbar);
+            Assert.AreEqual(bmpOriginal, bmpWithColorbarRemoved);
+        }
+
         [Test]
         public void Test_Colormap_MultipleRequests()
         {

diff --git a/src/ScottPlot4/ScottPlot/Plot/Plot.cs b/src/ScottPlot4/ScottPlot/Plot/Plot.cs
@@ -299,6 +299,15 @@ public void Style(
                 plottable.SetStyle(tick, axisLabel);
         }
 
+        /// <summary>
+        /// Reset axis padding to the default values for all axes
+        /// </summary>
+        public void ResetLayout()
+        {
+            foreach (var axis in settings.Axes)
+                axis.ResetLayout();
+        }
+
         #endregion
 
         #region renderable customization

diff --git a/src/ScottPlot4/ScottPlot/Renderable/Axis.cs b/src/ScottPlot4/ScottPlot/Renderable/Axis.cs
@@ -76,6 +76,16 @@ public Edge Edge
             return (AxisLabel, AxisTicks, AxisLine);
         }
 
+        /// <summary>
+        /// Reset axis padding to the default values
+        /// </summary>
+        public void ResetLayout()
+        {
+            PixelSizeMinimum = 5;
+            PixelSizeMaximum = float.PositiveInfinity;
+            PixelSizePadding = 3;
+        }
+
         /// <summary>
         /// Define the minimum and maximum limits for the pixel size of this axis
         /// </summary>
@@ -95,9 +105,10 @@ public void SetSizeLimit(float? min = null, float? max = null, float? pad = null
         private float PixelSize; // how large this axis is
         private float PixelOffset; // distance from the data area
         private bool Collapsed = false; // true if axes are hidden
-        private float PixelSizeMinimum = 5;
-        private float PixelSizeMaximum = float.PositiveInfinity;
-        private float PixelSizePadding = 3;
+
+        private float PixelSizeMinimum = 5; // also defined in ResetLayout()
+        private float PixelSizeMaximum = float.PositiveInfinity; // also defined in ResetLayout()
+        private float PixelSizePadding = 3; // also defined in ResetLayout()
 
         /// <summary>
         /// Define how many pixels away from the data area this axis will be.

diff --git a/src/ScottPlot4/changelog.md b/src/ScottPlot4/changelog.md
@@ -4,6 +4,7 @@
 _In development / not yet on NuGet ..._
 * Eto.Forms: Improved handling of events (#1719, #1718) _Thanks @rafntor and @VPKSoft_
 * Axis: Allow grid line and tick mark pixel snapping to be disabled (#1721, #1722) _Thanks @Xerxes004_
+* Axis: `ResetLayout()` sets padding to original values to reverse changes made by adding colorbars (#1732, #1736) _Thanks @ccopsey_
 
 ## ScottPlot 4.1.34
 _Published on [NuGet](https://www.nuget.org/packages?q=scottplot) on 2022-03-03_