Skip to content

Commit 8a9fcb6

Browse files
kMutagenekMutagene
committed
Add encoded carpet and domain trace fields
Complete the remaining encoded typed-array support for the last subplot/domain trace families. Summary: - add encoded array parameters to TraceCarpet.Carpet, ScatterCarpet, and ContourCarpet - add encoded array parameters to domain traces including Pie, FunnelArea, Sunburst, Treemap, ParallelCoord, ParallelCategories, Sankey, Table, Indicator, and Icicle - keep encoded-overrides-plain precedence by writing encoded values after the existing plain array properties - add low-level integration tests for the remaining subplot, carpet, and domain traces in EncodedTypedArray.fs - add representative upstream 2.28 feature charts and HTML assertions for the remaining uncovered subplot/domain families - add manual FSharpConsole samples for encoded carpet, pie, and sankey traces Verification: - .\\build.cmd runTestsCore - 802 tests passed Notes: - plans/EncodedArraySupport.md was updated locally before the commit and intentionally left uncommitted - F# XML-doc warnings remain for the newly added ...Encoded parameters in the subplot/domain trace files, matching the current state of the earlier G1 slice
1 parent 81bd99f commit 8a9fcb6

6 files changed

Lines changed: 612 additions & 1 deletion

File tree

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,24 @@ type TraceCarpetStyle() =
8383
?LegendGroupTitle: Title,
8484
?Opacity: float,
8585
?Ids: seq<#IConvertible>,
86+
?IdsEncoded: EncodedTypedArray,
8687
?X: seq<#IConvertible>,
88+
?XEncoded: EncodedTypedArray,
8789
?MultiX: seq<#seq<#IConvertible>>,
8890
?Y: seq<#IConvertible>,
91+
?YEncoded: EncodedTypedArray,
8992
?MultiY: seq<#seq<#IConvertible>>,
9093
?A: seq<#IConvertible>,
94+
?AEncoded: EncodedTypedArray,
9195
?A0: #IConvertible,
9296
?DA: #IConvertible,
9397
?B: seq<#IConvertible>,
98+
?BEncoded: EncodedTypedArray,
9499
?B0: #IConvertible,
95100
?DB: #IConvertible,
96101
?Meta: string,
97102
?CustomData: seq<#IConvertible>,
103+
?CustomDataEncoded: EncodedTypedArray,
98104
?AAxis: LinearAxis,
99105
?BAxis: LinearAxis,
100106
?XAxis: StyleParam.LinearAxisId,
@@ -117,16 +123,22 @@ type TraceCarpetStyle() =
117123
|> DynObj.withOptionalProperty "legendgrouptitle"LegendGroupTitle
118124
|> DynObj.withOptionalProperty "opacity" Opacity
119125
|> DynObj.withOptionalProperty "ids" Ids
126+
|> DynObj.withOptionalProperty "ids" IdsEncoded
120127
|> DynObj.withOptionalSingleOrAnyProperty "x" (X, MultiX)
128+
|> DynObj.withOptionalProperty "x" XEncoded
121129
|> DynObj.withOptionalSingleOrAnyProperty "y" (Y, MultiY)
130+
|> DynObj.withOptionalProperty "y" YEncoded
122131
|> DynObj.withOptionalProperty "a" A
132+
|> DynObj.withOptionalProperty "a" AEncoded
123133
|> DynObj.withOptionalProperty "a0" A0
124134
|> DynObj.withOptionalProperty "da" DA
125135
|> DynObj.withOptionalProperty "b" B
136+
|> DynObj.withOptionalProperty "b" BEncoded
126137
|> DynObj.withOptionalProperty "b0" B0
127138
|> DynObj.withOptionalProperty "db" DB
128139
|> DynObj.withOptionalProperty "meta" Meta
129140
|> DynObj.withOptionalProperty "customdata" CustomData
141+
|> DynObj.withOptionalProperty "customdata" CustomDataEncoded
130142
|> DynObj.withOptionalProperty "aaxis" AAxis
131143
|> DynObj.withOptionalProperty "baxis" BAxis
132144
|> DynObj.withOptionalPropertyBy "xaxis" XAxis StyleParam.LinearAxisId.convert
@@ -192,10 +204,14 @@ type TraceCarpetStyle() =
192204
?Opacity: float,
193205
?Mode: StyleParam.Mode,
194206
?Ids: seq<#IConvertible>,
207+
?IdsEncoded: EncodedTypedArray,
195208
?A: seq<#IConvertible>,
209+
?AEncoded: EncodedTypedArray,
196210
?B: seq<#IConvertible>,
211+
?BEncoded: EncodedTypedArray,
197212
?Text: #IConvertible,
198213
?MultiText: seq<#IConvertible>,
214+
?MultiTextEncoded: EncodedTypedArray,
199215
?TextPosition: StyleParam.TextPosition,
200216
?MultiTextPosition: seq<StyleParam.TextPosition>,
201217
?TextTemplate: string,
@@ -207,12 +223,14 @@ type TraceCarpetStyle() =
207223
?MultiHoverTemplate: seq<string>,
208224
?Meta: string,
209225
?CustomData: seq<#IConvertible>,
226+
?CustomDataEncoded: EncodedTypedArray,
210227
?XAxis: StyleParam.LinearAxisId,
211228
?YAxis: StyleParam.LinearAxisId,
212229
?Marker: Marker,
213230
?Line: Line,
214231
?TextFont: Font,
215232
?SelectedPoints: seq<#IConvertible>,
233+
?SelectedPointsEncoded: EncodedTypedArray,
216234
?Selected: TraceSelection,
217235
?Unselected: TraceSelection,
218236
?Carpet: StyleParam.SubPlotId,
@@ -236,22 +254,28 @@ type TraceCarpetStyle() =
236254
|> DynObj.withOptionalProperty "opacity" Opacity
237255
|> DynObj.withOptionalPropertyBy "mode" Mode StyleParam.Mode.convert
238256
|> DynObj.withOptionalProperty "ids" Ids
257+
|> DynObj.withOptionalProperty "ids" IdsEncoded
239258
|> DynObj.withOptionalProperty "a" A
259+
|> DynObj.withOptionalProperty "a" AEncoded
240260
|> DynObj.withOptionalProperty "b" B
261+
|> DynObj.withOptionalProperty "b" BEncoded
241262
|> DynObj.withOptionalSingleOrMultiProperty "text" (Text, MultiText)
263+
|> DynObj.withOptionalProperty "text" MultiTextEncoded
242264
|> DynObj.withOptionalSingleOrMultiPropertyBy "textposition" (TextPosition, MultiTextPosition) StyleParam.TextPosition.convert
243265
|> DynObj.withOptionalSingleOrMultiProperty "texttemplate" (TextTemplate, MultiTextTemplate)
244266
|> DynObj.withOptionalSingleOrMultiProperty "hovertext" (HoverText, MultiHoverText)
245267
|> DynObj.withOptionalPropertyBy "hoverinfo" HoverInfo StyleParam.HoverInfo.convert
246268
|> DynObj.withOptionalSingleOrMultiProperty "hovertemplate" (HoverTemplate, MultiHoverTemplate)
247269
|> DynObj.withOptionalProperty "meta" Meta
248270
|> DynObj.withOptionalProperty "customdata" CustomData
271+
|> DynObj.withOptionalProperty "customdata" CustomDataEncoded
249272
|> DynObj.withOptionalPropertyBy "xaxis" XAxis StyleParam.LinearAxisId.convert
250273
|> DynObj.withOptionalPropertyBy "yaxis" YAxis StyleParam.LinearAxisId.convert
251274
|> DynObj.withOptionalProperty "marker" Marker
252275
|> DynObj.withOptionalProperty "line" Line
253276
|> DynObj.withOptionalProperty "textfont" TextFont
254277
|> DynObj.withOptionalProperty "selectedpoints" SelectedPoints
278+
|> DynObj.withOptionalProperty "selectedpoints" SelectedPointsEncoded
255279
|> DynObj.withOptionalProperty "selected" Selected
256280
|> DynObj.withOptionalProperty "unselected" Unselected
257281
|> DynObj.withOptionalPropertyBy "carpet" Carpet StyleParam.SubPlotId.convert
@@ -320,21 +344,27 @@ type TraceCarpetStyle() =
320344
?LegendGroupTitle: Title,
321345
?Opacity: float,
322346
?Ids: seq<#IConvertible>,
347+
?IdsEncoded: EncodedTypedArray,
323348
?Z: seq<#IConvertible>,
349+
?ZEncoded: EncodedTypedArray,
324350
?A: seq<#IConvertible>,
351+
?AEncoded: EncodedTypedArray,
325352
?AType: StyleParam.CoordinateType,
326353
?A0: #IConvertible,
327354
?DA: #IConvertible,
328355
?B: seq<#IConvertible>,
356+
?BEncoded: EncodedTypedArray,
329357
?BType: StyleParam.CoordinateType,
330358
?B0: #IConvertible,
331359
?DB: #IConvertible,
332360
?Text: #IConvertible,
333361
?MultiText: seq<#IConvertible>,
362+
?MultiTextEncoded: EncodedTypedArray,
334363
?HoverText: string,
335364
?MultiHoverText: seq<string>,
336365
?Meta: string,
337366
?CustomData: seq<#IConvertible>,
367+
?CustomDataEncoded: EncodedTypedArray,
338368
?XAxis: StyleParam.LinearAxisId,
339369
?YAxis: StyleParam.LinearAxisId,
340370
?ColorAxis: StyleParam.SubPlotId,
@@ -368,19 +398,25 @@ type TraceCarpetStyle() =
368398
|> DynObj.withOptionalProperty "legendgrouptitle"LegendGroupTitle
369399
|> DynObj.withOptionalProperty "opacity" Opacity
370400
|> DynObj.withOptionalProperty "ids" Ids
401+
|> DynObj.withOptionalProperty "ids" IdsEncoded
371402
|> DynObj.withOptionalProperty "z" Z
403+
|> DynObj.withOptionalProperty "z" ZEncoded
372404
|> DynObj.withOptionalProperty "a" A
405+
|> DynObj.withOptionalProperty "a" AEncoded
373406
|> DynObj.withOptionalPropertyBy "atype" AType StyleParam.CoordinateType.convert
374407
|> DynObj.withOptionalProperty "a0" A0
375408
|> DynObj.withOptionalProperty "da" DA
376409
|> DynObj.withOptionalProperty "b" B
410+
|> DynObj.withOptionalProperty "b" BEncoded
377411
|> DynObj.withOptionalPropertyBy "btype" BType StyleParam.CoordinateType.convert
378412
|> DynObj.withOptionalProperty "b0" B0
379413
|> DynObj.withOptionalProperty "db" DB
380414
|> DynObj.withOptionalSingleOrMultiProperty "text" (Text, MultiText)
415+
|> DynObj.withOptionalProperty "text" MultiTextEncoded
381416
|> DynObj.withOptionalSingleOrMultiProperty "hovertext" (HoverText, MultiHoverText)
382417
|> DynObj.withOptionalProperty "meta" Meta
383418
|> DynObj.withOptionalProperty "customdata" CustomData
419+
|> DynObj.withOptionalProperty "customdata" CustomDataEncoded
384420
|> DynObj.withOptionalPropertyBy "xaxis" XAxis StyleParam.LinearAxisId.convert
385421
|> DynObj.withOptionalPropertyBy "yaxis" YAxis StyleParam.LinearAxisId.convert
386422
|> DynObj.withOptionalPropertyBy "coloraxis" ColorAxis StyleParam.SubPlotId.convert

0 commit comments

Comments
 (0)