fixed separators key issue

beto-rodriguez · Aug 27, 2022 · 885be37 · 885be37
1 parent 6782fe6
commit 885be37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/samples/WinUISample/WinUISample/Axes/Style/View.xaml b/samples/WinUISample/WinUISample/Axes/Style/View.xaml
@@ -12,10 +12,12 @@
     </UserControl.DataContext>
     <Grid Background="#333333">
         <lvc:CartesianChart
-        Series="{Binding Series}"
-        XAxes="{Binding XAxes}"
-        YAxes="{Binding YAxes}"
-        DrawMarginFrame="{Binding Frame}">
+            Series="{Binding Series}"
+            XAxes="{Binding XAxes}"
+            YAxes="{Binding YAxes}"
+            DrawMarginFrame="{Binding Frame}"
+            TooltipPosition="Hidden"
+            ZoomMode="Both">
         </lvc:CartesianChart>
     </Grid>
 </UserControl>
diff --git a/src/LiveChartsCore/Axis.cs b/src/LiveChartsCore/Axis.cs
@@ -23,6 +23,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using LiveChartsCore.Drawing;
@@ -388,7 +389,8 @@ NamePadding is not null || SeparatorsPaint is not null || LabelsPaint is not nul
 
         for (var i = start - s; i <= max + s; i += s)
         {
-            var labelContent = i < min || i > max ? string.Empty : labeler(i - 1d + 1d);
+            var separatorKey = labeler(i - 1d + 1d);
+            var labelContent = i < min || i > max ? string.Empty : separatorKey;
 
             float x, y;
             if (_orientation == AxisOrientation.X)
@@ -414,14 +416,17 @@ NamePadding is not null || SeparatorsPaint is not null || LabelsPaint is not nul
                 yc = actualScale.ToPixels(i);
             }
 
-            if (!separators.TryGetValue(labelContent, out var visualSeparator))
+            if (_orientation == AxisOrientation.Y) Trace.WriteLine($"@{i:N2}");
+
+            if (!separators.TryGetValue(separatorKey, out var visualSeparator))
             {
                 visualSeparator = new AxisVisualSeprator<TDrawingContext>() { Value = i };
 
                 if (SeparatorsPaint is not null && ShowSeparatorLines)
                 {
                     InitializeSeparator(visualSeparator, cartesianChart);
                     UpdateSeparator(visualSeparator.Separator!, xc, yc, lxi, lxj, lyi, lyj, UpdateMode.UpdateAndComplete);
+                    if (_orientation == AxisOrientation.Y) Trace.WriteLine($"{i:N2} => {yc:N2}");
                 }
                 if (SubseparatorsPaint is not null)
                 {
@@ -444,7 +449,7 @@ NamePadding is not null || SeparatorsPaint is not null || LabelsPaint is not nul
                     UpdateLabel(visualSeparator.Label!, xc, yc, labeler(i - 1d + 1d), hasRotation, r, UpdateMode.UpdateAndComplete);
                 }
 
-                separators.Add(labelContent, visualSeparator);
+                separators.Add(separatorKey, visualSeparator);
             }
 
             if (SeparatorsPaint is not null && ShowSeparatorLines && visualSeparator.Separator is not null)