Add XML docs for all Chart2D functions, add convenience constructors, fix small param errors and typos

kMutagene · kMutagene · commit d011f56a1db1 · 2021-12-19T19:25:10.000+01:00
diff --git a/src/Plotly.NET/ChartAPI/Chart2D.fs b/src/Plotly.NET/ChartAPI/Chart2D.fs
diff --git a/src/Plotly.NET/Playground.fsx b/src/Plotly.NET/Playground.fsx
@@ -176,65 +176,40 @@ open Plotly.NET
 open System
 open Plotly.NET 
 
-let simpleAreaChart =
-    let x  = [1.; 2.; 3.; 4.; 5.; 6.; 7.; 8.; 9.; 10.; ]
-    let y  = [5.; 2.5; 5.; 7.5; 5.; 2.5; 7.5; 4.5; 5.5; 5.]
-    Chart.Area(x,y, UseDefaults = false)
-    |> Chart.show
-
-let withSplineChart =
-    let x  = [1.; 2.; 3.; 4.; 5.; 6.; 7.; 8.; 9.; 10.; ]
-    let y  = [5.; 2.5; 5.; 7.5; 5.; 2.5; 7.5; 4.5; 5.5; 5.]
-    Chart.SplineArea(x,y, UseDefaults = false)
-    |> Chart.show
-
-let stackedAreaChart =
-    let x  = [1.; 2.; 3.; 4.; 5.; 6.; 7.; 8.; 9.; 10.; ]
-    let y  = [5.; 2.5; 5.; 7.5; 5.; 2.5; 7.5; 4.5; 5.5; 5.]
+let multiTraceGrid = 
     [
-        Chart.StackedArea(x,y, UseDefaults = false)
-        Chart.StackedArea(x,y |> Seq.rev, UseDefaults = false)
+        Chart.Point([1,2; 2,3], UseDefaults = false)
+        Chart.PointTernary([1,2,3; 2,3,4], UseDefaults = false)
+        Chart.Heatmap([[1; 2];[3; 4]], ShowScale=false, UseDefaults = false)
+        Chart.Point3D([1,3,2], UseDefaults = false)
+        Chart.PointMapbox([1,2], UseDefaults = false) |> Chart.withMapbox(Mapbox.init(Style = StyleParam.MapboxStyle.OpenStreetMap))
+        [
+            // you can use nested combined charts, but they have to have the same trace type (Cartesian2D in this case)
+            let y =  [2.; 1.5; 5.; 1.5; 2.; 2.5; 2.1; 2.5; 1.5; 1.;2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
+            Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
+            Chart.BoxPlot("y'",y,Name="bin2",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
+        ]
+        |> Chart.combine
     ]
-    |> Chart.combine
+    |> Chart.Grid(2,3)
+    |> Chart.withSize(1000,1000)
     |> Chart.show
 
-[
-    Chart.StackedArea(
-        [1,2; 3,7; 5,6],
-        MultiText = ["A"; "B"; "C"],
-        ShowMarkers = true,
-        MultiTextPosition = [StyleParam.TextPosition.MiddleRight; StyleParam.TextPosition.BottomRight; StyleParam.TextPosition.MiddleLeft],
-        MarkerColor = Color.fromColorScaleValues [2;7;6],
-        Marker = Marker.init(Size = 30, ShowScale = true)
-    )
-    Chart.StackedArea(
-        [1,2; 3,7; 5,6],
-        MultiText = ["A"; "B"; "C"],
-        ShowMarkers = true,
-        MultiTextPosition = [StyleParam.TextPosition.MiddleRight; StyleParam.TextPosition.BottomRight; StyleParam.TextPosition.MiddleLeft],
-        MarkerColor = Color.fromColorScaleValues [2;7;6],
-        Marker = Marker.init(Size = 30, ShowScale = true)
-    )
-
-]
-|> Chart.combine
-|> Chart.show
-
-
-
-Chart.Indicator(
-    200., StyleParam.IndicatorMode.NumberDeltaGauge,
-    Title = "Angular gauge",
-    Delta = IndicatorDelta.init(Reference=160),
-    Range = StyleParam.Range.MinMax(0., 250.),
-    Domain = Domain.init(Row = 0, Column = 1),
-    Gauge = IndicatorGauge.init(
-        Bar = IndicatorBar.init(Color = Color.fromKeyword Black),
-        Steps = [
-            IndicatorStep.init(Range = StyleParam.Range.MinMax(0., 150.), Color = Color.fromKeyword Green)
-            IndicatorStep.init(Range = StyleParam.Range.MinMax(150., 200.), Color = Color.fromKeyword Yellow)
-        ],
-        Threshold = IndicatorThreshold.init(Value = 200., Line = Line.init(Color=Color.fromKeyword Red, Width = 20.))
-    )
-)
-|> Chart.show
+let multiTraceSingleStack = 
+    [
+        Chart.Point([1,2; 2,3], UseDefaults = false)
+        Chart.PointTernary([1,2,3; 2,3,4], UseDefaults = false)
+        Chart.Heatmap([[1; 2];[3; 4]], ShowScale=false, UseDefaults = false)
+        Chart.Point3D([1,3,2], UseDefaults = false)
+        Chart.PointMapbox([1,2], UseDefaults = false) |> Chart.withMapbox(Mapbox.init(Style = StyleParam.MapboxStyle.OpenStreetMap))
+        [
+            // you can use nested combined charts, but they have to have the same trace type (Cartesian2D in this case)
+            let y =  [2.; 1.5; 5.; 1.5; 2.; 2.5; 2.1; 2.5; 1.5; 1.;2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
+            Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
+            Chart.BoxPlot("y'",y,Name="bin2",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
+        ]
+        |> Chart.combine
+    ]
+    |> Chart.SingleStack()
+    |> Chart.withSize(1000,1000)
+    |> Chart.show
diff --git a/src/Plotly.NET/Traces/ObjectAbstractions/FunnelConnector.fs b/src/Plotly.NET/Traces/ObjectAbstractions/FunnelConnector.fs
@@ -20,22 +20,22 @@ type FunnelConnector() =
 
     static member init
         (
-            [<Optional; DefaultParameterValue(null)>] ?Fillcolor: Color,
+            [<Optional; DefaultParameterValue(null)>] ?FillColor: Color,
             [<Optional; DefaultParameterValue(null)>] ?Line: Line,
             [<Optional; DefaultParameterValue(null)>] ?Visible: bool
         ) =
 
-        FunnelConnector() |> FunnelConnector.style (?Fillcolor = Fillcolor, ?Line = Line, ?Visible = Visible)
+        FunnelConnector() |> FunnelConnector.style (?FillColor = FillColor, ?Line = Line, ?Visible = Visible)
 
     static member style
         (
-            [<Optional; DefaultParameterValue(null)>] ?Fillcolor: Color,
+            [<Optional; DefaultParameterValue(null)>] ?FillColor: Color,
             [<Optional; DefaultParameterValue(null)>] ?Line: Line,
             [<Optional; DefaultParameterValue(null)>] ?Visible: bool
         ) =
         (fun (connector: FunnelConnector) ->
 
-            Fillcolor |> DynObj.setValueOpt connector "fillcolor"
+            FillColor |> DynObj.setValueOpt connector "fillcolor"
             Line |> DynObj.setValueOpt connector "line"
             Visible |> DynObj.setValueOpt connector "visible"
 
diff --git a/src/Plotly.NET/Traces/Trace2D.fs b/src/Plotly.NET/Traces/Trace2D.fs
@@ -668,7 +668,7 @@ type Trace2DStyle() =
             )
 
     /// <summary>
-    /// Create a function that applies the styles of a funnel plot to a Trace object
+    /// Create a function that applies the styles of a waterfall plot to a Trace object
     /// </summary>
     /// <param name="Name">Sets the trace name. The trace name appear as the legend item and on hover.</param>
     /// <param name="Visible">Determines whether or not this trace is visible. If "legendonly", the trace is not drawn, but can appear as a legend item (provided that the legend itself is visible).</param>
@@ -1053,7 +1053,7 @@ type Trace2DStyle() =
     /// <param name="BoxPoints">If "outliers", only the sample points lying outside the whiskers are shown If "suspectedoutliers", the outlier points are shown and points either less than 4"Q1-3"Q3 or greater than 4"Q3-3"Q1 are highlighted (see `outliercolor`) If "all", all sample points are shown If "false", only the box(es) are shown with no sample points Defaults to "suspectedoutliers" when `marker.outliercolor` or `marker.line.outliercolor` is set. Defaults to "all" under the q1/median/q3 signature. Otherwise defaults to "outliers".</param>
     /// <param name="Notched">Determines whether or not notches are drawn. Notches displays a confidence interval around the median. We compute the confidence interval as median +/- 1.57 " IQR / sqrt(N), where IQR is the interquartile range and N is the sample size. If two boxes' notches do not overlap there is 95% confidence their medians differ. See https://sites.google.com/site/davidsstatistics/home/notched-box-plots for more info. Defaults to "false" unless `notchwidth` or `notchspan` is set.</param>
     /// <param name="NotchWidth">Sets the width of the notches relative to the box' width. For example, with 0, the notches are as wide as the box(es).</param>
-    /// <param name="Whiskerwidth">Sets the width of the whiskers relative to the box' width. For example, with 1, the whiskers are as wide as the box(es).</param>
+    /// <param name="WhiskerWidth">Sets the width of the whiskers relative to the box' width. For example, with 1, the whiskers are as wide as the box(es).</param>
     /// <param name="Q1">Sets the Quartile 1 values. There should be as many items as the number of boxes desired.</param>
     /// <param name="Median">Sets the Quartile 1 values. There should be as many items as the number of boxes desired.</param>
     /// <param name="Q3">Sets the Quartile 3 values. There should be as many items as the number of boxes desired.</param>
@@ -1119,7 +1119,7 @@ type Trace2DStyle() =
             [<Optional; DefaultParameterValue(null)>] ?BoxPoints: StyleParam.BoxPoints,
             [<Optional; DefaultParameterValue(null)>] ?Notched: bool,
             [<Optional; DefaultParameterValue(null)>] ?NotchWidth: float,
-            [<Optional; DefaultParameterValue(null)>] ?Whiskerwidth: float,
+            [<Optional; DefaultParameterValue(null)>] ?WhiskerWidth: float,
             [<Optional; DefaultParameterValue(null)>] ?Q1: seq<IConvertible>,
             [<Optional; DefaultParameterValue(null)>] ?Median: seq<IConvertible>,
             [<Optional; DefaultParameterValue(null)>] ?Q3: seq<IConvertible>,
@@ -1183,7 +1183,7 @@ type Trace2DStyle() =
             BoxPoints |> DynObj.setValueOptBy boxPlot "boxpoints" StyleParam.BoxPoints.convert
             Notched |> DynObj.setValueOpt boxPlot "notched"
             NotchWidth |> DynObj.setValueOpt boxPlot "notchwidth"
-            Whiskerwidth |> DynObj.setValueOpt boxPlot "whiskerwidth"
+            WhiskerWidth |> DynObj.setValueOpt boxPlot "whiskerwidth"
             Q1 |> DynObj.setValueOpt boxPlot "q1"
             Median |> DynObj.setValueOpt boxPlot "median"
             Q3 |> DynObj.setValueOpt boxPlot "q3"
diff --git a/tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs b/tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs
@@ -210,7 +210,7 @@ let ``Multicharts and subplots`` =
             |> chartGeneratedContains subPlotChart
         );        
         testCase "MultiTrace Subplot grid data" ( fun () ->
-            """var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary2"},{"type":"heatmap","z":[[1,2],[3,4]],"showscale":false,"xaxis":"x3","yaxis":"y3"},{"type":"scatter3d","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"subplot":"mapbox5"},{"type":"box","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"name":"bin1","marker":{},"xaxis":"x6","yaxis":"y6"},{"type":"box","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"name":"bin2","marker":{},"xaxis":"x6","yaxis":"y6"}];"""
+            """var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary2"},{"type":"heatmap","z":[[1,2],[3,4]],"showscale":false,"xaxis":"x3","yaxis":"y3"},{"type":"scatter3d","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"subplot":"mapbox5"},{"type":"box","name":"bin1","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"},{"type":"box","name":"bin2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"}];"""
             |> chartGeneratedContains multiTraceGrid
         );
         testCase "MultiTrace Subplot grid layout" ( fun () ->
@@ -227,7 +227,7 @@ let ``Multicharts and subplots`` =
         );        
         
         testCase "MultiTrace Single Stack data" ( fun () -> 
-            """var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary2"},{"type":"heatmap","z":[[1,2],[3,4]],"showscale":false,"xaxis":"x3","yaxis":"y3"},{"type":"scatter3d","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"subplot":"mapbox5"},{"type":"box","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"name":"bin1","marker":{},"xaxis":"x6","yaxis":"y6"},{"type":"box","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"name":"bin2","marker":{},"xaxis":"x6","yaxis":"y6"}];"""
+            """var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary2"},{"type":"heatmap","z":[[1,2],[3,4]],"showscale":false,"xaxis":"x3","yaxis":"y3"},{"type":"scatter3d","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"subplot":"mapbox5"},{"type":"box","name":"bin1","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"},{"type":"box","name":"bin2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"}];"""
             |> chartGeneratedContains multiTraceSingleStack
         );
         testCase "MultiTrace Single Stack layout" ( fun () -> 
diff --git a/tests/Plotly.NET.Tests/HtmlCodegen/DistributionCharts.fs b/tests/Plotly.NET.Tests/HtmlCodegen/DistributionCharts.fs
@@ -46,30 +46,30 @@ let box3Chart =
     let y =  [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
     let y' =  [2.; 1.5; 5.; 1.5; 2.; 2.5; 2.1; 2.5; 1.5; 1.;2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
     [
-        Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
-        Chart.BoxPlot("y'",y',Name="bin2",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
+        Chart.BoxPlot(data = y , orientation = StyleParam.Orientation.Horizontal, Name="bin1",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
+        Chart.BoxPlot(data = y', orientation = StyleParam.Orientation.Horizontal, Name="bin2",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All, UseDefaults = false);
     ]
     |> Chart.combine
 
 [<Tests>]
 let ``Box charts`` =
     testList "DistributionCharts.Box charts" [
         testCase "Box1 data" ( fun () ->
-            """var data = [{"type":"box","x":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"y":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"marker":{}}];"""
+            """var data = [{"type":"box","x":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"y":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1}];"""
             |> chartGeneratedContains box1Chart
         );
         testCase "Box1 layout" ( fun () ->
             emptyLayout box1Chart
         );
         testCase "Box2 data" ( fun () ->
-            """var data = [{"type":"box","x":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"y":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"orientation":"h","boxpoints":"all","jitter":0.1,"marker":{}}];"""
+            """var data = [{"type":"box","x":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"y":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"orientation":"h","marker":{},"line":{},"boxpoints":"all","jitter":0.1}];"""
             |> chartGeneratedContains box2Chart
         );
         testCase "Box2 layout" ( fun () ->
             emptyLayout box2Chart
         );
         testCase "Box3 data" ( fun () ->
-            """ar data = [{"type":"box","x":"y","y":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"name":"bin1","marker":{}},{"type":"box","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"boxpoints":"all","jitter":0.1,"name":"bin2","marker":{}}];"""
+            """var data = [{"type":"box","name":"bin1","marker":{},"line":{},"boxpoints":"all","jitter":0.1,"x":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0]},{"type":"box","name":"bin2","marker":{},"line":{},"boxpoints":"all","jitter":0.1,"x":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0]}];"""
             |> chartGeneratedContains box3Chart
         );
         testCase "Box3 layout" ( fun () ->
@@ -103,30 +103,30 @@ let violin3Chart =
     let y =  [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
     let y' =  [2.; 1.5; 5.; 1.5; 2.; 2.5; 2.1; 2.5; 1.5; 1.;2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
     [
-        Chart.Violin ("y" ,y,Name="bin1",Jitter=0.1,Points=StyleParam.JitterPoints.All, UseDefaults = false);
-        Chart.Violin ("y'",y',Name="bin2",Jitter=0.1,Points=StyleParam.JitterPoints.All, UseDefaults = false);
+        Chart.Violin (data = y , orientation = StyleParam.Orientation.Horizontal, Name="bin1",Jitter=0.1,Points=StyleParam.BoxPoints.All, UseDefaults = false)
+        Chart.Violin (data = y', orientation = StyleParam.Orientation.Horizontal, Name="bin2",Jitter=0.1,Points=StyleParam.BoxPoints.All, UseDefaults = false)
     ]
     |> Chart.combine
 
 [<Tests>]
 let ``Violin charts`` =
     testList "DistributionCharts.Violin charts" [
         testCase "Violin1 data" ( fun () ->
-            """var data = [{"type":"violin","x":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"y":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"box":{},"points":"all","marker":{}}];"""
+            """var data = [{"type":"violin","x":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"y":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"box":{},"points":"all"}];"""
             |> chartGeneratedContains violin1Chart
         );
         testCase "Violin1 layout" ( fun () ->
             emptyLayout violin1Chart
         );
         testCase "Violin2 data" ( fun () ->
-            """var data = [{"type":"violin","x":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"y":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"orientation":"h","box":{},"jitter":0.1,"meanline":{"visible":true},"points":"all","marker":{}}];"""
+            """var data = [{"type":"violin","x":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"y":["bin1","bin2","bin1","bin2","bin1","bin2","bin1","bin1","bin2","bin1"],"orientation":"h","marker":{},"line":{},"box":{},"jitter":0.1,"meanline":{"visible":true},"points":"all"}];"""
             |> chartGeneratedContains violin2Chart
         );
         testCase "Violin2 layout" ( fun () ->
             emptyLayout violin2Chart
         );
         testCase "Violin3 data" ( fun () ->
-            """var data = [{"type":"violin","name":"bin1","x":"y","y":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"box":{},"jitter":0.1,"points":"all","marker":{}},{"type":"violin","name":"bin2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"box":{},"jitter":0.1,"points":"all","marker":{}}];"""
+            """var data = [{"type":"violin","name":"bin1","marker":{},"line":{},"box":{},"jitter":0.1,"points":"all","x":[2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0]},{"type":"violin","name":"bin2","marker":{},"line":{},"box":{},"jitter":0.1,"points":"all","x":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0]}];"""
             |> chartGeneratedContains violin3Chart
         );
         testCase "Violin3 layout" ( fun () ->
@@ -193,7 +193,7 @@ let histogramContourChart =
     let x = Array.init n (fun i -> ((step i)**3.) + (0.3 * (normal (rnd) 0. 2.) ))
     let y = Array.init n (fun i -> ((step i)**6.) + (0.3 * (normal (rnd) 0. 2.) ))
     [
-        Chart.Histogram2DContour (x,y,Line=Line.init(Width=0.), UseDefaults = false)
+        Chart.Histogram2DContour (x,y,ContourLine=Line.init(Width=0.), UseDefaults = false)
         Chart.Point(x,y,Opacity=0.3, UseDefaults = false)
     ]
     |> Chart.combine
