[wip] implement SkiaSharp PlotViews

Source/Examples/Avalonia/ExampleBrowser/App.axaml

@@ -4,5 +4,6 @@
   <Application.Styles>
       <SimpleTheme/>
       <StyleInclude Source="avares://OxyPlot.Avalonia/Themes/Default.axaml"/>
+      <StyleInclude Source="avares://OxyPlot.SkiaSharp.Avalonia/Themes/Default.axaml"/>
   </Application.Styles>
 </Application>

Source/Examples/Avalonia/ExampleBrowser/Category.cs

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MainViewModel.cs" company="OxyPlot">
+//   Copyright (c) 2014 OxyPlot contributors
+// </copyright>
+// <summary>
+//   Represents the view-model for the main window.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace ExampleBrowser
+{
+    using ExampleLibrary;
+    using System;
+    using System.Collections.Generic;
+
+    public class Category
+    {
+        public Category(string key, List<ExampleInfo> examples)
+        {
+            this.Key = key;
+            this.Examples = examples ?? throw new ArgumentNullException(nameof(examples));
+        }
+
+        public string Key { get; }
+        public List<ExampleInfo> Examples { get; }
+    }
+}

Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj

@@ -12,5 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
+    <ProjectReference Include="..\..\..\OxyPlot.SkiaSharp.Avalonia\OxyPlot.SkiaSharp.Avalonia.csproj" />
   </ItemGroup>
 </Project>

Source/Examples/Avalonia/ExampleBrowser/MainViewModel.cs

@@ -11,51 +11,57 @@ namespace ExampleBrowser
 {
     using ExampleLibrary;
     using OxyPlot;
-    using OxyPlot.Series;
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Linq;
 
-    public class Category
-    {
-        public Category(string key, List<ExampleInfo> examples)
-        {
-            Key = key;
-            Examples = examples ?? throw new ArgumentNullException(nameof(examples));
-        }
-
-        public string Key { get; }
-        public List<ExampleInfo> Examples { get; }
-    }
-
     /// <summary>
     /// Represents the view-model for the main window.
     /// </summary>
     public class MainViewModel : INotifyPropertyChanged
     {
+        private ExampleInfo example;
+        private Renderer selectedRenderer;
+        private PlotModel model;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MainViewModel" /> class.
         /// </summary>
         public MainViewModel()
         {
-            Model = new PlotModel() { Title = "Example Browser", Subtitle = "Select an example from the list" };
-            Categories = Examples.GetList()
+            this.model = new PlotModel() { Title = "Example Browser", Subtitle = "Select an example from the list" };
+            this.Categories = Examples.GetList()
                 .GroupBy(e => e.Category)
                 .Select(g => new Category(g.Key, g.ToList()))
                 .OrderBy(c => c.Key)
                 .ToList();
         }
 
+        public IReadOnlyList<Renderer> Renderers { get; } = Enum.GetValues<Renderer>();
+
+        public Renderer SelectedRenderer
+        {
+            get => this.selectedRenderer;
+            set
+            {
+                if (this.selectedRenderer != value)
+                {
+                    this.selectedRenderer = value;
+                    this.CoerceSelectedRenderer();
+                    this.OnPropertyChanged(nameof(this.SelectedRenderer));
+                }
+            }
+        }
+
         public List<Category> Categories { get; }
 
-        private ExampleInfo example;
         /// <summary>
         /// Gets the plot model.
         /// </summary>
         public ExampleInfo Example
         {
-            get => example;
+            get => this.example;
             set
             {
                 if (value == null)
@@ -64,38 +70,47 @@ public ExampleInfo Example
                     return;
                 }
 
-                if (example != value)
+                if (this.example != value)
                 {
-                    example = value;
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Example)));
-                    Model = example?.PlotModel;
-                    Model?.InvalidatePlot(true);
+                    this.example = value;
+                    this.OnPropertyChanged(nameof(this.Example));
+                    this.CoerceExample();
                 }
             }
         }
 
-        private PlotModel model;
-        /// <summary>
-        /// Gets the plot model.
-        /// </summary>
-        public PlotModel Model
-        {
-            get => model;
-            set
-            {
-                if (model != value)
-                {
-                    model = value;
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Model)));
-                }
-            }
-        }
+        public PlotModel CanvasModel => this.SelectedRenderer == Renderer.Canvas ? this.model : null;
+
+        public PlotModel SkiaSharpModel => this.SelectedRenderer == Renderer.SkiaSharp ? this.model : null;
+        public PlotModel SkiaSharpDoubleBufferedModel => this.SelectedRenderer == Renderer.SkiaSharpDoubleBuffered ? this.model : null;
 
         public void ChangeExample(ExampleInfo example)
         {
-            Example = example;
+            this.Example = example;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
+
+        private void CoerceSelectedRenderer()
+        {
+            ((IPlotModel)this.model)?.AttachPlotView(null);
+            this.OnPropertyChanged(nameof(this.CanvasModel));
+            this.OnPropertyChanged(nameof(this.SkiaSharpModel));
+            this.OnPropertyChanged(nameof(this.SkiaSharpDoubleBufferedModel));
+        }
+
+        private void CoerceExample()
+        {
+            this.model = this.example?.PlotModel;
+            this.model?.InvalidatePlot(true);
+            this.OnPropertyChanged(nameof(this.CanvasModel));
+            this.OnPropertyChanged(nameof(this.SkiaSharpModel));
+            this.OnPropertyChanged(nameof(this.SkiaSharpDoubleBufferedModel));
+        }
+
+        private void OnPropertyChanged(string propertyName)
+        {
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }

Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml

@@ -2,7 +2,9 @@
         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:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia"
+        xmlns:oxy="http://oxyplot.org/avalonia"
+        xmlns:oxySkia="http://oxyplot.org/skiasharp/avalonia"
+        xmlns:oxySkiaDb="http://oxyplot.org/skiasharp/avalonia/doublebuffered"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         xmlns:exampleBrowser="clr-namespace:ExampleBrowser;assembly=ExampleBrowser"
         xmlns:exampleLibrary="clr-namespace:ExampleLibrary;assembly=ExampleLibrary"
@@ -11,6 +13,10 @@
     <Window.DataContext>
       <exampleBrowser:MainViewModel />
     </Window.DataContext>
+
+    <Window.Resources>
+        <exampleBrowser:NotNullBooleanConverter x:Key="NotNullBooleanConverter" />
+    </Window.Resources>
 
     <Grid>
       <Grid.RowDefinitions>
@@ -42,6 +48,18 @@
           </ItemsControl.DataTemplates>
         </ItemsControl>
       </ScrollViewer>
-      <oxy:PlotView Model="{Binding Model}" Grid.Row="0" Grid.Column="1" />
+      <Grid Grid.Column="1">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="*" />
+          <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <oxy:PlotView Model="{Binding CanvasModel}" IsVisible="{Binding CanvasModel, Converter={StaticResource NotNullBooleanConverter}}" />
+        <oxySkia:PlotView Model="{Binding SkiaSharpModel}" IsVisible="{Binding SkiaSharpModel, Converter={StaticResource NotNullBooleanConverter}}" />
+        <oxySkiaDb:PlotView Model="{Binding SkiaSharpDoubleBufferedModel}" IsVisible="{Binding SkiaSharpDoubleBufferedModel, Converter={StaticResource NotNullBooleanConverter}}" />
+        <StackPanel Orientation="Horizontal" Grid.Row="1">
+          <TextBlock Text="Renderer:" VerticalAlignment="Center" Margin="5" />
+          <ComboBox ItemsSource="{Binding Renderers}" SelectedItem="{Binding SelectedRenderer}" />
+        </StackPanel>
+      </Grid>
     </Grid>
 </Window>

Source/Examples/Avalonia/ExampleBrowser/NotNullBooleanConverter.cs

@@ -0,0 +1,20 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MainViewModel.cs" company="OxyPlot">
+//   Copyright (c) 2014 OxyPlot contributors
+// </copyright>
+// <summary>
+//   Represents the view-model for the main window.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace ExampleBrowser
+{
+    using Avalonia.Data.Converters;
+
+    public class NotNullBooleanConverter : FuncValueConverter<object, bool>
+    {
+        public NotNullBooleanConverter() : base(obj => obj is not null)
+        {
+        }
+    }
+}

Source/Examples/Avalonia/ExampleBrowser/Program.cs

@@ -7,8 +7,14 @@ class Program
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
-        public static void Main(string[] args) => BuildAvaloniaApp()
+        public static void Main(string[] args)
+        {
+            OxyPlot.Avalonia.OxyPlotModule.EnsureLoaded();
+            OxyPlot.SkiaSharp.Avalonia.OxyPlotModule.EnsureLoaded();
+
+            BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);
+        }
 
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()

Source/Examples/Avalonia/ExampleBrowser/Renderer.cs

@@ -0,0 +1,9 @@
+namespace ExampleBrowser
+{
+    public enum Renderer
+    {
+        Canvas,
+        SkiaSharp,
+        SkiaSharpDoubleBuffered,
+    }
+}

Source/OxyPlot.Avalonia.Shared/Extensions/ConverterExtensions.cs

@@ -0,0 +1,16 @@
+using Avalonia;
+
+namespace OxyPlot.Avalonia.Extensions
+{
+    public static class ConverterExtensions
+    {
+        public static OxyRect ToOxyRect(this Rect rect)
+        {
+            return new OxyRect(rect.Left, rect.Top, rect.Width, rect.Height);
+        }
+        public static Rect ToRect(this OxyRect rect)
+        {
+            return new Rect(rect.Left, rect.Top, rect.Width, rect.Height);
+        }
+    }
+}

Source/OxyPlot.Avalonia.Shared/OxyPlot.Avalonia.Shared.projitems

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>8f6dadff-7073-4862-86c7-4299ae17cd68</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>OxyPlot.Avalonia.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Converters\OxyColorConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Converters\ThicknessConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ConverterExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\DataPointExtension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MoreColors.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PlotBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PlotBase.Events.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PlotBase.Properties.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tracker\TrackerControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tracker\TrackerDefinition.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Utilities\ConverterExtensions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)PlotBase.Model.cs" />
+  </ItemGroup>
+</Project>

Source/OxyPlot.Avalonia.Shared/OxyPlot.Avalonia.Shared.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>8f6dadff-7073-4862-86c7-4299ae17cd68</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="OxyPlot.Avalonia.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>