Merge pull request #1143 from beto-rodriguez/dev

2.0.0-beta.900

docs/cartesianChart/axes.md

@@ -19,10 +19,29 @@ not cover all of them, if you need to know more about this type then use the [AP
 
 Both of these features are directly related to the <a href="#MaxLimit and MinLimit properties">MaxLimit and MinLimit properties</a>,
 zooming occurs when the mouse wheel moves or when the pinch gesture occurs, the panning is called when the pointer goes down,
-moves and then goes up
+moves and then goes up or when the pinch gesture occurs.
 
-Zooming is disabled by default, you must set the `ZoomMode` property to `X`, `Y` or `Both`, normally the `X` mode is the most accurate 
-for horizontal series  (LineSeries, ColumnSeries), the `Y` mode for vertical series (RowSeries) and the `Both` mode for Heat or Scatter series.
+Zooming and panning is disabled by default, you can enable it by setting the `ZoomMode` property, this property is of type
+[ZoomAndPanMode](https://lvcharts.com/api/{{ version }}/LiveChartsCore.Measure.ZoomAndPanMode) and the options are:
+
+- `X`: Enables zooming and panning on the X axis.
+- `Y`: Enables zooming and panning on the Y axis.
+- `Both`: Enables zooming and panning on both axes.
+- `None`: Disables zooming and panning.
+- `PanX`: Enables panning on the X axis.
+- `PanY`: Enables panning on the Y axis.
+- `ZoomX`: Enables zooming on the X axis.
+- `ZoomY`: Enables zooming on the Y axis.
+
+The [ZoomAndPanMode](https://lvcharts.com/api/{{ version }}/LiveChartsCore.Measure.ZoomAndPanMode) type is a flag enum,
+so you can combine the options, for example, if you want to enable zooming on the X axis and panning on the Y axis you can
+set the `ZoomMode` property to `ZoomAndPanMode.ZoomX | ZoomAndPanMode.PanY`.
+
+There is also the `InvertPanningPointerTrigger` flag, when this flag is present the panning will be triggered using
+the right click on desktop devices and the touch-and-hold gesture on touch devices, the `zoom by section` feature will be
+triggered to the left click on desktop devices and the touch-and-hold gesture on touch devices.
+
+Here are a few examples of the different zoom modes:
 
 **X Mode:**
 

docs/overview/1.2.install.md

@@ -631,9 +631,9 @@ And that's it, start your application and you will see the chart.
 
 ## Configure themes, fonts or mappers (Optional)
 
-Optionally you could configure LiveCharts to add a theme, register a global font or add a custom mapper for a type,
-when you need a non-Latin font you must register a typeface so SkiaShap can render the text correctly,
-add the following code when your application starts:
+Optionally you could configure LiveCharts to add a theme, register a global font, enable `right to left` tooltips
+or a custom mapper for a type, when you need a non-Latin font you must register a typeface so SkiaShap can render
+the text correctly, add the following code when your application starts:
 
 {{~ if avalonia ~}}
 

docs/samples/lines/zoom/template.md

@@ -2,8 +2,26 @@
 {{ render this "~/shared/genericSampleJustGifHeader.md" }}
 
 Zooming and panning is disabled by default, you can enable it by setting the `ZoomMode` property, this property is of type
-`LiveChartsCore.Measure.ZoomAndPanMode` (enum) and the options are `X`, `Y`, `Both` and `None` (default), you can learn more
-about zooming an panning [here](https://lvcharts.com/docs/{{ platform }}/{{ version }}/CartesianChart.Axes%20properties#zooming-and-panning).
+[ZoomAndPanMode](https://lvcharts.com/api/{{ version }}/LiveChartsCore.Measure.ZoomAndPanMode) and the options are:
+
+- `X`: Enables zooming and panning on the X axis.
+- `Y`: Enables zooming and panning on the Y axis.
+- `Both`: Enables zooming and panning on both axes.
+- `None`: Disables zooming and panning.
+- `PanX`: Enables panning on the X axis.
+- `PanY`: Enables panning on the Y axis.
+- `ZoomX`: Enables zooming on the X axis.
+- `ZoomY`: Enables zooming on the Y axis.
+
+The [ZoomAndPanMode](https://lvcharts.com/api/{{ version }}/LiveChartsCore.Measure.ZoomAndPanMode) type is a flag enum,
+so you can combine the options, for example, if you want to enable zooming on the X axis and panning on the Y axis you can
+set the `ZoomMode` property to `ZoomAndPanMode.ZoomX | ZoomAndPanMode.PanY`.
+
+There is also the `InvertPanningPointerTrigger` flag, when this flag is present the panning will be triggered using
+the right click on desktop devices and the touch-and-hold gesture on touch devices, the `zoom by section` feature will be
+triggered to the left click on desktop devices and the touch-and-hold gesture on touch devices.
+
+You can learn more about zooming an panning [here](https://lvcharts.com/docs/{{ platform }}/{{ version }}/CartesianChart.Axes%20properties#zooming-and-panning).
 
 {{~ if desktop ~}}
 
@@ -43,4 +61,4 @@ In touch devices, pinch the screen in/out to zoom, hold tap and drag to move the
 {{ full_name | get_view_from_docs }}
 ```
 
-{{ render this "~/shared/relatedTo.md" }}
+{{ render this "~/shared/relatedTo.md" }}

samples/AvaloniaSample/App.axaml

@@ -4,4 +4,25 @@
     <Application.Styles>
         <FluentTheme />
     </Application.Styles>
+    <Application.Resources>
+        <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
+            <Setter Property="Background" Value="#e8e8e8"/>
+            <Setter Property="Padding" Value="8"/>
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Panel>
+                        <Rectangle Fill="{TemplateBinding Background}"
+                                 HorizontalAlignment="Stretch"
+                                 VerticalAlignment="Stretch"/>
+                        <ContentPresenter x:Name="PART_ContentPresenter"
+                                          Content="{TemplateBinding Content}"
+                                          Margin="{TemplateBinding Padding}"/>
+                    </Panel>
+                </ControlTemplate>
+            </Setter>
+        </ControlTheme>
+        <ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="#303030"/>
+        </ControlTheme>
+    </Application.Resources>
 </Application>

samples/AvaloniaSample/App.axaml.cs

@@ -17,15 +17,17 @@ public override void Initialize()
         LiveCharts.Configure(config => // mark
             config // mark
                 // you can override the theme 
-                // .AddDarkTheme() // mark 
+                //.AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
-                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('Ж'))  // <- Russian // mark
 
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
+                //.UseRightToLeftSettings() // Enables right to left tooltips // mark
+
                 // finally register your own mappers
                 // you can learn more about mappers at:
                 // https://lvcharts.com/docs/{{ platform }}/{{ version }}/Overview.Mappers

samples/AvaloniaSample/Axes/Crosshairs/View.axaml

@@ -0,0 +1,16 @@
+<UserControl x:Class="AvaloniaSample.Axes.Crosshairs.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.Axes.Crosshairs">
+  <UserControl.DataContext>
+    <vms:ViewModel/>
+  </UserControl.DataContext>
+    <Grid>
+        <lvc:CartesianChart
+            Series="{Binding Series}"
+            XAxes="{Binding XAxes}"
+            YAxes="{Binding YAxes}">
+        </lvc:CartesianChart>
+    </Grid>
+</UserControl>

samples/AvaloniaSample/Axes/Crosshairs/View.axaml.cs

@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace AvaloniaSample.Axes.Crosshairs;
+
+public class View : UserControl
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}

samples/AvaloniaSample/Pies/Basic/View.axaml

@@ -8,5 +8,5 @@
   <UserControl.DataContext>
     <vms:ViewModel/>
   </UserControl.DataContext>
-  <lvc:PieChart Series="{Binding Series}" Title="{Binding Title}" LegendPosition="Right"/>
+  <lvc:PieChart Series="{Binding Series}" Title="{Binding Title}"/>
 </UserControl>

samples/BlazorSample/Pages/Axes/Crosshairs.razor

@@ -0,0 +1,13 @@
+@page "/Axes/Crosshairs"
+@using LiveChartsCore.SkiaSharpView.Blazor
+@using ViewModelsSamples.Axes.Crosshairs
+
+<CartesianChart
+	Series="ViewModel.Series"
+	XAxes="ViewModel.XAxes"
+	YAxes="ViewModel.YAxes">
+</CartesianChart>
+
+@code {
+	public ViewModel ViewModel { get; set; } = new();
+}

samples/BlazorSample/Pages/Pies/Basic.razor

@@ -4,7 +4,6 @@
 
 <PieChart
 	Series="ViewModel.Series"
-	LegendPosition="LiveChartsCore.Measure.LegendPosition.Right"
     Title="ViewModel.Title">
 </PieChart>
 

samples/EtoFormsSample/Axes/Crosshairs/View.cs

@@ -0,0 +1,24 @@
+using Eto.Forms;
+using LiveChartsCore.SkiaSharpView.Eto;
+using ViewModelsSamples.Axes.Crosshairs;
+
+namespace EtoFormsSample.Axes.Crosshairs;
+
+public class View : Panel
+{
+    private readonly CartesianChart cartesianChart;
+
+    public View()
+    {
+        var viewModel = new ViewModel();
+
+        cartesianChart = new CartesianChart
+        {
+            Series = viewModel.Series,
+            XAxes = viewModel.XAxes,
+            YAxes = viewModel.YAxes,
+        };
+
+        Content = new DynamicLayout(cartesianChart);
+    }
+}

samples/EtoFormsSample/Pies/Basic/View.cs

@@ -15,8 +15,7 @@ public View()
         pieChart = new PieChart
         {
             Series = viewModel.Series,
-            Title = viewModel.Title,
-            LegendPosition = LiveChartsCore.Measure.LegendPosition.Right,
+            Title = viewModel.Title
         };
 
         Content = pieChart;

samples/EtoFormsSample/Program.cs

@@ -17,16 +17,17 @@ static void Main()
         LiveCharts.Configure(config => // mark
             config // mark
                 // you can override the theme 
-                // .AddDarkTheme() // mark 
-                .AddLightTheme() // mark
+                //.AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
-                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('Ж'))  // <- Russian // mark
 
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
+                //.UseRightToLeftSettings() // Enables right to left tooltips // mark
+
                 // finally register your own mappers
                 // you can learn more about mappers at:
                 // https://lvcharts.com/docs/{{ platform }}/{{ version }}/Overview.Mappers

samples/MauiSample/App.xaml.cs

@@ -25,11 +25,13 @@ protected override void OnStart()
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
-                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('Ж'))  // <- Russian // mark
 
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
+                //.UseRightToLeftSettings() // Enables right to left tooltips // mark
+
                 // finally register your own mappers
                 // you can learn more about mappers at:
                 // https://lvcharts.com/docs/{{ platform }}/{{ version }}/Overview.Mappers

samples/MauiSample/Axes/Crosshairs/View.xaml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage x:Class="MauiSample.Axes.Crosshairs.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.Axes.Crosshairs;assembly=ViewModelsSamples"
+             >
+    <ContentPage.BindingContext>
+        <vms:ViewModel/>
+    </ContentPage.BindingContext>
+	<ContentPage.Content>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+
+            <lvc:CartesianChart
+                Series="{Binding Series}">
+            </lvc:CartesianChart>
+        </Grid>
+    </ContentPage.Content>
+</ContentPage>

samples/MauiSample/Axes/Crosshairs/View.xaml.cs

@@ -0,0 +1,10 @@
+namespace MauiSample.Axes.Crosshairs;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class View : ContentPage
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+}

samples/MauiSample/Pies/Basic/View.xaml

@@ -10,7 +10,6 @@
     </ContentPage.BindingContext>
     <lvc:PieChart
         Series="{Binding Series}"
-        Title="{Binding Title}"
-        LegendPosition="Right">
+        Title="{Binding Title}">
     </lvc:PieChart>
 </ContentPage>

samples/UWPSample/Pies/Basic/View.xaml

@@ -9,5 +9,5 @@
     <UserControl.DataContext>
         <vms:ViewModel/>
     </UserControl.DataContext>
-    <lvc:PieChart Series="{Binding Series}" Title="{Binding Title}" LegendPosition="Right"/>
+    <lvc:PieChart Series="{Binding Series}" Title="{Binding Title}"/>
 </UserControl>

samples/UnoPlatformSample/UnoPlatformSample/App.cs

@@ -1,26 +1,4 @@
-// The MIT License(MIT)
-//
-// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-using LiveChartsCore; // mark
+using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; // mark
 using SkiaSharp; // mark
 
@@ -42,11 +20,13 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
-                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('Ж'))  // <- Russian // mark
 
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
+                //.UseRightToLeftSettings() // Enables right to left tooltips // mark
+
                 // finally register your own mappers
                 // you can learn more about mappers at:
                 // https://lvcharts.com/docs/{{ platform }}/{{ version }}/Overview.Mappers

samples/UnoPlatformSample/UnoPlatformSample/LiveChartsSamples/Axes/Crosshairs/View.xaml

@@ -0,0 +1,22 @@
+<UserControl
+    x:Class="UnoWinUISample.Axes.Crosshairs.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.WinUI"
+    xmlns:vms="using:ViewModelsSamples.Axes.Crosshairs"
+    mc:Ignorable="d">
+
+    <UserControl.DataContext>
+        <vms:ViewModel/>
+    </UserControl.DataContext>
+    <Grid>
+        <lvc:CartesianChart
+            Series="{Binding Series}"
+            XAxes="{Binding XAxes}"
+            YAxes="{Binding YAxes}">
+        </lvc:CartesianChart>
+    </Grid>
+
+</UserControl>

samples/UnoPlatformSample/UnoPlatformSample/LiveChartsSamples/Axes/Crosshairs/View.xaml.cs

@@ -0,0 +1,11 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace UnoWinUISample.Axes.Crosshairs;
+
+public sealed partial class View : UserControl
+{
+    public View()
+    {
+        InitializeComponent();
+    }
+}

samples/UnoPlatformSample/UnoPlatformSample/LiveChartsSamples/Pies/Basic/View.xaml

@@ -11,7 +11,6 @@
     </UserControl.DataContext>
     <lvc:PieChart
         Series="{Binding Series}"
-        Title="{Binding Title}"
-        LegendPosition="Right">
+        Title="{Binding Title}">
     </lvc:PieChart>
 </UserControl>