Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gauges #1158

Merged
merged 36 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
fed6c0a
better use extensions instaed of the gauge builder
beto-rodriguez Aug 3, 2023
0ea3921
add iinternal series interface
beto-rodriguez Aug 4, 2023
3a6070b
improve gauge builder
beto-rodriguez Aug 4, 2023
7ac23e9
add ns to tests
beto-rodriguez Aug 4, 2023
74671ac
improve gauge generator background
beto-rodriguez Aug 4, 2023
4a6d798
make gauge builder obsolete
beto-rodriguez Aug 4, 2023
c1db34d
update samples
beto-rodriguez Aug 4, 2023
9e465f8
prevent null paints
beto-rodriguez Aug 4, 2023
d799b5f
update sample
beto-rodriguez Aug 4, 2023
804d88c
add pie isfristdraw
beto-rodriguez Aug 4, 2023
24a7039
intro to agnuar gauge
beto-rodriguez Aug 5, 2023
03444dd
better use outerradiusoffset
beto-rodriguez Aug 6, 2023
fc476ba
pie chart start property
beto-rodriguez Aug 6, 2023
b7b3db6
fiex #907
beto-rodriguez Aug 6, 2023
32ad08b
add test to prevent #1147 again
beto-rodriguez Aug 6, 2023
1ed1024
fixes #1157
beto-rodriguez Aug 7, 2023
81fc3f2
use set value instead, fixes #1054
beto-rodriguez Aug 7, 2023
c821582
restore things
beto-rodriguez Aug 7, 2023
3ebf859
Merge branch 'dev' into update-gauges
beto-rodriguez Aug 8, 2023
31b43f0
uset set property instead
beto-rodriguez Aug 8, 2023
abcd91f
prevent dependency property invalid cast exception
beto-rodriguez Aug 8, 2023
afc9c12
fix code style warning
beto-rodriguez Aug 8, 2023
ab371e6
add new angular shapes
beto-rodriguez Aug 9, 2023
98432a8
needle geometry
beto-rodriguez Aug 9, 2023
fbb4fdf
fix outer radius operation
beto-rodriguez Aug 10, 2023
1f9bb82
add needle and angular ticks visuals
beto-rodriguez Aug 10, 2023
81f9ce6
add new visuals to unit tests
beto-rodriguez Aug 10, 2023
40b0a4e
format
beto-rodriguez Aug 14, 2023
082c216
improve angular gauges defaults
beto-rodriguez Aug 14, 2023
a800b6f
set angular assets defaults
beto-rodriguez Aug 14, 2023
46f2caa
add angular gauge sample
beto-rodriguez Aug 14, 2023
3cf8471
rename to max and min value
beto-rodriguez Aug 14, 2023
630a5ee
refactor
beto-rodriguez Aug 14, 2023
a3d88a1
fixes #907
beto-rodriguez Aug 14, 2023
cfc69e3
use min value property for docs
beto-rodriguez Aug 14, 2023
7a90803
remove line
beto-rodriguez Aug 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 28 additions & 0 deletions samples/AvaloniaSample/Pies/AngularGauge/View.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<UserControl x:Class="AvaloniaSample.Pies.AngularGauge.View"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:lv="clr-namespace:LiveChartsCore;assembly=LiveChartsCore"
xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
xmlns:vms="using:ViewModelsSamples.Pies.AngularGauge">
<UserControl.DataContext>
<vms:ViewModel/>
</UserControl.DataContext>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="50"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<Button Grid.Row="0" Command="{Binding DoRandomChangeCommand}">Change Value</Button>

<lvc:PieChart
Grid.Row="1"
Series="{Binding Series}"
VisualElements="{Binding VisualElements}"
InitialRotation="-225"
MaxAngle="270"
MinValue="0"
MaxValue="100">
</lvc:PieChart>
</Grid>
</UserControl>
17 changes: 17 additions & 0 deletions samples/AvaloniaSample/Pies/AngularGauge/View.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;

namespace AvaloniaSample.Pies.AngularGauge;

public class View : UserControl
{
public View()
{
InitializeComponent();
}

private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
2 changes: 1 addition & 1 deletion samples/AvaloniaSample/Pies/Gauge/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</StackPanel>
<lvc:PieChart Grid.Column="1"
Series="{Binding Series}"
Total="{Binding GaugeTotal}"
MaxValue="{Binding GaugeTotal}"
MaxAngle="{Binding MaxAngle}"
InitialRotation="{Binding InitialRotation}"/>
</Grid>
Expand Down
3 changes: 2 additions & 1 deletion samples/AvaloniaSample/Pies/Gauge1/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<lvc:PieChart
Series="{Binding Series}"
InitialRotation="-90"
Total="100">
MinValue="0"
MaxValue="100">
</lvc:PieChart>
</UserControl>
3 changes: 2 additions & 1 deletion samples/AvaloniaSample/Pies/Gauge2/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
Series="{Binding Series}"
InitialRotation="-225"
MaxAngle="270"
Total="100">
MinValue="0"
MaxValue="100">
</lvc:PieChart>
</UserControl>
3 changes: 2 additions & 1 deletion samples/AvaloniaSample/Pies/Gauge3/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
Series="{Binding Series}"
InitialRotation="45"
MaxAngle="270"
Total="100">
MinValue="0"
MaxValue="100">
</lvc:PieChart>
</UserControl>
3 changes: 2 additions & 1 deletion samples/AvaloniaSample/Pies/Gauge4/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
Series="{Binding Series}"
InitialRotation="-90"
MaxAngle="350"
Total="100">
MinValue="0"
MaxValue="100">
</lvc:PieChart>
</UserControl>
3 changes: 2 additions & 1 deletion samples/AvaloniaSample/Pies/Gauge5/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
Grid.Row="1"
Series="{Binding Series}"
InitialRotation="-90"
Total="100"
MinValue="0"
MaxValue="100"
MaxAngle="270"
LegendPosition="Bottom">
</lvc:PieChart>
Expand Down
28 changes: 14 additions & 14 deletions samples/AvaloniaSample/Pies/Gauges/View.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,96 +13,96 @@
<lvc:PieChart Grid.Column="0"
Grid.Row="0"
Series="{Binding Series1}"
Total="{Binding GaugeTotal1}"/>
MaxValue="{Binding GaugeTotal1}"/>

<lvc:PieChart Grid.Column="1"
Grid.Row="0"
Series="{Binding Series2}"
InitialRotation="{Binding InitialRotation2}"
Total="{Binding GaugeTotal2}"/>
MaxValue="{Binding GaugeTotal2}"/>

<lvc:PieChart Grid.Column="2"
Grid.Row="0"
Series="{Binding Series3}"
InitialRotation="{Binding InitialRotation3}"
Total="{Binding GaugeTotal3}"/>
MaxValue="{Binding GaugeTotal3}"/>

<lvc:PieChart Grid.Column="3"
Grid.Row="0"
Series="{Binding Series4}"
InitialRotation="{Binding InitialRotation4}"
Total="{Binding GaugeTotal4}"/>
MaxValue="{Binding GaugeTotal4}"/>

<lvc:PieChart Grid.Column="4"
Grid.Row="0"
Series="{Binding Series5}"
InitialRotation="{Binding InitialRotation5}"
Total="{Binding GaugeTotal5}"/>
MaxValue="{Binding GaugeTotal5}"/>

<lvc:PieChart Grid.Column="0"
Grid.Row="1"
Series="{Binding Series6}"
InitialRotation="{Binding InitialRotation6}"
Total="{Binding GaugeTotal6}"/>
MaxValue="{Binding GaugeTotal6}"/>

<lvc:PieChart Grid.Column="1"
Grid.Row="1"
Series="{Binding Series7}"
InitialRotation="{Binding InitialRotation7}"
Total="{Binding GaugeTotal7}"/>
MaxValue="{Binding GaugeTotal7}"/>

<lvc:PieChart Grid.Column="2"
Grid.Row="1"
Series="{Binding Series8}"
InitialRotation="{Binding InitialRotation8}"
MaxAngle="{Binding MaxAngle8}"
Total="{Binding GaugeTotal8}"/>
MaxValue="{Binding GaugeTotal8}"/>

<lvc:PieChart Grid.Column="3"
Grid.Row="1"
Series="{Binding Series9}"
InitialRotation="{Binding InitialRotation9}"
MaxAngle="{Binding MaxAngle9}"
Total="{Binding GaugeTotal9}"/>
MaxValue="{Binding GaugeTotal9}"/>

<lvc:PieChart Grid.Column="4"
Grid.Row="1"
Series="{Binding Series10}"
InitialRotation="{Binding InitialRotation10}"
MaxAngle="{Binding MaxAngle10}"
Total="{Binding GaugeTotal10}"/>
MaxValue="{Binding GaugeTotal10}"/>

<lvc:PieChart Grid.Column="0"
Grid.ColumnSpan="2"
Grid.Row="2"
Series="{Binding Series11}"
InitialRotation="{Binding InitialRotation11}"
MaxAngle="{Binding MaxAngle11}"
Total="{Binding GaugeTotal11}"/>
MaxValue="{Binding GaugeTotal11}"/>

<lvc:PieChart Grid.Column="2"
Grid.ColumnSpan="2"
Grid.Row="2"
Series="{Binding Series12}"
InitialRotation="{Binding InitialRotation12}"
MaxAngle="{Binding MaxAngle12}"
Total="{Binding GaugeTotal12}"/>
MaxValue="{Binding GaugeTotal12}"/>

<lvc:PieChart Grid.Column="0"
Grid.ColumnSpan="2"
Grid.Row="3"
Series="{Binding Series13}"
InitialRotation="{Binding InitialRotation13}"
MaxAngle="{Binding MaxAngle13}"
Total="{Binding GaugeTotal13}"/>
MaxValue="{Binding GaugeTotal13}"/>

<lvc:PieChart Grid.Column="2"
Grid.ColumnSpan="2"
Grid.Row="3"
Series="{Binding Series14}"
InitialRotation="{Binding InitialRotation14}"
MaxAngle="{Binding MaxAngle14}"
Total="{Binding GaugeTotal14}"/>
MaxValue="{Binding GaugeTotal14}"/>

</Grid>
</ScrollViewer>
Expand Down
6 changes: 3 additions & 3 deletions samples/BlazorSample/Pages/Hello.razor
Original file line number Diff line number Diff line change
Expand Up @@ -479,13 +479,13 @@ values.Add(new(5));");
PieChart.EasingFunction = EasingFunctions.BounceOut;
PieChart.AnimationsSpeed = TimeSpan.FromSeconds(1.5);

var outer = 1.0;
var outer = 10;
PieChart.Series = new[] { 30, 20, 15, 10, 8, 4 }
.AsLiveChartsPieSeries((value, series) =>
{
series.InnerRadius = 50;
series.MaxOuterRadius = outer;
outer = outer - 0.1;
series.OuterRadiusOffset = outer;
outer = outer - 25;
});

await JS.InvokeVoidAsync("hlElements",
Expand Down
30 changes: 30 additions & 0 deletions samples/BlazorSample/Pages/Pies/AngularGauge.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@page "/Pies/AngularGauge"
@using LiveChartsCore.SkiaSharpView.Blazor
@using ViewModelsSamples.Pies.AngularGauge

<style>
.sample-wrap {
display: inline-block;
width: 600px;
height: 600px;
}
</style>

<button class="btn btn-primary" @onclick="ViewModel.DoRandomChange">
Update Value
</button>

<div class="sample-wrap">
<PieChart
Series="ViewModel.Series"
VisualElements="ViewModel.VisualElements"
InitialRotation="-225"
MaxAngle="270"
MinValue="0"
MaxValue="100">
</PieChart>
</div>

@code {
public ViewModel ViewModel { get; set; } = new();
}
3 changes: 2 additions & 1 deletion samples/BlazorSample/Pages/Pies/Gauge1.razor
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<PieChart
Series="ViewModel.Series"
InitialRotation="-90"
Total="100">
MinValue="0"
MaxValue="100">
</PieChart>
</div>

Expand Down
3 changes: 2 additions & 1 deletion samples/BlazorSample/Pages/Pies/Gauge2.razor
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
Series="ViewModel.Series"
InitialRotation="-225"
MaxAngle="270"
Total="100">
MinValue="0"
MaxValue="100">
</PieChart>
</div>

Expand Down
3 changes: 2 additions & 1 deletion samples/BlazorSample/Pages/Pies/Gauge3.razor
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
Series="ViewModel.Series"
InitialRotation="45"
MaxAngle="270"
Total="100">
MinValue="0"
MaxValue="100">
</PieChart>
</div>

Expand Down
3 changes: 2 additions & 1 deletion samples/BlazorSample/Pages/Pies/Gauge4.razor
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
Series="ViewModel.Series"
InitialRotation="-225"
MaxAngle="270"
Total="100">
MinValue="0"
MaxValue="100">
</PieChart>
</div>

Expand Down
3 changes: 2 additions & 1 deletion samples/BlazorSample/Pages/Pies/Gauge5.razor
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
Series="ViewModel.Series"
InitialRotation="-90"
MaxAngle="270"
Total="100"
MinValue="0"
MaxValue="100"
LegendPosition="LiveChartsCore.Measure.LegendPosition.Bottom">
</PieChart>
</div>
Expand Down