Finish POC C# API for Chart.Scatter

Author: kMutagene

src/Plotly.NET.CSharp/ChartAPI/Chart2D.cs

@@ -18,7 +18,7 @@ public static int Foo<T1,T2,T3>(
         ) 
             where T1 : IConvertible
             where T2 : IConvertible
-            where T3 : IConvertible =>
+            where T3 : class, IConvertible =>
             Plotly.NET.Chart2D.Chart.Foo<T1, T2, T3>(
                 notopt: notopt,
                 opt1: Helpers.ToOption<IEnumerable<T2>>(opt1),
@@ -94,38 +94,38 @@ public static GenericChart.GenericChart Scatter<XType,YType,TextType>(
         )
             where XType : IConvertible
             where YType : IConvertible
-            where TextType : IConvertible
+            where TextType : class, IConvertible
         =>
             Plotly.NET.Chart2D.Chart.Scatter(
                 x: x, 
                 y: y, 
                 mode: mode,
-                Name: Name,
-                ShowLegend: ShowLegend,
-                Opacity: Opacity,
+                Name: Helpers.ToOption(Name),
+                ShowLegend: Helpers.ToOption(ShowLegend),
+                Opacity: Helpers.ToOption(Opacity),
                 MultiOpacity: Helpers.ToOption(MultiOpacity),
                 Text: Helpers.ToOption(Text),
                 MultiText: Helpers.ToOption(MultiText),
-                TextPosition: TextPosition,
+                TextPosition: Helpers.ToOption(TextPosition),
                 MultiTextPosition: Helpers.ToOption(MultiTextPosition),
-                MarkerColor: MarkerColor,
-                MarkerColorScale: MarkerColorScale,
-                MarkerOutline: MarkerOutline,
-                MarkerSymbol: MarkerSymbol,
+                MarkerColor: Helpers.ToOption(MarkerColor),
+                MarkerColorScale: Helpers.ToOption(MarkerColorScale),
+                MarkerOutline: Helpers.ToOption(MarkerOutline),
+                MarkerSymbol: Helpers.ToOption(MarkerSymbol),
                 MultiMarkerSymbol: Helpers.ToOption(MultiMarkerSymbol),
-                Marker: Marker,
-                LineColor: LineColor,
-                LineColorScale: LineColorScale,
-                LineWidth: LineWidth,
-                LineDash: LineDash,
-                Line: Line,
-                StackGroup: StackGroup,
-                Orientation: Orientation,
-                GroupNorm: GroupNorm,
-                Fill: Fill,
-                FillColor: FillColor,
-                UseWebGL: UseWebGL,
-                UseDefaults: UseDefaults
+                Marker: Helpers.ToOption(Marker),
+                LineColor: Helpers.ToOption(LineColor),
+                LineColorScale: Helpers.ToOption(LineColorScale),
+                LineWidth: Helpers.ToOption(LineWidth),
+                LineDash: Helpers.ToOption(LineDash),
+                Line: Helpers.ToOption(Line),
+                StackGroup: Helpers.ToOption(StackGroup),
+                Orientation: Helpers.ToOption(Orientation),
+                GroupNorm: Helpers.ToOption(GroupNorm),
+                Fill: Helpers.ToOption(Fill),
+                FillColor: Helpers.ToOption(FillColor),
+                UseWebGL: Helpers.ToOption(UseWebGL),
+                UseDefaults: Helpers.ToOption(UseDefaults)
             );
     };
 }

src/Plotly.NET.CSharp/Helpers.cs

@@ -10,5 +10,9 @@ namespace Plotly.NET.CSharp
 {
     static class Helpers {
         static internal Microsoft.FSharp.Core.FSharpOption<T> ToOption<T>(this T? thing) => thing is null ? Microsoft.FSharp.Core.FSharpOption<T>.None : new(thing);
+        static internal Microsoft.FSharp.Core.FSharpOption<bool> ToOption(this bool? thing) => thing is null ? Microsoft.FSharp.Core.FSharpOption<bool>.None : new((bool)thing);
+        static internal Microsoft.FSharp.Core.FSharpOption<string> ToOption(this string? thing) => thing is null ? Microsoft.FSharp.Core.FSharpOption<string>.None : new((string)thing);
+        static internal Microsoft.FSharp.Core.FSharpOption<double> ToOption(this double? thing) => thing is null ? Microsoft.FSharp.Core.FSharpOption<double>.None : new((double)thing);
+        static internal Microsoft.FSharp.Core.FSharpOption<int> ToOption(this int? thing) => thing is null ? Microsoft.FSharp.Core.FSharpOption<int>.None : new((int)thing);
     }
 }

tests/Plotly.NET.Tests.CSharpConsole/Program.cs

@@ -9,11 +9,17 @@ class Program
     {
         static void Main(string[] args)
         {
-            Plotly.NET.CSharp.ChartAPI.Chart2D.Scatter(
+            Plotly.NET.CSharp.ChartAPI.Chart2D.Scatter<int,int,string>(
                 x: new int [] { 1, 2 },
                 y: new int [] { 1, 2 },
                 mode: StyleParam.Mode.Markers
-            );
+            ).Show();
+
+            Chart2D.Chart.Scatter<int,int,string> (
+                x: new int[] { 1, 2 },
+                y: new int[] { 1, 2 },
+                mode: StyleParam.Mode.Markers
+            ).Show();
         }
         static void Main2(string[] args)
         {