ChrisCC6 · Dec 6, 2022 · Dec 6, 2022 · Dec 6, 2022 · Dec 6, 2022 · Dec 7, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 ## Unreleased
 
 ### Added
-
+- Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (#1949)
 ### Changed
 
 ### Removed

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -28,6 +28,7 @@ Carlos Anderson <carlosjanderson@gmail.com>
 Carlos Teixeira <karlmtc@gmail.com>
 Chase Long <chaselfromal@gmail.com>
 Choden Konigsmark <choden.konigsmark@gmail.com>
+ChrisCC6 <christian.woempner@gmail.com>
 classicboss302
 csabar <rumancsabi@gmail.com>
 Curt Mullin <curt.mullin@gmail.com>

diff --git a/Source/Examples/ExampleLibrary/Axes/AxisAreaExample.cs b/Source/Examples/ExampleLibrary/Axes/AxisAreaExample.cs
@@ -0,0 +1,158 @@
+using OxyPlot;
+using OxyPlot.Axes;
+using OxyPlot.Series;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ExampleLibrary.Axes
+{
+    [Examples("AxisArea"), Tags("Axes")]
+    public class AxisAreaExample
+    {
+        [Example("AxisArea LinearAxis")]
+        public static PlotModel AxisAreaLinearAxis()
+        {
+            var model = GetLinearAxisPlotModel();
+            model.Annotations.Add(new RenderingCapabilities.DelegateAnnotation(context =>
+            {
+                foreach (var axis in model.Axes)
+                {
+                    context.DrawRectangle((OxyRect)axis.AxisArea, OxyColors.Undefined, OxyColor.FromAColor(128, OxyColors.Red), 1, EdgeRenderingMode.Automatic);
+                    context.DrawRectangle((OxyRect)axis.TitleArea, OxyColors.Undefined, OxyColor.FromAColor(128, OxyColors.Green), 1, EdgeRenderingMode.Automatic);
+                    context.DrawRectangle((OxyRect)axis.AxisLineArea, OxyColors.Undefined, OxyColor.FromAColor(128, OxyColors.Blue), 1, EdgeRenderingMode.Automatic);
+                }
+            }));
+            // Subscribe to the mouse down event on the line series
+            model.MouseDown += (s, e) =>
+            {
+                ResetAxesFormat(model);
+                if (e.ChangedButton == OxyMouseButton.Left)
+                {
+                    if (model.Axes.SingleOrDefault(axis => axis.TitleArea.Contains(e.Position.X, e.Position.Y)) is Axis clickedAxis1)
+                    {
+                        clickedAxis1.TitleFontWeight = 800;
+                        clickedAxis1.TitleColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                    }
+                    else if (model.Axes.SingleOrDefault(axis => axis.AxisLineArea.Contains(e.Position.X, e.Position.Y)) is Axis clickedAxis2)
+                    {
+                        clickedAxis2.FontWeight = 800;
+                        clickedAxis2.TextColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                    }
+                    else if (model.Axes.SingleOrDefault(axis => axis.AxisArea.Contains(e.Position.X, e.Position.Y)) is Axis clickedAxis3)
+                    {
+                        clickedAxis3.FontWeight = 800;
+                        clickedAxis3.TitleFontWeight = 800;
+                        clickedAxis3.TitleColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                        clickedAxis3.TextColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                    }
+                }
+                model.InvalidatePlot(false);
+            };
+            return model;
+        }
+
+        [Example("AxisArea AngleAxis")]
+        public static PlotModel AxisAreaAngleAxis()
+        {
+            var model = GetAngleAxisPlotModel();
+            model.Annotations.Add(new RenderingCapabilities.DelegateAnnotation(context =>
+            {
+                context.DrawRectangle((OxyRect)model.Axes[1].AxisArea, OxyColors.Undefined, OxyColor.FromAColor(255, OxyColors.Red), 1, EdgeRenderingMode.Automatic);
+                var annulus = (OxyAnnulus)model.Axes[0].AxisArea;
+                context.DrawCircle(annulus.Center, annulus.InnerRadius, OxyColors.Undefined, OxyColor.FromAColor(255, OxyColors.Blue), 1, EdgeRenderingMode.Automatic);
+                context.DrawCircle(annulus.Center, annulus.OuterRadius, OxyColors.Undefined, OxyColor.FromAColor(255, OxyColors.Blue), 1, EdgeRenderingMode.Automatic);
+            }));
+                // Subscribe to the mouse down event on the line series
+            model.MouseDown += (s, e) =>
+            {
+                ResetAxesFormat(model);
+                if (e.ChangedButton == OxyMouseButton.Left)
+                {
+                    if (model.Axes.SingleOrDefault(axis => axis.TitleArea.Contains(e.Position.X, e.Position.Y)) is Axis clickedAxis1)
+                    {
+                        clickedAxis1.TitleFontWeight = 800;
+                        clickedAxis1.TitleColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                    }
+                    else if (model.Axes.SingleOrDefault(axis => axis.AxisLineArea.Contains(e.Position.X, e.Position.Y)) is Axis clickedAxis2)
+                    {
+                        clickedAxis2.FontWeight = 800;
+                        clickedAxis2.TextColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                    }
+                    else if (model.Axes.SingleOrDefault(axis => axis.AxisArea.Contains(e.Position.X, e.Position.Y)) is Axis clickedAxis3)
+                    {
+                        clickedAxis3.FontWeight = 800;
+                        clickedAxis3.TitleFontWeight = 800;
+                        clickedAxis3.TitleColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                        clickedAxis3.TextColor = OxyColor.FromAColor(255, OxyColors.Purple);
+                    }
+                }
+                model.InvalidatePlot(false);
+            };
+            return model;
+        }
+
+        private static void ResetAxesFormat(PlotModel model)
+        {
+            foreach (var axis in model.Axes)
+            {
+                axis.TitleFontWeight = 400;
+                axis.FontWeight = 400;
+                axis.TitleColor = OxyColor.FromAColor(255, OxyColors.Black);
+                axis.TextColor = OxyColor.FromAColor(255, OxyColors.Black);
+            }
+        }
+
+        private static PlotModel GetLinearAxisPlotModel()
+        {
+            var model = new PlotModel();
+            model.Axes.Add(new LinearAxis { Maximum = 36, Minimum = 0, Title = "km/h" });
+            model.Axes.Add(new LinearAxis { Maximum = 10, Minimum = 0, Position = AxisPosition.Right, Title = "m/s" });
+            model.Axes.Add(new LinearAxis
+            {
+                Maximum = 10,
+                Minimum = 0,
+                Position = AxisPosition.Bottom,
+                Title = "meter"
+            });
+            model.Axes.Add(new LinearAxis
+            {
+                Maximum = 10000,
+                Minimum = 0,
+                Position = AxisPosition.Top,
+                Title = "millimeter"
+            });
+            return model;
+        }
+
+        private static PlotModel GetAngleAxisPlotModel()
+        {
+            var model = new PlotModel
+            {
+                PlotType = PlotType.Polar,
+                PlotAreaBorderThickness = new OxyThickness(0),
+            };
+            model.Axes.Add(
+                new AngleAxis
+                {
+                    MajorStep = Math.PI / 4,
+                    MinorStep = Math.PI / 16,
+                    MajorGridlineStyle = LineStyle.Solid,
+                    MinorGridlineStyle = LineStyle.Solid,
+                    FormatAsFractions = true,
+                    FractionUnit = Math.PI,
+                    FractionUnitSymbol = "π",
+                    Minimum = 0,
+                    Maximum = 2 * Math.PI
+                });
+            model.Axes.Add(new MagnitudeAxis
+            {
+                MajorGridlineStyle = LineStyle.Solid,
+                MinorGridlineStyle = LineStyle.Solid,
+            });
+            model.Series.Add(new FunctionSeries(t => t, t => t, 0, Math.PI * 6, 0.01));
+            return model;
+        }
+    }
+}
diff --git a/Source/Examples/WPF/WpfExamples/App.xaml b/Source/Examples/WPF/WpfExamples/App.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="WpfExamples.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Examples/AxisAreaDemo/MainWindow.xaml">
     <Application.Resources>
 
     </Application.Resources>

diff --git a/Source/OxyPlot/Axes/Axis.cs b/Source/OxyPlot/Axes/Axis.cs
@@ -133,6 +133,10 @@ protected Axis()
 
             this.DataMaximum = double.NaN;
             this.DataMinimum = double.NaN;
+
+            this.TitleArea = new EmptyShape();
+            this.AxisArea = new EmptyShape();
+            this.AxisLineArea = new EmptyShape();
         }
 
         /// <summary>
@@ -634,6 +638,21 @@ public double Scale
         /// </summary>
         public OxyThickness DesiredMargin { get; protected set; }
 
+        /// <summary>
+        /// The area of the axis in screen coordinates.
+        /// </summary>
+        public IOxyRegion AxisArea { get; internal protected set; }
+
+        /// <summary>
+        /// The area of the axis line in screen coordinates.
+        /// </summary>
+        public IOxyRegion AxisLineArea { get; internal protected set; }
+
+        /// <summary>
+        /// The area of the axis title in screen coordinates.
+        /// </summary>
+        public IOxyRegion TitleArea { get; internal protected set; }
+
         /// <summary>
         /// Gets or sets the position tier max shift.
         /// </summary>

diff --git a/Source/OxyPlot/Axes/Rendering/AngleAxisRenderer.cs b/Source/OxyPlot/Axes/Rendering/AngleAxisRenderer.cs
@@ -51,13 +51,18 @@ public override void Render(Axis axis, int pass)
 
             var axisLength = Math.Abs(scaledEndAngle - scaledStartAngle);
             var eps = axis.MinorStep * 1e-3;
+
+            ScreenPoint? innerTangentPoint = null;
+            double maxTextLength = double.MinValue;
+
             if (this.MinorPen != null)
             {
                 var tickCount = Math.Abs((int)(axisLength / axis.ActualMinorStep));
                 var screenPoints = this.MinorTickValues
                     .Take(tickCount + 1)
                     .Select(x => magnitudeAxis.Transform(magnitudeAxis.ClipMaximum, x, axis));
 
+                innerTangentPoint = screenPoints.FirstOrDefault();
                 foreach (var screenPoint in screenPoints)
                 {
                     this.RenderContext.DrawLine(magnitudeAxis.MidPoint.x, magnitudeAxis.MidPoint.y, screenPoint.x, screenPoint.y, this.MinorPen, axis.EdgeRenderingMode);
@@ -77,6 +82,8 @@ public override void Render(Axis axis, int pass)
                     .Take(majorTickCount)
                     .Select(x => magnitudeAxis.Transform(magnitudeAxis.ClipMaximum, x, axis));
 
+                if (innerTangentPoint == null && screenPoints.Count() > 0)
+                    innerTangentPoint = screenPoints.FirstOrDefault();
                 foreach (var point in screenPoints)
                 {
                     this.RenderContext.DrawLine(magnitudeAxis.MidPoint.x, magnitudeAxis.MidPoint.y, point.x, point.y, this.MajorPen, axis.EdgeRenderingMode);
@@ -112,9 +119,26 @@ public override void Render(Axis axis, int pass)
                     ha = HorizontalAlignment.Right;
                 }
 
+                maxTextLength = Math.Max(maxTextLength, this.RenderContext.MeasureText(text).Width);
+
                 this.RenderContext.DrawMathText(
                     pt, text, axis.ActualTextColor, axis.ActualFont, axis.ActualFontSize, axis.ActualFontWeight, angle, ha, va);
             }
+
+            if (innerTangentPoint != null)
+            {
+                double r1 = magnitudeAxis.MidPoint.DistanceTo(innerTangentPoint.Value);
+                double r2 = r1 + maxTextLength + axis.AxisTickToLabelDistance;
+                if (r2 < 5)
+                    r2 = r1 + 5;
+                axis.AxisLineArea = new OxyAnnulus(magnitudeAxis.MidPoint, r1, r2);
+                axis.AxisArea = new OxyAnnulus(magnitudeAxis.MidPoint, r1, r2);
+            }
+            else
+            {
+                axis.AxisLineArea = new EmptyShape();
+                axis.AxisArea = new EmptyShape();
+            }
         }
     }
 }