Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (… #1966

ChrisCC6 · 2022-12-06T08:33:48Z

Fixes #1949 .

Checklist

I have included examples or tests
I have updated the change log
I am listed in the CONTRIBUTORS file
I have cleaned up the commit history (use rebase and squash)

Changes proposed in this pull request:

Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (Axis area and the axis title area property in axis class #1949)
Implement setting added area properties in axis renderer classes HorizontalAndVerticalAxisRenderer, AngleAxisRenderer and MagnitudeAxisRenderer
Add OxyCircle and OxyAnnulus class
Add IShape interface for OxyRect, OxyCircle and OxyAnnulus
Add Union function to OxyRect class

@oxyplot/admins

…xyplot#1949)

VisualMelon

Not a complete review, just found a few minutes to take a look.

Source/OxyPlot/Rendering/OxyCircle.cs

Source/OxyPlot/Rendering/OxyAnnulus.cs

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

Source/OxyPlot/Rendering/OxyCircle.cs

Source/OxyPlot/Rendering/IShape.cs

Source/OxyPlot/Axes/Rendering/MagnitudeAxisRenderer.cs

VisualMelon · 2022-12-07T14:45:47Z

Thanks for updating: I'll try to review everything again soon.

Source/OxyPlot/Rendering/EmptyShape.cs

Source/OxyPlot/Rendering/OxyAnnulus.cs

Source/OxyPlot/Rendering/OxyCircle.cs

Source/OxyPlot/Axes/Axis.cs

Source/OxyPlot/Rendering/OxyAnnulus.cs

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

VisualMelon · 2022-12-07T17:49:28Z

This is looking good now (few typos, but otherwise public API looks nice), and provides a nice foundation we can build on in future (can imagine providing regions/areas (maybe that implies some name changes) for other elements).... but I'm not sure for what purposes at the minute.

I'm struggling to think of a nice simple example we can include in the example library to help demonstrate this functionality... it is obviously useful for your custom interaction example, but as it can't be a substitute for the terrifying PlotModel.GetAxes implementation as I was originally thinking, and the event system is deprecated, I think we're going to struggle to find a use that fits in with the generally supported scenarios in the library.

Suggestions very welcome.

Location information is useful for user interaction, and for positioning other UI elements, e.g. custom annotations.

ChrisCC6 · 2022-12-08T09:41:03Z

I'm struggling to think of a nice simple example we can include in the example library to help demonstrate this functionality... it is obviously useful for your custom interaction example, but as it can't be a substitute for the terrifying PlotModel.GetAxes implementation as I was originally thinking, and the event system is deprecated, I think we're going to struggle to find a use that fits in with the generally supported scenarios in the library.

Suggestions very welcome.

Location information is useful for user interaction, and for positioning other UI elements, e.g. custom annotations.

Need to find some time, but I'll try to create an example for this. Maybe like I use it (maybe not that simple):
I use wrapper classes around axes, series and annotations, overwriting the Render method to draw a dotted border depending on a bool IsSelected property.
Also a custom implementation for MouseManipulator. Here I check if one area contains the MouseUpPosition, set the IsSelected = true and request a new rendering. At the same time I send a message to notify a parent class representing a analyze that the selected object is changed. A public property for the selected item (my wrapper classes) is bound to my ribbon toolbar. This is how I make the plot and all elements editable via controls to have adaptable for the user on runtime.
Example for selected text:

I hope you can follow my thoughts. For an example, I'll try to strip it down to some basic functionality.

…beeing strictly immutable.

VisualMelon

I think we should merge this. It's non-trivial, so should merge sooner than later so it can be tested before any release.

Still keen to have a nice example, and possibly incorporating a nicer hit-testing API for Axes (per #1419), but unless you think they'd warrant significant changes, I think we should get this in soon.

Source/OxyPlot/Rendering/IOxyRegion.cs

Jonarw

I think it would be important to have at least some example to demonstrate and verify the functionality. I hacked something together very quickly, which can be used for 'normal' Axes:

        [Example("AxisArea")]
        public static PlotModel AxisArea()
        {
            var plotModel = FourAxes();
            plotModel.Annotations.Add(new RenderingCapabilities.DelegateAnnotation(context =>
            {
                foreach (var axis in plotModel.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);

                }
            }));

            return plotModel;
        }

This gives me this output, which seems all in order:

If I understand correctly, this should also work for AngleAxis, returning an Annulus? I tried something based on the ArchimedeanSpiral example, but I received EmptyShape for the AxisShape. Is this intended, or am I misunderstanding something?

Jonarw · 2023-07-11T16:16:04Z

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

+                    break;
+
+            }
+            // TODO: ensure min area of 5px x X to capture clicks, o this above acc. to axis position


Did this TODO get resolved?

@ChrisCC6 this and comment code below could do with being addressed. If you don't have time to work on this let us know and I'll try to take a look into this and @Jonarw 's questions because I'm keen for this PR to go through.

@VisualMelon I added two examples based on @Jonarw's code above and added the AxisArea to be set for the MagnitudeAxisRenderer.
The TODO is resolved as well.

Thanks indeed! Shall try to take a proper look myself later today.

VisualMelon

Found a few bugs; fixes given in inline comments.

Missing implementation for AngleAxisFullPlotArea and MagnitudeAxisFullPlotArea in MagnitudeAxisFullPlotAreaRenderer. AngleAxis should be much the same, but Magnitude Axis would need to be a rect with a hole in it. We could create a general-purpose 'difference' shape, or a specific shape which is a rect with a rect cut out of it (somehow I suspect this doesn't have a familiar name). (I'd be happy to leave this to another PR to avoid another round of discussion here if it's OK with @Jonarw )

There are issues with AngleAxis.Angle property (30 in this example), but I don't think they are specific to this PR so shouldn't hold it up.
.

If possible, could you rebase against develop so that the CI is happy to run again (should just be changes in the changelog)

VisualMelon · 2023-08-11T15:09:10Z

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

@@ -274,6 +274,40 @@ protected virtual void RenderAxisTitle(Axis axis, double titlePosition)

            var lpt = this.GetAxisTitlePositionAndAlignment(axis, titlePosition, ref angle, ref halign, ref valign);

+            var titleSize = this.RenderContext.MeasureText(axis.ActualTitle, axis.ActualTitleFont, axis.TitleFontSize, axis.TitleFontWeight);


Needs to be var titleSize = this.RenderContext.MeasureText(axis.ActualTitle, axis.ActualTitleFont, axis.ActualTitleFontSize, axis.TitleFontWeight); (ActualTitleFontSize)

VisualMelon · 2023-08-11T15:12:00Z

Source/Examples/ExampleLibrary/Axes/AxisAreaExample.cs

@@ -0,0 +1,158 @@
+using OxyPlot;


Needs copyright header (see AxisExample.cs for example), and filename should be AxisAreaExamples.cs

VisualMelon · 2023-08-11T15:17:33Z

Source/OxyPlot/Axes/Rendering/AngleAxisRenderer.cs

@@ -112,9 +119,26 @@ public override void Render(Axis axis, int pass)
                    ha = HorizontalAlignment.Right;
                }

+                maxTextLength = Math.Max(maxTextLength, this.RenderContext.MeasureText(text).Width);


Needs to be maxTextLength = Math.Max(maxTextLength, this.RenderContext.MeasureText(text, axis.ActualFont, axis.ActualFontSize, axis.ActualFontWeight).Width);

VisualMelon · 2023-08-11T15:22:02Z

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

+
+            }
+
+            // ensure minimum height/width of 5 for the title area , centered to the initial location


Should lose the space before the comma

VisualMelon · 2023-08-11T15:25:13Z

Source/OxyPlot/Rendering/ScreenPoint.cs

+        public void Move(double dx,double dy)
+        {
+            this.x += dx;
+            this.y += dy;
+        }


There is discussion about making these structs readonly (mutable structs are a nightmare and all that): would prefer this returned an updated copy (obviously all usages will need to be modified). I'd also prefer the name Offset. I'm also going to suggest making this internal, because a solution built around ScreenVector would make me happier but is definitely out of scope here.

Should be a space after the comma.

VisualMelon · 2023-08-11T15:27:29Z

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

+            ScreenPoint pt0;
+            ScreenPoint pt1;


Can we move these guys to just above their usage

VisualMelon · 2023-08-11T15:46:34Z

Source/OxyPlot/Axes/Rendering/HorizontalAndVerticalAxisRenderer.cs

@@ -403,6 +455,9 @@ protected virtual void RenderMajorItems(Axis axis, double axisPosition, double t
                    SnapTo(plotAreaBottom, ref transformedValue);
                }

+                string text = axis.FormatValue(value);
+                var labelSize = this.RenderContext.MeasureText(text, axis.ActualFont, axis.ActualFontSize, axis.ActualFontWeight);


Using the overload that takes an angle and passing it axis.Angle (last param) means we can change the block below to the following, which is simpler and makes the code consistent with the automatic margin codes. (There is also a bug in the Bottom block at present: should be like Top but is like Left and Right). The behaviour of this still seems a bit funny, but because it matches the margin code it should be left alone in this PR. May be something for us to investigate further another time @Jonarw

case AxisPosition.Left: pt = new ScreenPoint(axisPosition + a1 - axis.AxisTickToLabelDistance, transformedValue); this.GetRotatedAlignments(axis.Angle, -90, out ha, out va); labelEndPosition = Math.Min(labelEndPosition, pt.x - labelSize.Width); break; case AxisPosition.Right: pt = new ScreenPoint(axisPosition + a1 + axis.AxisTickToLabelDistance, transformedValue); this.GetRotatedAlignments(axis.Angle, 90, out ha, out va); labelEndPosition = Math.Max(labelEndPosition, pt.x + labelSize.Width); break; case AxisPosition.Top: pt = new ScreenPoint(transformedValue, axisPosition + a1 - axis.AxisTickToLabelDistance); this.GetRotatedAlignments(axis.Angle, 0, out ha, out va); labelEndPosition = Math.Min(labelEndPosition, pt.y - labelSize.Height); break; case AxisPosition.Bottom: pt = new ScreenPoint(transformedValue, axisPosition + a1 + axis.AxisTickToLabelDistance); this.GetRotatedAlignments(axis.Angle, -180, out ha, out va); labelEndPosition = Math.Max(labelEndPosition, pt.y + labelSize.Height); break;

VisualMelon · 2023-08-11T16:08:16Z

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">


Looks like this file didn't make it into the commit

ChrisCC6 and others added 4 commits December 6, 2022 09:22

Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (o…

1959a5f

…xyplot#1949)

Update CHANGELOG.md

77d5352

Update CONTRIBUTORS

53b2ef2

Update CONTRIBUTORS

a7a5db8

VisualMelon reviewed Dec 6, 2022

View reviewed changes

EmptyShape as zero area shape implemented

284c795

IShape changed to IOxyRegion

e8e3df6

VisualMelon reviewed Dec 7, 2022

View reviewed changes

Adapted variable names and smaller refactorings

ac877c1

ChrisCC6 added 2 commits December 8, 2022 13:02

OxyAnnulus and OxyCircle: changed properties to have getter only and …

aa9a369

…beeing strictly immutable.

Changed OxyAnnulus constructor

c3eb7e3

VisualMelon mentioned this pull request May 14, 2023

Hit testing for axes #1419

Open

VisualMelon approved these changes May 14, 2023

View reviewed changes

Source/OxyPlot/Rendering/IOxyRegion.cs Outdated Show resolved Hide resolved

Jonarw reviewed Jul 11, 2023

View reviewed changes

Added AxisArea examples

ce40c13

VisualMelon requested changes Aug 11, 2023

View reviewed changes

VisualMelon reviewed Aug 11, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (… #1966

Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (… #1966

ChrisCC6 commented Dec 6, 2022 •

edited

VisualMelon left a comment

VisualMelon commented Dec 7, 2022

VisualMelon commented Dec 7, 2022 •

edited

ChrisCC6 commented Dec 8, 2022

VisualMelon left a comment •

edited

Jonarw left a comment

Jonarw Jul 11, 2023

VisualMelon Aug 10, 2023

ChrisCC6 Aug 10, 2023

VisualMelon Aug 11, 2023

VisualMelon left a comment •

edited

VisualMelon Aug 11, 2023

VisualMelon Aug 11, 2023

VisualMelon Aug 11, 2023

VisualMelon Aug 11, 2023

VisualMelon Aug 11, 2023

VisualMelon Aug 11, 2023

VisualMelon Aug 11, 2023 •

edited

VisualMelon Aug 11, 2023

		@@ -274,6 +274,40 @@ protected virtual void RenderAxisTitle(Axis axis, double titlePosition)

		var lpt = this.GetAxisTitlePositionAndAlignment(axis, titlePosition, ref angle, ref halign, ref valign);

		var titleSize = this.RenderContext.MeasureText(axis.ActualTitle, axis.ActualTitleFont, axis.TitleFontSize, axis.TitleFontWeight);


		}

		// ensure minimum height/width of 5 for the title area , centered to the initial location

Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (… #1966

Are you sure you want to change the base?

Add AxisArea, AxisLineArea and AxisTitleArea property in Axis class (… #1966

Conversation

ChrisCC6 commented Dec 6, 2022 • edited

Checklist

Changes proposed in this pull request:

VisualMelon left a comment

Choose a reason for hiding this comment

VisualMelon commented Dec 7, 2022

VisualMelon commented Dec 7, 2022 • edited

ChrisCC6 commented Dec 8, 2022

VisualMelon left a comment • edited

Choose a reason for hiding this comment

Jonarw left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VisualMelon left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VisualMelon Aug 11, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChrisCC6 commented Dec 6, 2022 •

edited

VisualMelon commented Dec 7, 2022 •

edited

VisualMelon left a comment •

edited

VisualMelon left a comment •

edited

VisualMelon Aug 11, 2023 •

edited