Skip to content

Commit

Permalink
fixes #413
Browse files Browse the repository at this point in the history
  • Loading branch information
@beto-rodriguez
beto-rodriguez committed Sep 29, 2022
1 parent f8842fe commit 8bd93c2
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 98 deletions.
26 changes: 25 additions & 1 deletion samples/ViewModelsSamples/Axes/Multiple/ViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel;
using LiveChartsCore;
using LiveChartsCore.Kernel.Sketches;
using LiveChartsCore.SkiaSharpView;
Expand Down Expand Up @@ -105,4 +106,27 @@ public partial class ViewModel
Position = LiveChartsCore.Measure.AxisPosition.End
}
};

public ViewModel()
{
DoThis();
}

public async void DoThis()
{
var ax = YAxes[0] as Axis;
await Task.Delay(1000);
ax.IsVisible = false;

await Task.Delay(1000);
ax.ShowSeparatorLines = false;

await Task.Delay(1000);
ax.IsVisible = true;

await Task.Delay(1000);
ax.ShowSeparatorLines = true;

var a = 1;
}
}
138 changes: 69 additions & 69 deletions samples/ViewModelsSamples/Index.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,75 +4,75 @@ public static class Index
{
public static string[] Samples =
{
"Design/LinearGradients",
"Design/RadialGradients",

"Lines/Basic",
"Lines/AutoUpdate",
"Lines/Straight",
"Lines/Properties",
"Lines/Area",
"Lines/Custom",
"Lines/Padding",
"Lines/XY",
"Lines/Zoom",

"StepLines/Basic",
"StepLines/AutoUpdate",
"StepLines/Properties",
"StepLines/Area",
"StepLines/Custom",
"StepLines/Zoom",

"StackedArea/Basic",
"StackedArea/StepArea",

"Bars/Basic",
"Bars/AutoUpdate",
"Bars/Custom",
"Bars/WithBackground",
"Bars/Spacing",
"Bars/DelayedAnimation",
"Bars/Race",
"Bars/RowsWithLabels",
"Bars/Layered",

"StackedBars/Basic",
"StackedBars/Groups",

"Pies/Basic",
"Pies/AutoUpdate",
"Pies/Processing",
"Pies/Doughnut",
"Pies/Pushout",
"Pies/Custom",
"Pies/NightingaleRose",
"Pies/Gauges",
//"Pies/Gauge",
"Pies/Gauge1",
"Pies/Gauge2",
"Pies/Gauge3",
"Pies/Gauge4",
"Pies/Gauge5",

"Scatter/Basic",
"Scatter/Bubbles",
"Scatter/AutoUpdate",
"Scatter/Custom",

"Financial/BasicCandlesticks",

"Heat/Basic",

"Polar/Basic",
"Polar/RadialArea",
"Polar/Coordinates",

"Axes/ColorsAndPosition",
"Axes/LabelsFormat",
"Axes/LabelsFormat2",
"Axes/NamedLabels",
"Axes/LabelsRotation",
//"Design/LinearGradients",
//"Design/RadialGradients",

//"Lines/Basic",
//"Lines/AutoUpdate",
//"Lines/Straight",
//"Lines/Properties",
//"Lines/Area",
//"Lines/Custom",
//"Lines/Padding",
//"Lines/XY",
//"Lines/Zoom",

//"StepLines/Basic",
//"StepLines/AutoUpdate",
//"StepLines/Properties",
//"StepLines/Area",
//"StepLines/Custom",
//"StepLines/Zoom",

//"StackedArea/Basic",
//"StackedArea/StepArea",

//"Bars/Basic",
//"Bars/AutoUpdate",
//"Bars/Custom",
//"Bars/WithBackground",
//"Bars/Spacing",
//"Bars/DelayedAnimation",
//"Bars/Race",
//"Bars/RowsWithLabels",
//"Bars/Layered",

//"StackedBars/Basic",
//"StackedBars/Groups",

//"Pies/Basic",
//"Pies/AutoUpdate",
//"Pies/Processing",
//"Pies/Doughnut",
//"Pies/Pushout",
//"Pies/Custom",
//"Pies/NightingaleRose",
//"Pies/Gauges",
////"Pies/Gauge",
//"Pies/Gauge1",
//"Pies/Gauge2",
//"Pies/Gauge3",
//"Pies/Gauge4",
//"Pies/Gauge5",

//"Scatter/Basic",
//"Scatter/Bubbles",
//"Scatter/AutoUpdate",
//"Scatter/Custom",

//"Financial/BasicCandlesticks",

//"Heat/Basic",

//"Polar/Basic",
//"Polar/RadialArea",
//"Polar/Coordinates",

//"Axes/ColorsAndPosition",
//"Axes/LabelsFormat",
//"Axes/LabelsFormat2",
//"Axes/NamedLabels",
//"Axes/LabelsRotation",
"Axes/Multiple",
"Axes/Shared",
"Axes/DateTimeScaled",
Expand Down
57 changes: 29 additions & 28 deletions src/LiveChartsCore/Axis.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ public abstract class Axis<TDrawingContext, TTextGeometry, TLineGeometry>
/// <inheritdoc cref="IPlane.ShowSeparatorLines"/>
public bool ShowSeparatorLines { get => _showSeparatorLines; set { _showSeparatorLines = value; OnPropertyChanged(); } }



/// <inheritdoc cref="IPlane.IsVisible"/>
public bool IsVisible { get => _isVisible; set { _isVisible = value; OnPropertyChanged(); } }

Expand Down Expand Up @@ -465,35 +463,38 @@ public override void Invalidate(Chart<TDrawingContext> chart)
if (!separators.TryGetValue(separatorKey, out var visualSeparator))
{
visualSeparator = new AxisVisualSeprator<TDrawingContext>() { Value = i };
separators.Add(separatorKey, visualSeparator);
}

if (SeparatorsPaint is not null && ShowSeparatorLines)
{
InitializeSeparator(visualSeparator, cartesianChart);
UpdateSeparator(visualSeparator.Separator!, xc, yc, lxi, lxj, lyi, lyj, UpdateMode.UpdateAndComplete);
}
if (SubseparatorsPaint is not null && ShowSeparatorLines)
{
InitializeSubseparators(visualSeparator, cartesianChart);
UpdateSubseparators(visualSeparator.Subseparators!, actualScale, s, xc, yc, lxi, lxj, lyi, lyj, UpdateMode.UpdateAndComplete);
}
if (TicksPaint is not null)
{
InitializeTick(visualSeparator, cartesianChart);
UpdateTick(visualSeparator.Tick!, _tickLength, xc, yc, UpdateMode.UpdateAndComplete);
}
if (SubticksPaint is not null && _subSections > 0)
{
InitializeSubticks(visualSeparator, cartesianChart);
UpdateSubticks(visualSeparator.Subticks!, actualScale, s, xc, yc, UpdateMode.UpdateAndComplete);
}
if (LabelsPaint is not null)
{
IntializeLabel(visualSeparator, cartesianChart, size, hasRotation, r);
UpdateLabel(visualSeparator.Label!, xc, yc, labeler(i - 1d + 1d), hasRotation, r, UpdateMode.UpdateAndComplete);
}
#region Initialize shapes

separators.Add(separatorKey, visualSeparator);
if (SeparatorsPaint is not null && ShowSeparatorLines && visualSeparator.Separator is null)
{
InitializeSeparator(visualSeparator, cartesianChart);
UpdateSeparator(visualSeparator.Separator!, xc, yc, lxi, lxj, lyi, lyj, UpdateMode.UpdateAndComplete);
}
if (SubseparatorsPaint is not null && ShowSeparatorLines && (visualSeparator.Subseparators is null || visualSeparator.Subseparators.Length == 0))
{
InitializeSubseparators(visualSeparator, cartesianChart);
UpdateSubseparators(visualSeparator.Subseparators!, actualScale, s, xc, yc, lxi, lxj, lyi, lyj, UpdateMode.UpdateAndComplete);
}
if (TicksPaint is not null && visualSeparator.Tick is null)
{
InitializeTick(visualSeparator, cartesianChart);
UpdateTick(visualSeparator.Tick!, _tickLength, xc, yc, UpdateMode.UpdateAndComplete);
}
if (SubticksPaint is not null && _subSections > 0 && (visualSeparator.Subticks is null || visualSeparator.Subticks.Length == 0))
{
InitializeSubticks(visualSeparator, cartesianChart);
UpdateSubticks(visualSeparator.Subticks!, actualScale, s, xc, yc, UpdateMode.UpdateAndComplete);
}
if (LabelsPaint is not null && visualSeparator.Label is null)
{
IntializeLabel(visualSeparator, cartesianChart, size, hasRotation, r);
UpdateLabel(visualSeparator.Label!, xc, yc, labeler(i - 1d + 1d), hasRotation, r, UpdateMode.UpdateAndComplete);
}

#endregion

if (SeparatorsPaint is not null && visualSeparator.Separator is not null)
{
Expand Down

0 comments on commit 8bd93c2

Please sign in to comment.