DynamoDS
diff --git a/‎src/DynamoCoreWpf/UI/Themes/Modern/LiveChartsStyle.xaml
Copy file name to clipboard
+8-96Lines changed: 8 additions & 96 deletions b/‎src/DynamoCoreWpf/UI/Themes/Modern/LiveChartsStyle.xaml
Copy file name to clipboard
+8-96Lines changed: 8 additions & 96 deletions
diff --git a/‎src/Libraries/CoreNodeModelsWpf/Charts/BarChartNodeModel.cs
Copy file name to clipboard
+17-30Lines changed: 17 additions & 30 deletions b/‎src/Libraries/CoreNodeModelsWpf/Charts/BarChartNodeModel.cs
Copy file name to clipboard
+17-30Lines changed: 17 additions & 30 deletions
diff --git a/‎src/Libraries/CoreNodeModelsWpf/Charts/BasicLineChartNodeModel.cs
Copy file name to clipboard
+7-12Lines changed: 7 additions & 12 deletions b/‎src/Libraries/CoreNodeModelsWpf/Charts/BasicLineChartNodeModel.cs
Copy file name to clipboard
+7-12Lines changed: 7 additions & 12 deletions
diff --git a/‎src/Libraries/CoreNodeModelsWpf/Charts/Controls/BarChartControl.xaml
Copy file name to clipboard
+5-16Lines changed: 5 additions & 16 deletions b/‎src/Libraries/CoreNodeModelsWpf/Charts/Controls/BarChartControl.xaml
Copy file name to clipboard
+5-16Lines changed: 5 additions & 16 deletions
@@ -1,15 +1,8 @@
 <ResourceDictionary xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:avalonedit="clr-namespace:ICSharpCode.AvalonEdit;assembly=ICSharpCode.AvalonEdit"
-                    xmlns:clr="clr-namespace:System;assembly=mscorlib"
-                    xmlns:controls="clr-namespace:Dynamo.Views;assembly=DynamoCoreWpf"
-                    xmlns:nodes="clr-namespace:Dynamo.Nodes;assembly=DynamoCoreWpf"
-                    xmlns:dynui="clr-namespace:Dynamo.UI.Controls;assembly=DynamoCoreWpf"
-                    xmlns:fa="https://schemas.fontawesome.com/icons/"
-                    xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
-                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf">
+                    xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf"
+                    xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
@@ -20,8 +13,8 @@
     <FontFamily x:Key="ArtifaktElementRegular">../../Fonts/Autodesk/#Artifakt Element Regular</FontFamily>
     <FontFamily x:Key="ArtifaktElementBold">../../Fonts/Autodesk/#Artifakt Element Bold</FontFamily>
 
-    <lvc:ColorsCollection x:Key="ColorsCollection">
-        <Color A="255" R="80" G="195" B="218" />
+    <x:Array Type="Color" x:Key="ColorsCollection">
+        <Color  A="255" R="80" G="195" B="218" />
         <Color A="255" R="212" G="118" B="134" />
         <Color A="255" R="224" G="200" B="78" />
         <Color A="255" R="113" G="207" B="65" />
@@ -48,7 +41,7 @@
         <Color A="255" R="223" G="197" B="237" />
         <Color A="255" R="225" G="225" B="220" />
         <Color A="255" R="237" G="191" B="229" />
-    </lvc:ColorsCollection>
+    </x:Array>
 
     <system:Double x:Key="Size">12</system:Double>
 
@@ -63,95 +56,14 @@
     </system:Double>
 
     <Style TargetType="lvc:CartesianChart" x:Key="CartesianLiveChart">
-        <Setter Property="AnimationsSpeed" Value="0:0:0.420"></Setter>
-        <Setter Property="SeriesColors" Value="{StaticResource ColorsCollection}"/>
+        <Setter Property="AnimationsSpeed" Value="00:00:00.420"></Setter>
     </Style>
 
     <Style TargetType="lvc:PieChart" x:Key="PieLiveChart">
-        <Setter Property="AnimationsSpeed" Value="0:0:0.420"></Setter>
-        <Setter Property="SeriesColors" Value="{StaticResource ColorsCollection}"/>
+        <Setter Property="AnimationsSpeed" Value="00:00:00.420"></Setter>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
     </Style>
 
-    <Style TargetType="lvc:Axis" x:Key="LiveAxis">
-        <Setter Property="FontSize" Value="{StaticResource Size}" />
-        <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}" />
-        <Setter Property="Foreground" Value="{StaticResource LightGreyBrush}" />
-    </Style>
-
-    <Style TargetType="lvc:Separator" x:Key="LiveSeparator">
-        <Setter Property="StrokeThickness" 
-                     Value="{StaticResource SeparatorStrokeThickness}" />
-        <Setter Property="Stroke" Value="{StaticResource MidGreyBrush}" />
-        <Setter Property="Opacity" Value="81" />
-        <Style.Triggers>
-            <Trigger Property="AxisOrientation" Value="X">
-                <Setter Property="IsEnabled" Value="False"></Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-    
-    <Style TargetType="lvc:Separator" x:Key="LiveSeparatorDashed">
-        <Setter Property="StrokeThickness" 
-                     Value="{StaticResource SeparatorStrokeThickness}" />
-        <Setter Property="StrokeDashArray" 
-                     Value="{StaticResource SeparatorStrokeDashArray}" />
-        <Setter Property="Stroke" Value="{StaticResource MidGreyBrush}" />
-        <Setter Property="Opacity" Value="81" />
-        <Style.Triggers>
-            <Trigger Property="AxisOrientation" Value="X">
-                <Setter Property="IsEnabled" Value="False"></Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style TargetType="lvc:DefaultLegend">
-        <Setter Property="Foreground" Value="#DCDCDC"/>
-    </Style>
-
-    <Style TargetType="lvc:Series" x:Key="SeriesStyle">
-        <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}"  />
-        <Setter Property="FontSize" Value="{StaticResource Size}" />
-        <Setter Property="StrokeThickness" 
-                     Value="{StaticResource SeriesStrokeThickness}" />
-    </Style>
-
-    <Style TargetType="lvc:CandleSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:ColumnSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:HeatSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:LineSeries" 
-                          BasedOn="{StaticResource SeriesStyle}">
-        <Setter Property="PointGeometrySize" 
-                             Value="{StaticResource Size}" />
-    </Style>
-    <Style TargetType="lvc:StepLineSeries" 
-                          BasedOn="{StaticResource SeriesStyle}">
-        <Setter Property="PointGeometrySize" 
-                               Value="{StaticResource Size}" />
-    </Style>
-    <Style TargetType="lvc:VerticalLineSeries" 
-                          BasedOn="{StaticResource SeriesStyle}">
-        <Setter Property="PointGeometrySize" 
-                               Value="{StaticResource Size}" />
-    </Style>
-    <Style TargetType="lvc:OhlcSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:RowSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:ScatterSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:StackedAreaSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:StackedColumnSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:StackedRowSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-    <Style TargetType="lvc:VerticalStackedAreaSeries" 
-                          BasedOn="{StaticResource SeriesStyle}"/>
-
 
     <DrawingBrush x:Key="DefaultBrush" Viewport="0 0 8 8" ViewportUnits="Absolute" TileMode="Tile">
         <DrawingBrush.Drawing>
 
@@ -1,27 +1,24 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using Autodesk.DesignScript.Runtime;
-using CoreNodes.ChartHelpers;
 using CoreNodeModelsWpf.Charts.Controls;
 using CoreNodeModelsWpf.Charts.Utilities;
-using Dynamo.Graph.Nodes;
-using Newtonsoft.Json;
-using ProtoCore.AST.AssociativeAST;
+using CoreNodes.ChartHelpers;
 using Dynamo.Controls;
-using Dynamo.Nodes;
-using Dynamo.Wpf;
-using LiveCharts.Wpf;
-using Dynamo.UI;
-using DynamoServices;
-using Dynamo.Wpf.Properties;
 using Dynamo.Graph.Connectors;
-using System.Linq;
-using Newtonsoft.Json.Linq;
+using Dynamo.Graph.Nodes;
 using Dynamo.ViewModels;
+using Dynamo.Wpf;
+using Dynamo.Wpf.Properties;
+using LiveChartsCore.SkiaSharpView.Painting;
+using Newtonsoft.Json;
+using ProtoCore.AST.AssociativeAST;
+using SkiaSharp.Views.WPF;
 
 namespace CoreNodeModelsWpf.Charts
 {
@@ -44,7 +41,6 @@ namespace CoreNodeModelsWpf.Charts
     public class BarChartNodeModel : NodeModel
     {
         #region Properties
-        private Random rnd = new Random();
         private bool isNestedList;
 
         /// <summary>
@@ -60,7 +56,7 @@ public class BarChartNodeModel : NodeModel
         /// <summary>
         /// Bar chart color values.
         /// </summary>
-        public List<SolidColorBrush> Colors { get; set; }
+        public List<Color> Colors { get; set; }
 
         /// <summary>
         /// Triggers when port is connected or disconnected
@@ -163,7 +159,7 @@ private void DataBridgeCallback(object data)
             // Update chart properties
             Labels = new List<string>();
             Values = new List<List<double>>();
-            Colors = new List<SolidColorBrush>();
+            Colors = new List<Color>();
 
             var anyNullData = labels == null || values == null;
 
@@ -194,11 +190,11 @@ private void DataBridgeCallback(object data)
 
                     Color color;
                     if (colors == null || colors.Count == 0 || colors.Count != labels.Count)
-                    {
+                        {
                         if (InPorts[2].IsConnected) return;
 
                         // In case colors are not provided, we supply some from the default library of colors
-                        Info(Dynamo.Wpf.Properties.CoreNodeModelWpfResources.ProvideDefaultColorsWarningMessage);
+                        Info(CoreNodeModelWpfResources.ProvideDefaultColorsWarningMessage);
 
                         color = Utilities.Colors.GetColor();
                     }
@@ -207,10 +203,7 @@ private void DataBridgeCallback(object data)
                         var dynColor = (DSCore.Color)colors[i];
                         color = Color.FromArgb(dynColor.Alpha, dynColor.Red, dynColor.Green, dynColor.Blue);
                     }
-
-                    SolidColorBrush brush = new SolidColorBrush(color);
-                    brush.Freeze();
-                    Colors.Add(brush);
+                    Colors.Add(color);
                 }
             }
             else
@@ -221,8 +214,6 @@ private void DataBridgeCallback(object data)
                 {
                     Labels.Add((string)labels[i]);
 
-                    var labelValues = new List<double>();
-                    
                     Values.Add(new List<double>{Convert.ToDouble(values[i])} );
 
                     Color color;
@@ -231,7 +222,7 @@ private void DataBridgeCallback(object data)
                         if (InPorts[3].IsConnected) return;
 
                         // In case colors are not provided, we supply some from the default library of colors
-                        Info(Dynamo.Wpf.Properties.CoreNodeModelWpfResources.ProvideDefaultColorsWarningMessage);
+                        Info(CoreNodeModelWpfResources.ProvideDefaultColorsWarningMessage);
 
                         color = Utilities.Colors.GetColor();
                     }
@@ -240,13 +231,9 @@ private void DataBridgeCallback(object data)
                         var dynColor = (DSCore.Color)colors[i];
                         color = Color.FromArgb(dynColor.Alpha, dynColor.Red, dynColor.Green, dynColor.Blue);
                     }
-
-                    SolidColorBrush brush = new SolidColorBrush(color);
-                    brush.Freeze();
-                    Colors.Add(brush);
+                    Colors.Add(color);
                 }
             }
-
             Utilities.Colors.ResetColors();
 
             // Notify UI the data has been modified
@@ -417,7 +404,7 @@ private void UpdateDefaultInPortValues()
 
         private void ExportImage_Click(object sender, RoutedEventArgs e)
         {
-            Export.ToPng(barChartControl.BarChart);
+            Export.ToPng(barChartControl.BarChartNode);
         }
 
         /// <summary>
 
@@ -41,7 +41,6 @@ namespace CoreNodeModelsWpf.Charts
     public class BasicLineChartNodeModel : NodeModel
     {
         #region Properties
-        private Random rnd = new Random();
 
         /// <summary>
         /// A list of Labels for each line to be plotted.
@@ -56,7 +55,7 @@ public class BasicLineChartNodeModel : NodeModel
         /// <summary>
         /// A list of color values, one for each plotted line.
         /// </summary>
-        public List<SolidColorBrush> Colors { get; set; }
+        public List<Color> Colors { get; set; }
 
         /// <summary>
         /// Triggers when port is connected or disconnected
@@ -160,7 +159,7 @@ private void DataBridgeCallback(object data)
             // Clear current chart values
             Labels = new List<string>();
             Values = new List<List<double>>();
-            Colors = new List<SolidColorBrush>();
+            Colors = new List<Color>();
 
             var anyNullData = labels == null || values == null;
 
@@ -176,24 +175,22 @@ private void DataBridgeCallback(object data)
                 if (InPorts[2].IsConnected) return;
 
                 // In case colors are not provided, we supply some from the default library of colors
-                Info(Dynamo.Wpf.Properties.CoreNodeModelWpfResources.ProvideDefaultColorsWarningMessage);
+                Info(CoreNodeModelWpfResources.ProvideDefaultColorsWarningMessage);
 
                 for (var i = 0; i < labels.Count; i++)
                 {
                     var outputValues = new List<double>();
 
                     foreach (var plotVal in values[i] as ArrayList)
                     {
-                        outputValues.Add(System.Convert.ToDouble(plotVal));
+                        outputValues.Add(Convert.ToDouble(plotVal));
                     }
 
                     Labels.Add((string)labels[i]);
                     Values.Add(outputValues);
 
                     Color color = Utilities.Colors.GetColor();
-                    SolidColorBrush brush = new SolidColorBrush(color);
-                    brush.Freeze();
-                    Colors.Add(brush);
+                    Colors.Add(color);
                 }
 
                 Utilities.Colors.ResetColors();
@@ -206,17 +203,15 @@ private void DataBridgeCallback(object data)
 
                     foreach (var plotVal in values[i] as ArrayList)
                     {
-                        outputValues.Add(System.Convert.ToDouble(plotVal));
+                        outputValues.Add(Convert.ToDouble(plotVal));
                     }
 
                     Labels.Add((string)labels[i]);
                     Values.Add(outputValues);
 
                     var dynColor = (DSCore.Color)colors[i];
                     var convertedColor = Color.FromArgb(dynColor.Alpha, dynColor.Red, dynColor.Green, dynColor.Blue);
-                    SolidColorBrush brush = new SolidColorBrush(convertedColor);
-                    brush.Freeze();
-                    Colors.Add(brush);
+                    Colors.Add(convertedColor);
                 }
             }
 
 
@@ -4,7 +4,7 @@
              xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="https://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:CoreNodeModelsWpf.Charts.Controls"
-             xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+             xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
              xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf"
              xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
              mc:Ignorable="d" 
@@ -20,21 +20,10 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
-        <lvc:CartesianChart Style="{StaticResource CartesianLiveChart}" Name="BarChart" LegendLocation="Bottom" Grid.Row="1">
-            <lvc:CartesianChart.AxisX>
-                <lvc:Axis Style="{StaticResource LiveAxis}" Title="Index" >
-                    <lvc:Axis.Separator >
-                        <lvc:Separator IsEnabled="False" Step="1"></lvc:Separator>
-                    </lvc:Axis.Separator>
-                </lvc:Axis>
-            </lvc:CartesianChart.AxisX >
-            <lvc:CartesianChart.AxisY>
-                <lvc:Axis Style="{StaticResource LiveAxis}" Title="Values">
-                    <lvc:Axis.Separator >
-                        <lvc:Separator Style="{StaticResource LiveSeparator}"></lvc:Separator>
-                    </lvc:Axis.Separator>
-                </lvc:Axis>
-            </lvc:CartesianChart.AxisY>
+        <lvc:CartesianChart Grid.Row="1" Name="BarChartNode"
+                            XAxes="{Binding XAxes}"
+                            YAxes="{Binding YAxes}"
+                            LegendPosition="Bottom">
         </lvc:CartesianChart>
         <Thumb Name ="resizeThumb"
                Grid.Row="1"