Skip to content

Commit b5767af

Browse files
kMutagenekMutagene
committed
Add encoded scatter-derived chart overloads
Summary: - restore the plain scatter-derived helper signatures and add separate encoded-only overloads for Point, Line, Spline, Bubble, Range, Area, SplineArea, and StackedArea - keep the high-level API aligned with the reset design by requiring direct encoded arguments like xEncoded/yEncoded and not exposing plain data arguments on those overloads - remove the temporary C# wrapper shim arguments that only existed to support the older optional-parameter prototype shape - add chart-level unit coverage for the new helper constructors in EncodedTypedArray tests - add upstream Plotly.js 2.28 fixtures and HTML assertions for the new high-level helper constructors - update the FSharpConsole sample to use the encoded Chart.Range constructor variant Verification: - .\\build.cmd runTestsCore - 820 tests passed
1 parent 5edcbb1 commit b5767af

File tree

6 files changed

+1353
-245
lines changed

6 files changed

+1353
-245
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ public static GenericChart Point<XType, YType, TextType>(
181181
Plotly.NET.Chart2D.Chart.Point(
182182
x: x,
183183
y: y,
184-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
185-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
186184
Name: Name.ToOption(),
187185
ShowLegend: ShowLegend.ToOption(),
188186
Opacity: Opacity.ToOption(),
@@ -280,8 +278,6 @@ public static GenericChart Line<XType, YType, TextType>(
280278
Plotly.NET.Chart2D.Chart.Line(
281279
x: x,
282280
y: y,
283-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
284-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
285281
ShowMarkers: ShowMarkers.ToOption(),
286282
Name: Name.ToOption(),
287283
ShowLegend: ShowLegend.ToOption(),
@@ -391,8 +387,6 @@ public static GenericChart Spline<XType, YType, TextType>(
391387
Plotly.NET.Chart2D.Chart.Spline(
392388
x: x,
393389
y: y,
394-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
395-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
396390
ShowMarkers: ShowMarkers.ToOption(),
397391
Smoothing: Smoothing.ToOption(),
398392
Name: Name.ToOption(),
@@ -495,8 +489,6 @@ public static GenericChart Bubble<XType, YType, TextType>(
495489
x: x,
496490
y: y,
497491
sizes: sizes,
498-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
499-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
500492
Name: Name.ToOption(),
501493
ShowLegend: ShowLegend.ToOption(),
502494
Opacity: Opacity.ToOption(),
@@ -618,10 +610,6 @@ public static GenericChart Range<XType, YType, TextType>(
618610
upper: upper,
619611
lower: lower,
620612
mode: mode,
621-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
622-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
623-
UpperEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
624-
LowerEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
625613
Name: Name.ToOption(),
626614
GroupName: GroupName.ToOption(),
627615
ShowMarkers: ShowMarkers.ToOption(),
@@ -773,8 +761,6 @@ public static GenericChart Area<XType, YType, TextType>(
773761
Plotly.NET.Chart2D.Chart.Area<XType, YType, TextType>(
774762
x: x,
775763
y: y,
776-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
777-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
778764
ShowMarkers: ShowMarkers.ToOption(),
779765
Name: Name.ToOption(),
780766
ShowLegend: ShowLegend.ToOption(),
@@ -883,8 +869,6 @@ public static GenericChart SplineArea<XType, YType, TextType>(
883869
Plotly.NET.Chart2D.Chart.SplineArea<XType, YType, TextType>(
884870
x: x,
885871
y: y,
886-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
887-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
888872
ShowMarkers: ShowMarkers.ToOption(),
889873
Smoothing: Smoothing.ToOption(),
890874
Name: Name.ToOption(),
@@ -986,8 +970,6 @@ public static GenericChart StackedArea<XType, YType, TextType>(
986970
Plotly.NET.Chart2D.Chart.StackedArea<XType, YType, TextType>(
987971
x: x,
988972
y: y,
989-
XEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
990-
YEncoded: Microsoft.FSharp.Core.FSharpOption<Plotly.NET.EncodedTypedArray>.None,
991973
ShowMarkers: ShowMarkers.ToOption(),
992974
Name: Name.ToOption(),
993975
ShowLegend: ShowLegend.ToOption(),

0 commit comments

Comments
 (0)