Skip to content

Commit eb00fc0

Browse files
kMutagenekMutagene
committed
Fix tests, some violin props
1 parent f998402 commit eb00fc0

File tree

5 files changed

+102
-69
lines changed

5 files changed

+102
-69
lines changed

‎src/Plotly.NET/ChartAPI/Chart2D.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ module Chart2D =
16031603
[<Optional;DefaultParameterValue(null)>] ?ShowLegend : bool,
16041604
[<Optional;DefaultParameterValue(null)>] ?FillColor : Color,
16051605
[<Optional;DefaultParameterValue(null)>] ?Opacity : float,
1606-
[<Optional;DefaultParameterValue(null)>] ?Points : StyleParam.BoxPoints,
1606+
[<Optional;DefaultParameterValue(null)>] ?Points : StyleParam.JitterPoints,
16071607
[<Optional;DefaultParameterValue(null)>] ?Jitter : float,
16081608
[<Optional;DefaultParameterValue(null)>] ?PointPos : float,
16091609
[<Optional;DefaultParameterValue(null)>] ?Orientation : StyleParam.Orientation,
@@ -1678,7 +1678,7 @@ module Chart2D =
16781678
[<Optional;DefaultParameterValue(null)>] ?ShowLegend : bool,
16791679
[<Optional;DefaultParameterValue(null)>] ?FillColor : Color,
16801680
[<Optional;DefaultParameterValue(null)>] ?Opacity : float,
1681-
[<Optional;DefaultParameterValue(null)>] ?Points : StyleParam.BoxPoints,
1681+
[<Optional;DefaultParameterValue(null)>] ?Points : StyleParam.JitterPoints,
16821682
[<Optional;DefaultParameterValue(null)>] ?Jitter : float,
16831683
[<Optional;DefaultParameterValue(null)>] ?PointPos : float,
16841684
[<Optional;DefaultParameterValue(null)>] ?Orientation : StyleParam.Orientation,

‎src/Plotly.NET/Playground.fsx‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#load "WaterfallConnector.fs"
8888
#load "FunnelConnector.fs"
8989
#load "Box.fs"
90-
#load "Meanline.fs"
90+
#load "MeanLine.fs"
9191
#load "Bins.fs"
9292
#load "Cumulative.fs"
9393
#load "Error.fs"
@@ -161,6 +161,39 @@ open FSharpAux
161161
open System
162162
open System.IO
163163

164+
165+
let violin1Chart =
166+
let y = [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
167+
let x = ["bin1";"bin2";"bin1";"bin2";"bin1";"bin2";"bin1";"bin1";"bin2";"bin1"]
168+
Chart.Violin (
169+
x,y,
170+
Points=StyleParam.JitterPoints.All
171+
)
172+
173+
let violin2Chart =
174+
let x = [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
175+
let y = ["bin1";"bin2";"bin1";"bin2";"bin1";"bin2";"bin1";"bin1";"bin2";"bin1"]
176+
Chart.Violin(
177+
x,y,
178+
Jitter=0.1,
179+
Points=StyleParam.JitterPoints.All,
180+
Orientation=StyleParam.Orientation.Horizontal,
181+
MeanLine=MeanLine.init(Visible=true)
182+
)
183+
184+
let violin3Chart =
185+
let y = [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
186+
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.]
187+
[
188+
Chart.Violin ("y" ,y,Name="bin1",Jitter=0.1,Points=StyleParam.JitterPoints.All);
189+
Chart.Violin ("y'",y',Name="bin2",Jitter=0.1,Points=StyleParam.JitterPoints.All);
190+
]
191+
|> Chart.combine
192+
193+
violin1Chart |> Chart.show
194+
violin2Chart |> Chart.show
195+
violin3Chart |> Chart.show
196+
164197
let character = ["Eve"; "Cain"; "Seth"; "Enos"; "Noam"; "Abel"; "Awan"; "Enoch"; "Azura"]
165198
let parent = [""; "Eve"; "Eve"; "Seth"; "Seth"; "Eve"; "Eve"; "Awan"; "Eve" ]
166199

‎src/Plotly.NET/Traces/Trace2D.fs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ type Trace2DStyle() =
777777
[<Optional;DefaultParameterValue(null)>] ?PointPos : float,
778778
[<Optional;DefaultParameterValue(null)>] ?Jitter : float,
779779
[<Optional;DefaultParameterValue(null)>] ?MeanLine : MeanLine,
780-
[<Optional;DefaultParameterValue(null)>] ?Points : StyleParam.BoxPoints,
780+
[<Optional;DefaultParameterValue(null)>] ?Points : StyleParam.JitterPoints,
781781
[<Optional;DefaultParameterValue(null)>] ?ScaleGroup : string,
782782
[<Optional;DefaultParameterValue(null)>] ?ScaleMode : StyleParam.ScaleMode,
783783
[<Optional;DefaultParameterValue(null)>] ?Side : StyleParam.ViolinSide,
@@ -788,54 +788,54 @@ type Trace2DStyle() =
788788
) =
789789
(fun (violin:('T :> Trace)) ->
790790

791-
Name |> DynObj.setValueOpt violin "Name"
792-
Visible |> DynObj.setValueOptBy violin "Visible" StyleParam.Visible.convert
793-
ShowLegend |> DynObj.setValueOpt violin "ShowLegend"
794-
LegendRank |> DynObj.setValueOpt violin "LegendRank"
795-
LegendGroup |> DynObj.setValueOpt violin "LegendGroup"
796-
LegendGroupTitle |> DynObj.setValueOpt violin "LegendGroupTitle"
797-
Opacity |> DynObj.setValueOpt violin "Opacity"
798-
Ids |> DynObj.setValueOpt violin "Ids"
799-
X |> DynObj.setValueOpt violin "X"
800-
X0 |> DynObj.setValueOpt violin "X0"
801-
DX |> DynObj.setValueOpt violin "DX"
802-
Y |> DynObj.setValueOpt violin "Y"
803-
Y0 |> DynObj.setValueOpt violin "Y0"
804-
DY |> DynObj.setValueOpt violin "DY"
805-
Width |> DynObj.setValueOpt violin "Width"
791+
Name |> DynObj.setValueOpt violin "name"
792+
Visible |> DynObj.setValueOptBy violin "visible" StyleParam.Visible.convert
793+
ShowLegend |> DynObj.setValueOpt violin "showlegend"
794+
LegendRank |> DynObj.setValueOpt violin "legendrank"
795+
LegendGroup |> DynObj.setValueOpt violin "legendgroup"
796+
LegendGroupTitle |> DynObj.setValueOpt violin "legendgrouptitle"
797+
Opacity |> DynObj.setValueOpt violin "opacity"
798+
Ids |> DynObj.setValueOpt violin "ids"
799+
X |> DynObj.setValueOpt violin "x"
800+
X0 |> DynObj.setValueOpt violin "x0"
801+
DX |> DynObj.setValueOpt violin "dx"
802+
Y |> DynObj.setValueOpt violin "y"
803+
Y0 |> DynObj.setValueOpt violin "y0"
804+
DY |> DynObj.setValueOpt violin "dy"
805+
Width |> DynObj.setValueOpt violin "width"
806806
(Text, MultiText) |> DynObj.setSingleOrMultiOpt violin "text"
807807
(HoverText, MultiHoverText) |> DynObj.setSingleOrMultiOpt violin "hovertext"
808808
HoverInfo |> DynObj.setValueOptBy violin "hoverinfo" StyleParam.HoverInfo.convert
809809
(HoverTemplate, MultiHoverTemplate) |> DynObj.setSingleOrMultiOpt violin "hovertemplate"
810-
XHoverFormat |> DynObj.setValueOpt violin "XHoverFormat"
811-
YHoverFormat |> DynObj.setValueOpt violin "YHoverFormat"
812-
Meta |> DynObj.setValueOpt violin "Meta"
813-
CustomData |> DynObj.setValueOpt violin "CustomData"
814-
XAxis |> DynObj.setValueOptBy violin "XAxis" StyleParam.LinearAxisId.convert
815-
YAxis |> DynObj.setValueOptBy violin "YAxis" StyleParam.LinearAxisId.convert
816-
Orientation |> DynObj.setValueOptBy violin "Orientation" StyleParam.Orientation.convert
817-
AlignmentGroup |> DynObj.setValueOpt violin "AlignmentGroup"
818-
OffsetGroup |> DynObj.setValueOpt violin "OffsetGroup"
819-
Marker |> DynObj.setValueOpt violin "Marker"
820-
Line |> DynObj.setValueOpt violin "Line"
821-
Box |> DynObj.setValueOpt violin "Box"
822-
SelectedPoints |> DynObj.setValueOpt violin "SelectedPoints"
823-
Selected |> DynObj.setValueOpt violin "Selected"
824-
Unselected |> DynObj.setValueOpt violin "Unselected"
825-
BandWidth |> DynObj.setValueOpt violin "BandWidth"
826-
FillColor |> DynObj.setValueOpt violin "FillColor"
827-
HoverLabel |> DynObj.setValueOpt violin "HoverLabel"
828-
HoverOn |> DynObj.setValueOptBy violin "HoverOn" StyleParam.HoverOn.convert
829-
PointPos |> DynObj.setValueOpt violin "PointPos"
830-
Jitter |> DynObj.setValueOpt violin "Jitter"
831-
MeanLine |> DynObj.setValueOpt violin "MeanLine"
832-
Points |> DynObj.setValueOptBy violin "Points" StyleParam.BoxPoints.convert
833-
ScaleGroup |> DynObj.setValueOpt violin "ScaleGroup"
834-
ScaleMode |> DynObj.setValueOptBy violin "ScaleMode" StyleParam.ScaleMode.convert
835-
Side |> DynObj.setValueOptBy violin "Side" StyleParam.ViolinSide.convert
836-
Span |> DynObj.setValueOptBy violin "Span" StyleParam.Range.convert
837-
SpanMode |> DynObj.setValueOptBy violin "SpanMode" StyleParam.SpanMode.convert
838-
UIRevision |> DynObj.setValueOpt violin "UIRevision"
810+
XHoverFormat |> DynObj.setValueOpt violin "xhoverformat"
811+
YHoverFormat |> DynObj.setValueOpt violin "yhoverformat"
812+
Meta |> DynObj.setValueOpt violin "meta"
813+
CustomData |> DynObj.setValueOpt violin "customdata"
814+
XAxis |> DynObj.setValueOptBy violin "xaxis" StyleParam.LinearAxisId.convert
815+
YAxis |> DynObj.setValueOptBy violin "yaxis" StyleParam.LinearAxisId.convert
816+
Orientation |> DynObj.setValueOptBy violin "orientation" StyleParam.Orientation.convert
817+
AlignmentGroup |> DynObj.setValueOpt violin "alignmentgroup"
818+
OffsetGroup |> DynObj.setValueOpt violin "offsetgroup"
819+
Marker |> DynObj.setValueOpt violin "marker"
820+
Line |> DynObj.setValueOpt violin "line"
821+
Box |> DynObj.setValueOpt violin "box"
822+
SelectedPoints |> DynObj.setValueOpt violin "selectedpoints"
823+
Selected |> DynObj.setValueOpt violin "selected"
824+
Unselected |> DynObj.setValueOpt violin "unselected"
825+
BandWidth |> DynObj.setValueOpt violin "bandwidth"
826+
FillColor |> DynObj.setValueOpt violin "fillcolor"
827+
HoverLabel |> DynObj.setValueOpt violin "hoverlabel"
828+
HoverOn |> DynObj.setValueOptBy violin "hoveron" StyleParam.HoverOn.convert
829+
PointPos |> DynObj.setValueOpt violin "pointpos"
830+
Jitter |> DynObj.setValueOpt violin "jitter"
831+
MeanLine |> DynObj.setValueOpt violin "meanline"
832+
Points |> DynObj.setValueOptBy violin "points" StyleParam.JitterPoints.convert
833+
ScaleGroup |> DynObj.setValueOpt violin "scalegroup"
834+
ScaleMode |> DynObj.setValueOptBy violin "scalemode" StyleParam.ScaleMode.convert
835+
Side |> DynObj.setValueOptBy violin "side" StyleParam.ViolinSide.convert
836+
Span |> DynObj.setValueOptBy violin "span" StyleParam.Range.convert
837+
SpanMode |> DynObj.setValueOptBy violin "spanmode" StyleParam.SpanMode.convert
838+
UIRevision |> DynObj.setValueOpt violin "uirevision"
839839

840840
violin
841841
)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ let multiTraceGrid =
168168
[
169169
// you can use nested combined charts, but they have to have the same trace type (Cartesian2D in this case)
170170
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.]
171-
Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,Boxpoints=StyleParam.Boxpoints.All);
172-
Chart.BoxPlot("y'",y,Name="bin2",Jitter=0.1,Boxpoints=StyleParam.Boxpoints.All);
171+
Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All);
172+
Chart.BoxPlot("y'",y,Name="bin2",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All);
173173
]
174174
|> Chart.combine
175175
]
@@ -187,8 +187,8 @@ let multiTraceSingleStack =
187187
[
188188
// you can use nested combined charts, but they have to have the same trace type (Cartesian2D in this case)
189189
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.]
190-
Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,Boxpoints=StyleParam.Boxpoints.All);
191-
Chart.BoxPlot("y'",y,Name="bin2",Jitter=0.1,Boxpoints=StyleParam.Boxpoints.All);
190+
Chart.BoxPlot("y" ,y,Name="bin1",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All);
191+
Chart.BoxPlot("y'",y,Name="bin2",Jitter=0.1,BoxPoints=StyleParam.BoxPoints.All);
192192
]
193193
|> Chart.combine
194194
]
@@ -211,7 +211,7 @@ let ``Multicharts and subplots`` =
211211
|> chartGeneratedContains subPlotChart
212212
);
213213
testCase "MultiTrace Subplot grid data" ( fun () ->
214-
"""var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"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],"line":{},"marker":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lon":[1],"lat":[2],"line":{},"marker":{},"subplot":"mapbox5"},{"type":"box","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],"x":"y","boxpoints":"all","jitter":0.1,"name":"bin1","marker":{},"xaxis":"x6","yaxis":"y6"},{"type":"box","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],"x":"y'","boxpoints":"all","jitter":0.1,"name":"bin2","marker":{},"xaxis":"x6","yaxis":"y6"}];"""
214+
"""var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"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],"line":{},"marker":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lon":[1],"lat":[2],"line":{},"marker":{},"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"}];"""
215215
|> chartGeneratedContains multiTraceGrid
216216
);
217217
testCase "MultiTrace Subplot grid layout" ( fun () ->
@@ -228,7 +228,7 @@ let ``Multicharts and subplots`` =
228228
);
229229

230230
testCase "MultiTrace Single Stack data" ( fun () ->
231-
"""var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"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],"line":{},"marker":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lon":[1],"lat":[2],"line":{},"marker":{},"subplot":"mapbox5"},{"type":"box","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],"x":"y","boxpoints":"all","jitter":0.1,"name":"bin1","marker":{},"xaxis":"x6","yaxis":"y6"},{"type":"box","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],"x":"y'","boxpoints":"all","jitter":0.1,"name":"bin2","marker":{},"xaxis":"x6","yaxis":"y6"}];"""
231+
"""var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"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],"line":{},"marker":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lon":[1],"lat":[2],"line":{},"marker":{},"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"}];"""
232232
|> chartGeneratedContains multiTraceSingleStack
233233
);
234234
testCase "MultiTrace Single Stack layout" ( fun () ->

0 commit comments

Comments
 (0)