Merge pull request #615 from beto-rodriguez/dev

Beta 400
beto-rodriguez · Sep 5, 2022 · b3f9c38 · b3f9c38
2 parents 6f7f1b2 + 4bd9848
commit b3f9c38
Show file tree

Hide file tree

Showing 129 changed files with 3,140 additions and 325 deletions.
diff --git a/samples/AvaloniaSample/AvaloniaSample.csproj b/samples/AvaloniaSample/AvaloniaSample.csproj
@@ -118,6 +118,9 @@
     <Compile Update="General\MultiThreading\View.axaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
+    <Compile Update="General\VisualElements\View.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
     <Compile Update="General\Sections2\View.axaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>

diff --git a/samples/AvaloniaSample/General/VisualElements/View.axaml b/samples/AvaloniaSample/General/VisualElements/View.axaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="AvaloniaSample.General.VisualElements.View"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
+             xmlns:vms="using:ViewModelsSamples.General.VisualElements">
+    <UserControl.DataContext>
+        <vms:ViewModel/>
+    </UserControl.DataContext>
+    <Grid>
+        <lvc:CartesianChart
+            Series="{Binding Series}"
+            VisualElements="{Binding VisualElements}">
+        </lvc:CartesianChart>
+    </Grid>
+</UserControl>
diff --git a/samples/AvaloniaSample/General/VisualElements/View.axaml.cs b/samples/AvaloniaSample/General/VisualElements/View.axaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace AvaloniaSample.General.VisualElements;
+
+public class View : UserControl
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
diff --git a/samples/BlazorSample/Pages/Design/LinearGradients.razor b/samples/BlazorSample/Pages/Design/LinearGradients.razor
@@ -3,7 +3,8 @@
 @using ViewModelsSamples.Design.LinearGradients
 
 <CartesianChart
-	Series="ViewModel.Series">
+	Series="ViewModel.Series"
+    LegendPosition="LiveChartsCore.Measure.LegendPosition.Right">
 </CartesianChart>
 
 @code {

diff --git a/samples/BlazorSample/Pages/Design/RadialGradients.razor b/samples/BlazorSample/Pages/Design/RadialGradients.razor
@@ -3,7 +3,8 @@
 @using ViewModelsSamples.Design.RadialGradients
 
 <PieChart
-	Series="ViewModel.Series">
+	Series="ViewModel.Series"
+    LegendPosition="LiveChartsCore.Measure.LegendPosition.Right">
 </PieChart>
 
 @code {

diff --git a/samples/BlazorSample/Pages/General/VisualElements.razor b/samples/BlazorSample/Pages/General/VisualElements.razor
@@ -0,0 +1,12 @@
+@page "/General/VisualElements"
+@using LiveChartsCore.SkiaSharpView.Blazor
+@using ViewModelsSamples.General.VisualElements
+
+<CartesianChart
+	Series="ViewModel.Series"
+	VisualElements="ViewModel.VisualElements">
+</CartesianChart>
+
+@code {
+	public ViewModel ViewModel { get; set; } = new();
+}
diff --git a/samples/ConsoleSample/ConsoleSample/Program.cs b/samples/ConsoleSample/ConsoleSample/Program.cs
@@ -12,7 +12,8 @@
     {
         new LineSeries<int> { Values = new int[] { 1, 5, 4, 6 } },
         new ColumnSeries<int> { Values = new int[] { 4, 8, 2, 4 } }
-    }
+    },
+    LegendPosition = LiveChartsCore.Measure.LegendPosition.Right
 };
 
 // you can save the image to png (by default)
@@ -28,7 +29,8 @@
         new PieSeries<int> { Values = new int[] { 10, } },
         new PieSeries<int> { Values = new int[] { 6 } },
         new PieSeries<int> { Values = new int[] { 4 } }
-    }
+    },
+    LegendPosition = LiveChartsCore.Measure.LegendPosition.Right
 };
 
 pieChart.SaveImage("pieChart.png");

diff --git a/samples/EtoFormsSample/General/VisualElements/View.cs b/samples/EtoFormsSample/General/VisualElements/View.cs
@@ -0,0 +1,21 @@
+using Eto.Forms;
+using LiveChartsCore.SkiaSharpView.Eto;
+using ViewModelsSamples.General.VisualElements;
+
+namespace EtoFormsSample.General.VisualElements;
+
+public class View : Panel
+{
+    public View()
+    {
+        var viewModel = new ViewModel();
+
+        var cartesianChart = new CartesianChart
+        {
+            Series = viewModel.Series,
+            VisualElements = viewModel.VisualElements,
+        };
+
+        Content = cartesianChart;
+    }
+}
diff --git a/samples/MauiSample/General/VisualElements/View.xaml b/samples/MauiSample/General/VisualElements/View.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage x:Class="MauiSample.General.VisualElements.View"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.Maui;assembly=LiveChartsCore.SkiaSharpView.Maui"
+             xmlns:vms="clr-namespace:ViewModelsSamples.General.VisualElements;assembly=ViewModelsSamples"
+             >
+    <ContentPage.BindingContext>
+        <vms:ViewModel/>
+    </ContentPage.BindingContext>
+	<ContentPage.Content>
+        <Grid>
+            <lvc:CartesianChart
+            Series="{Binding Series}"
+            VisualElements="{Binding VisualElements}">
+            </lvc:CartesianChart>
+        </Grid>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/samples/MauiSample/General/VisualElements/View.xaml.cs b/samples/MauiSample/General/VisualElements/View.xaml.cs
@@ -0,0 +1,10 @@
+namespace MauiSample.General.VisualElements;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class View : ContentPage
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/samples/MauiSample/MauiSample.csproj b/samples/MauiSample/MauiSample.csproj
@@ -51,6 +51,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="General\VisualElements\View.xaml.cs">
+	    <DependentUpon>%(Filename)</DependentUpon>
+	  </Compile>
 	  <Compile Update="Test\Dispose\View.xaml.cs">
 	    <DependentUpon>%(Filename)</DependentUpon>
 	  </Compile>
@@ -162,6 +165,9 @@
 	  <MauiXaml Update="General\NullPoints\View.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="General\VisualElements\View.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="General\Sections2\View.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

diff --git a/samples/UWPSample/General/VisualElements/View.xaml b/samples/UWPSample/General/VisualElements/View.xaml
@@ -0,0 +1,22 @@
+<UserControl
+    x:Class="UWPSample.General.VisualElements.View"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Uno"
+    xmlns:vms="using:ViewModelsSamples.General.VisualElements"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vms:ViewModel/>
+    </UserControl.DataContext>
+
+    <Grid>
+        <lvc:CartesianChart
+            Series="{Binding Series}"
+            VisualElements="{Binding VisualElements}">
+        </lvc:CartesianChart>
+    </Grid>
+
+</UserControl>
diff --git a/samples/UWPSample/General/VisualElements/View.xaml.cs b/samples/UWPSample/General/VisualElements/View.xaml.cs
@@ -0,0 +1,12 @@
+using Windows.UI.Xaml.Controls;
+
+namespace UWPSample.General.VisualElements
+{
+    public sealed partial class View : UserControl
+    {
+        public View()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/samples/UWPSample/UWPSample.csproj b/samples/UWPSample/UWPSample.csproj
@@ -223,6 +223,9 @@
     <Compile Include="General\NullPoints\View.xaml.cs">
       <DependentUpon>View.xaml</DependentUpon>
     </Compile>
+    <Compile Include="General\VisualElements\View.xaml.cs">
+      <DependentUpon>View.xaml</DependentUpon>
+    </Compile>
     <Compile Include="General\Sections2\View.xaml.cs">
       <DependentUpon>View.xaml</DependentUpon>
     </Compile>
@@ -546,6 +549,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="General\VisualElements\View.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="General\Sections2\View.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/samples/UnoSample/UnoSample.Shared/LiveChartsSamples/General/Sections2/View.xaml b/samples/UnoSample/UnoSample.Shared/LiveChartsSamples/General/Sections2/View.xaml
@@ -13,6 +13,6 @@
     </UserControl.DataContext>
     <lvc:CartesianChart
         Series="{Binding Series}"
-        Sections="{Binding Sections}">        
+        Sections="{Binding Sections}">
     </lvc:CartesianChart>
 </UserControl>
diff --git a/samples/UnoSample/UnoSample.Shared/LiveChartsSamples/General/VisualElements/View.xaml b/samples/UnoSample/UnoSample.Shared/LiveChartsSamples/General/VisualElements/View.xaml
@@ -0,0 +1,22 @@
+<UserControl
+    x:Class="UnoSample.General.VisualElements.View"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Uno"
+    xmlns:vms="using:ViewModelsSamples.General.VisualElements"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vms:ViewModel/>
+    </UserControl.DataContext>
+
+    <Grid>
+        <lvc:CartesianChart
+            Series="{Binding Series}"
+            VisualElements="{Binding VisualElements}">
+        </lvc:CartesianChart>
+    </Grid>
+
+</UserControl>
diff --git a/samples/UnoSample/UnoSample.Shared/LiveChartsSamples/General/VisualElements/View.xaml.cs b/samples/UnoSample/UnoSample.Shared/LiveChartsSamples/General/VisualElements/View.xaml.cs
@@ -0,0 +1,11 @@
+using Windows.UI.Xaml.Controls;
+
+namespace UnoSample.General.VisualElements;
+
+public sealed partial class View : UserControl
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/samples/UnoSample/UnoSample.Shared/UnoSample.Shared.projitems b/samples/UnoSample/UnoSample.Shared/UnoSample.Shared.projitems
@@ -123,6 +123,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)LiveChartsSamples\General\NullPoints\View.xaml.cs">
       <DependentUpon>View.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)LiveChartsSamples\General\VisualElements\View.xaml.cs">
+      <DependentUpon>View.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)LiveChartsSamples\General\Sections2\View.xaml.cs">
       <DependentUpon>View.xaml</DependentUpon>
     </Compile>
@@ -674,7 +677,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </_Globbled_Page>
-    <Page Include="@(_Globbled_Page)" />
+    <Page Include="$(MSBuildThisFileDirectory)LiveChartsSamples\General\VisualElements\View.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <_Globbed_Compile Include="$(MSBuildThisFileDirectory)**/*.xaml.cs" Exclude="@(Compile)">
       <DependentUpon>%(Filename)</DependentUpon>
     </_Globbed_Compile>
@@ -684,4 +689,10 @@
     <_Globbed_Content Include="$(MSBuildThisFileDirectory)Assets/**/*.*" Exclude="@(Content)" />
     <Content Include="@(_Globbed_Content)" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="C:\_dev\LiveCharts2\samples\UnoSample\UnoSample.Shared\LiveChartsSamples\General\Sections - Copy\View.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
diff --git a/samples/UnoSample/UnoSample.Shared/UnoSample.Shared.shproj b/samples/UnoSample/UnoSample.Shared/UnoSample.Shared.shproj
@@ -100,6 +100,7 @@
     <_Globbed_Compile Remove="LiveChartsSamples\General\MultiThreading2\View.xaml.cs" />
     <_Globbed_Compile Remove="LiveChartsSamples\General\MultiThreading\View.xaml.cs" />
     <_Globbed_Compile Remove="LiveChartsSamples\General\NullPoints\View.xaml.cs" />
+    <_Globbed_Compile Remove="LiveChartsSamples\General\Sections - Copy\View.xaml.cs" />
     <_Globbed_Compile Remove="LiveChartsSamples\General\Sections2\View.xaml.cs" />
     <_Globbed_Compile Remove="LiveChartsSamples\General\Sections\View.xaml.cs" />
     <_Globbed_Compile Remove="LiveChartsSamples\General\TemplatedLegends\View.xaml.cs" />

diff --git a/...e/UnoWinUISample/UnoWinUISample.Shared/LiveChartsSamples/General/VisualElements/View.xaml b/...e/UnoWinUISample/UnoWinUISample.Shared/LiveChartsSamples/General/VisualElements/View.xaml
@@ -0,0 +1,22 @@
+<UserControl
+    x:Class="UnoWinUISample.General.VisualElements.View"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Uno.WinUI"
+    xmlns:vms="using:ViewModelsSamples.General.VisualElements"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vms:ViewModel/>
+    </UserControl.DataContext>
+
+    <Grid>
+        <lvc:CartesianChart
+            Series="{Binding Series}"
+            VisualElements="{Binding VisualElements}">
+        </lvc:CartesianChart>
+    </Grid>
+
+</UserControl>
diff --git a/...noWinUISample/UnoWinUISample.Shared/LiveChartsSamples/General/VisualElements/View.xaml.cs b/...noWinUISample/UnoWinUISample.Shared/LiveChartsSamples/General/VisualElements/View.xaml.cs
@@ -0,0 +1,11 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace UnoWinUISample.General.VisualElements;
+
+public sealed partial class View : UserControl
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/samples/UnoWinUISample/UnoWinUISample/UnoWinUISample.Shared/UnoWinUISample.Shared.projitems b/samples/UnoWinUISample/UnoWinUISample/UnoWinUISample.Shared/UnoWinUISample.Shared.projitems
@@ -674,12 +674,12 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </_Globbled_Page>
-    <Page Include="@(_Globbled_Page)" />
+    <Page Include="$(MSBuildThisFileDirectory)LiveChartsSamples\General\VisualElements\View.xaml" />
     <_Globbed_Compile Include="$(MSBuildThisFileDirectory)**/*.xaml.cs" Exclude="@(Compile)">
       <DependentUpon>%(Filename)</DependentUpon>
     </_Globbed_Compile>
     <_Globbed_Compile Include="$(MSBuildThisFileDirectory)**/*.cs" Exclude="@(Compile);@(_Globbed_Compile)" />
-    <Compile Include="@(_Globbed_Compile)" />
+    <Compile Include="$(MSBuildThisFileDirectory)LiveChartsSamples\General\VisualElements\View.xaml.cs" />
     <_Globbed_PRIResource Include="$(MSBuildThisFileDirectory)**/*.resw" Exclude="@(PRIResource)" />
     <PRIResource Include="@(_Globbed_PRIResource)" />
     <_Globbed_Content Include="$(MSBuildThisFileDirectory)Assets/**/*.*" Exclude="@(Content)" />
@@ -690,4 +690,16 @@
     <!-- Make sure XAML files force reevaluation of up-to-date checks -->
     <UpToDateCheckInput Include="$(MSBuildThisFileDirectory)**/*.xaml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="C:\_dev\LiveCharts2\samples\UnoWinUISample\UnoWinUISample\UnoWinUISample.Shared\LiveChartsSamples\General\Sections - Copy\View.xaml.cs">
+      <DependentUpon>View.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="C:\_dev\LiveCharts2\samples\UnoWinUISample\UnoWinUISample\UnoWinUISample.Shared\LiveChartsSamples\General\Sections - Copy\View.xaml">
+      <XamlRuntime>WinUI</XamlRuntime>
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
diff --git a/samples/ViewModelsSamples/Axes/LabelsRotation/ViewModel.cs b/samples/ViewModelsSamples/Axes/LabelsRotation/ViewModel.cs
@@ -26,7 +26,7 @@ public partial class ViewModel
         {
             // Use the Label property to indicate the format of the labels in the axis
             // The Labeler takes the value of the label as parameter and must return it as string
-            Labeler = (value) => "Day " + value,
+            Labeler = (value) => "so long label with this Day " + value,
 
             // The MinStep property lets you define the minimum separation (in chart values scale)
             // between every axis separator, in this case we don't want decimals,
@@ -44,6 +44,7 @@ public partial class ViewModel
     {
         new Axis
         {
+            IsVisible = false,
             LabelsRotation = 15,
 
             // Now the Y axis we will display it as currency