Fix heatmap tests, add annotated heatmap tests

Author: kMutagene

src/Plotly.NET/Playground.fsx

@@ -184,7 +184,8 @@ Chart.AnnotatedHeatmap(
     ],
     X = ["C1";"C2";"C3"],
     Y = ["R1";"R2";"R3"],
-    ReverseYAxis = true
+    ReverseYAxis = true,
+    UseDefaults = false
 )
 |> Chart.show
 
@@ -783,7 +784,7 @@ let seq2 = [1 ..4 ] |> Seq.map(fun _-> z1) |> Seq.toArray
 let marker = Marker.init(Size= 25,Colorscale=StyleParam.Colorscale.Viridis, ShowScale=false);
 
 let heatmap1=
-           Chart.Heatmap(data=seq1)
+           Chart.Heatmap(zData=seq1)
            |> Chart.withMarker(marker)
            |> Chart.withColorAxisAnchor(1)
 
@@ -800,7 +801,7 @@ let heatmap2=
 [
     Chart.Point([1,2; 2,3])
     Chart.PointTernary([1,2,3; 2,3,4])
-    Chart.Heatmap([[1; 2];[3; 4]], Showscale=false)
+    Chart.Heatmap([[1; 2];[3; 4]], ShowScale=false)
     Chart.Point3d([1,3,2])
     Chart.PointMapbox([1,2]) |> Chart.withMapbox(Mapbox.init(Style = StyleParam.MapboxStyle.OpenStreetMap))
     [

tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs

@@ -162,7 +162,7 @@ let multiTraceGrid =
     [
         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.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))
         [
@@ -181,7 +181,7 @@ 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.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))
         [

tests/Plotly.NET.Tests/HtmlCodegen/SimpleCharts.fs

@@ -468,8 +468,8 @@ let heatmap1Chart =
 
     Chart.Heatmap(
         matrix,colnames,rownames,
-        Colorscale=colorscaleValue,
-        Showscale=true, 
+        ColorScale=colorscaleValue,
+        ShowScale=true, 
         UseDefaults = false
     )
     |> Chart.withSize(700,500)
@@ -489,8 +489,8 @@ let heatmapStyledChart =
 
     Chart.Heatmap(
         matrix,colnames,rownames,
-        Colorscale=colorscaleValue,
-        Showscale=true, 
+        ColorScale=colorscaleValue,
+        ShowScale=true, 
         UseDefaults = false
     )
     |> Chart.withSize(700.,500.)
@@ -501,26 +501,51 @@ let heatmapStyledChart =
         )
     )
 
+let annotatedheatmap = 
+    Chart.AnnotatedHeatmap(
+        zData = [
+            [1..5]
+            [6..10]
+            [11..15]
+        ],
+        annotationText = [
+            ["1,1";"1,2";"1,3"]
+            ["2,1";"2,2";"2,3"]
+            ["3,1";"3,2";"3,3"]
+        ],
+        X = ["C1";"C2";"C3"],
+        Y = ["R1";"R2";"R3"],
+        ReverseYAxis = true,
+        UseDefaults = false
+    )
 
 [<Tests>]
 let ``Heatmap charts`` =
     testList "SimpleCharts.Heatmap charts" [
         testCase "Heatmap data" ( fun () ->
-            "var data = [{\"type\":\"heatmap\",\"z\":[[1.0,1.5,0.7,2.7],[2.0,0.5,1.2,1.4],[0.1,2.6,2.4,3.0]],\"x\":[\"Tp0\",\"Tp30\",\"Tp60\",\"Tp160\"],\"y\":[\"p3\",\"p2\",\"p1\"],\"colorscale\":[[0.0,\"#3D9970\"],[1.0,\"#001f3f\"]],\"showscale\":true}];"
+            """var data = [{"type":"heatmap","x":["Tp0","Tp30","Tp60","Tp160"],"y":["p3","p2","p1"],"z":[[1.0,1.5,0.7,2.7],[2.0,0.5,1.2,1.4],[0.1,2.6,2.4,3.0]],"colorscale":[[0.0,"#3D9970"],[1.0,"#001f3f"]],"showscale":true}];"""
             |> chartGeneratedContains heatmap1Chart
         );
         testCase "Heatmap layout" ( fun () ->
             "var layout = {\"width\":700,\"height\":500,\"margin\":{\"l\":200.0}};"
             |> chartGeneratedContains heatmap1Chart
         );
         testCase "Heatmap styled data" ( fun () ->
-            """var data = [{"type":"heatmap","z":[[1.0,1.5,0.7,2.7],[2.0,0.5,1.2,1.4],[0.1,2.6,2.4,3.0]],"x":["Tp0","Tp30","Tp60","Tp160"],"y":["p3","p2","p1"],"colorscale":[[0.0,"#3D9970"],[1.0,"#001f3f"]],"showscale":true,"colorbar":{"title":{"text":"Im the Colorbar"}}}]"""
+            """var data = [{"type":"heatmap","x":["Tp0","Tp30","Tp60","Tp160"],"y":["p3","p2","p1"],"z":[[1.0,1.5,0.7,2.7],[2.0,0.5,1.2,1.4],[0.1,2.6,2.4,3.0]],"colorscale":[[0.0,"#3D9970"],[1.0,"#001f3f"]],"showscale":true,"colorbar":{"title":{"text":"Im the Colorbar"}}}];"""
             |> chartGeneratedContains heatmapStyledChart
         );
         testCase "Heatmap styled layout" ( fun () ->
             "var layout = {\"width\":700,\"height\":500,\"margin\":{\"l\":200.0}};"
             |> chartGeneratedContains heatmapStyledChart
         );
+        testCase "Annotated heatmap data" ( fun () ->
+            """var data = [{"type":"heatmap","x":["C1","C2","C3"],"y":["R1","R2","R3"],"z":[[1,2,3,4,5],[6,7,8,9,10],[11,12,13,14,15]]}];"""
+            |> chartGeneratedContains annotatedheatmap
+        );
+        testCase "Annotated heatmap layout" ( fun () ->
+            """var layout = {"yaxis":{"autorange":"reversed"},"annotations":[{"x":0,"y":0,"showarrow":false,"text":"1,1"},{"x":1,"y":0,"showarrow":false,"text":"1,2"},{"x":2,"y":0,"showarrow":false,"text":"1,3"},{"x":0,"y":1,"showarrow":false,"text":"2,1"},{"x":1,"y":1,"showarrow":false,"text":"2,2"},{"x":2,"y":1,"showarrow":false,"text":"2,3"},{"x":0,"y":2,"showarrow":false,"text":"3,1"},{"x":1,"y":2,"showarrow":false,"text":"3,2"},{"x":2,"y":2,"showarrow":false,"text":"3,3"}]};"""
+            |> chartGeneratedContains annotatedheatmap
+        );
     ]