Skip to content

Commit 266779c

Browse files
kMutagenekMutagene
committed
finish trace objects dynobj v4 port, fix some sankey props
1 parent 36781a3 commit 266779c

File tree

5 files changed

+83
-101
lines changed

5 files changed

+83
-101
lines changed

‎src/Plotly.NET/Traces/ObjectAbstractions/FinanceMarker.fs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ type FinanceMarker() =
3232
[<Optional; DefaultParameterValue(null)>] ?LineWidth: float,
3333
[<Optional; DefaultParameterValue(null)>] ?LineDash: StyleParam.DrawingStyle
3434
) =
35-
(fun (financeMarker: FinanceMarker) ->
35+
fun (financeMarker: FinanceMarker) ->
3636

3737
let line =
3838
financeMarker.TryGetTypedPropertyValue<Line>("line")
3939
|> Option.defaultValue(Plotly.NET.Line.init())
4040
|> Line.style (?Color = LineColor, ?Width = LineWidth, ?Dash = LineDash)
4141

42-
FillColor |> DynObj.setOptionalProperty financeMarker "fillcolor"
43-
line |> DynObj.withProperty financeMarker "line"
44-
45-
financeMarker)
42+
financeMarker
43+
|> DynObj.withOptionalProperty "fillcolor" FillColor
44+
|> DynObj.withProperty "line" line

‎src/Plotly.NET/Traces/ObjectAbstractions/Icicle.fs‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ type IcicleRoot() =
1313
IcicleRoot() |> IcicleRoot.style (?Color = Color)
1414

1515
static member style([<Optional; DefaultParameterValue(null)>] ?Color: Color) =
16-
(fun (icicleRoot: IcicleRoot) ->
17-
18-
Color |> DynObj.setOptionalProperty icicleRoot "color"
19-
20-
icicleRoot)
16+
fun (icicleRoot: IcicleRoot) ->
17+
icicleRoot
18+
|> DynObj.withOptionalProperty "color" Color
2119

2220
type IcicleLeaf() =
2321
inherit DynamicObj()
@@ -26,11 +24,9 @@ type IcicleLeaf() =
2624
IcicleLeaf() |> IcicleLeaf.style (?Opacity = Opacity)
2725

2826
static member style([<Optional; DefaultParameterValue(null)>] ?Opacity: float) =
29-
(fun (icicleLeaf: IcicleLeaf) ->
30-
31-
Opacity |> DynObj.setOptionalProperty icicleLeaf "opacity"
32-
33-
icicleLeaf)
27+
fun (icicleLeaf: IcicleLeaf) ->
28+
icicleLeaf
29+
|> DynObj.withOptionalProperty "opacity" Opacity
3430

3531
type IcicleTiling() =
3632
inherit DynamicObj()
@@ -49,10 +45,9 @@ type IcicleTiling() =
4945
[<Optional; DefaultParameterValue(null)>] ?Orientation: StyleParam.Orientation,
5046
[<Optional; DefaultParameterValue(null)>] ?Pad: int
5147
) =
52-
(fun (icicleTiling: IcicleTiling) ->
53-
54-
Flip |> DynObj.setOptionalPropertyBy icicleTiling "flip" StyleParam.TilingFlip.convert
55-
Orientation |> DynObj.setOptionalPropertyBy icicleTiling "orientation" StyleParam.Orientation.convert
56-
Pad |> DynObj.setOptionalProperty icicleTiling "pad"
48+
fun (icicleTiling: IcicleTiling) ->
5749

58-
icicleTiling)
50+
icicleTiling
51+
|> DynObj.withOptionalPropertyBy "flip" Flip StyleParam.TilingFlip.convert
52+
|> DynObj.withOptionalPropertyBy "orientation" Orientation StyleParam.Orientation.convert
53+
|> DynObj.withOptionalProperty "pad" Pad

‎src/Plotly.NET/Traces/ObjectAbstractions/Indicator.fs‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,12 @@ type IndicatorBar() =
151151
[<Optional; DefaultParameterValue(null)>] ?Line: Line,
152152
[<Optional; DefaultParameterValue(null)>] ?Thickness: float
153153
) =
154-
(fun (indicatorBar: IndicatorBar) ->
155-
156-
Color |> DynObj.setOptionalProperty indicatorBar "color"
157-
Line |> DynObj.setOptionalProperty indicatorBar "line"
158-
Thickness |> DynObj.setOptionalProperty indicatorBar "thickness"
159-
160-
indicatorBar)
154+
fun (indicatorBar: IndicatorBar) ->
155+
indicatorBar
156+
|> DynObj.withOptionalProperty "color" Color
157+
|> DynObj.withOptionalProperty "line" Line
158+
|> DynObj.withOptionalProperty "thickness" Thickness
159+
161160

162161
type IndicatorStep() =
163162
inherit DynamicObj()
@@ -190,16 +189,15 @@ type IndicatorStep() =
190189
[<Optional; DefaultParameterValue(null)>] ?TemplateItemName: string,
191190
[<Optional; DefaultParameterValue(null)>] ?Thickness: float
192191
) =
193-
(fun (indicatorSteps: IndicatorStep) ->
192+
fun (indicatorSteps: IndicatorStep) ->
194193

195-
Color |> DynObj.setOptionalProperty indicatorSteps "color"
196-
Line |> DynObj.setOptionalProperty indicatorSteps "line"
197-
Name |> DynObj.setOptionalProperty indicatorSteps "name"
198-
Range |> DynObj.setOptionalPropertyBy indicatorSteps "range" StyleParam.Range.convert
199-
TemplateItemName |> DynObj.setOptionalProperty indicatorSteps "templateitemname"
200-
Thickness |> DynObj.setOptionalProperty indicatorSteps "thickness"
201-
202-
indicatorSteps)
194+
indicatorSteps
195+
|> DynObj.withOptionalProperty "color" Color
196+
|> DynObj.withOptionalProperty "line" Line
197+
|> DynObj.withOptionalProperty "name" Name
198+
|> DynObj.withOptionalPropertyBy "range" Range StyleParam.Range.convert
199+
|> DynObj.withOptionalProperty "templateitemname" TemplateItemName
200+
|> DynObj.withOptionalProperty "thickness" Thickness
203201

204202

205203
type IndicatorThreshold() =
@@ -219,13 +217,12 @@ type IndicatorThreshold() =
219217
[<Optional; DefaultParameterValue(null)>] ?Thickness: float,
220218
[<Optional; DefaultParameterValue(null)>] ?Value: #IConvertible
221219
) =
222-
(fun (indicatorThreshold: IndicatorThreshold) ->
223-
224-
Line |> DynObj.setOptionalProperty indicatorThreshold "line"
225-
Thickness |> DynObj.setOptionalProperty indicatorThreshold "thickness"
226-
Value |> DynObj.setOptionalProperty indicatorThreshold "value"
220+
fun (indicatorThreshold: IndicatorThreshold) ->
227221

228-
indicatorThreshold)
222+
indicatorThreshold
223+
|> DynObj.withOptionalProperty "line" Line
224+
|> DynObj.withOptionalProperty "thickness" Thickness
225+
|> DynObj.withOptionalProperty "value" Value
229226

230227

231228
type IndicatorGauge() =
@@ -265,15 +262,14 @@ type IndicatorGauge() =
265262
[<Optional; DefaultParameterValue(null)>] ?Steps: seq<IndicatorStep>,
266263
[<Optional; DefaultParameterValue(null)>] ?Threshold: IndicatorThreshold
267264
) =
268-
(fun (indicatorGauge: IndicatorGauge) ->
269-
270-
Axis |> DynObj.setOptionalProperty indicatorGauge "axis"
271-
Bar |> DynObj.setOptionalProperty indicatorGauge "bar"
272-
BGColor |> DynObj.setOptionalProperty indicatorGauge "bgcolor"
273-
BorderColor |> DynObj.setOptionalProperty indicatorGauge "bordercolor"
274-
BorderWidth |> DynObj.setOptionalProperty indicatorGauge "borderwidth"
275-
Shape |> DynObj.setOptionalPropertyBy indicatorGauge "shape" StyleParam.IndicatorGaugeShape.convert
276-
Steps |> DynObj.setOptionalProperty indicatorGauge "steps"
277-
Threshold |> DynObj.setOptionalProperty indicatorGauge "threshold"
278-
279-
indicatorGauge)
265+
fun (indicatorGauge: IndicatorGauge) ->
266+
267+
indicatorGauge
268+
|> DynObj.withOptionalProperty "axis" Axis
269+
|> DynObj.withOptionalProperty "bar" Bar
270+
|> DynObj.withOptionalProperty "bgcolor" BGColor
271+
|> DynObj.withOptionalProperty "bordercolor" BorderColor
272+
|> DynObj.withOptionalProperty "borderwidth" BorderWidth
273+
|> DynObj.withOptionalPropertyBy "shape" Shape StyleParam.IndicatorGaugeShape.convert
274+
|> DynObj.withOptionalProperty "steps" Steps
275+
|> DynObj.withOptionalProperty "threshold" Threshold

‎src/Plotly.NET/Traces/ObjectAbstractions/Sankey.fs‎

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,20 @@ type SankeyNodes() =
6060
[<Optional; DefaultParameterValue(null)>] ?X: seq<#IConvertible>,
6161
[<Optional; DefaultParameterValue(null)>] ?Y: seq<#IConvertible>
6262
) =
63-
(fun (sankeyNodes: SankeyNodes) ->
64-
65-
Color |> DynObj.setOptionalProperty sankeyNodes "color"
66-
CustomData |> DynObj.setOptionalProperty sankeyNodes "customdata"
67-
Groups |> DynObj.setOptionalProperty sankeyNodes "hoverinfo"
68-
HoverInfo |> DynObj.setOptionalPropertyBy sankeyNodes "color" StyleParam.HoverInfo.convert
69-
HoverLabel |> DynObj.setOptionalProperty sankeyNodes "hoverlabel"
70-
(HoverTemplate, MultiHoverTemplate) |> DynObj.setOptionalSingleOrMultiProperty sankeyNodes "hovertemplate"
71-
Label |> DynObj.setOptionalProperty sankeyNodes "label"
72-
Line |> DynObj.setOptionalProperty sankeyNodes "line"
73-
Pad |> DynObj.setOptionalProperty sankeyNodes "pad"
74-
Thickness |> DynObj.setOptionalProperty sankeyNodes "thickness"
75-
X |> DynObj.setOptionalProperty sankeyNodes "x"
76-
Y |> DynObj.setOptionalProperty sankeyNodes "y"
77-
78-
sankeyNodes)
63+
fun (sankeyNodes: SankeyNodes) ->
64+
sankeyNodes
65+
|> DynObj.withOptionalProperty "color" Color
66+
|> DynObj.withOptionalProperty "customdata" CustomData
67+
|> DynObj.withOptionalProperty "groups" Groups
68+
|> DynObj.withOptionalPropertyBy "hoverinfo" HoverInfo StyleParam.HoverInfo.convert
69+
|> DynObj.withOptionalProperty "hoverlabel" HoverLabel
70+
|> DynObj.withOptionalSingleOrMultiProperty "hovertemplate" (HoverTemplate, MultiHoverTemplate)
71+
|> DynObj.withOptionalProperty "label" Label
72+
|> DynObj.withOptionalProperty "line" Line
73+
|> DynObj.withOptionalProperty "pad" Pad
74+
|> DynObj.withOptionalProperty "thickness" Thickness
75+
|> DynObj.withOptionalProperty "x" X
76+
|> DynObj.withOptionalProperty "y" Y
7977

8078
type SankeyLinkColorscale() =
8179
inherit DynamicObj()
@@ -110,17 +108,15 @@ type SankeyLinkColorscale() =
110108
[<Optional; DefaultParameterValue(null)>] ?Name: string,
111109
[<Optional; DefaultParameterValue(null)>] ?TemplateItemName: string
112110
) =
113-
(fun (sankeyLinkColorscale: SankeyLinkColorscale) ->
111+
fun (sankeyLinkColorscale: SankeyLinkColorscale) ->
114112

115-
CMax |> DynObj.setOptionalProperty sankeyLinkColorscale "cmax"
116-
CMin |> DynObj.setOptionalProperty sankeyLinkColorscale "cmin"
117-
ColorScale |> DynObj.setOptionalPropertyBy sankeyLinkColorscale "colorscale" StyleParam.Colorscale.convert
118-
Label |> DynObj.setOptionalProperty sankeyLinkColorscale "label"
119-
Name |> DynObj.setOptionalProperty sankeyLinkColorscale "name"
120-
TemplateItemName |> DynObj.setOptionalProperty sankeyLinkColorscale "templateitemname"
121-
122-
123-
sankeyLinkColorscale)
113+
sankeyLinkColorscale
114+
|> DynObj.withOptionalProperty "cmax" CMax
115+
|> DynObj.withOptionalProperty "cmin" CMin
116+
|> DynObj.withOptionalPropertyBy "colorscale" ColorScale StyleParam.Colorscale.convert
117+
|> DynObj.withOptionalProperty "label" Label
118+
|> DynObj.withOptionalProperty "name" Name
119+
|> DynObj.withOptionalProperty "templateitemname" TemplateItemName
124120

125121
type SankeyLinks() =
126122
inherit DynamicObj()
@@ -176,21 +172,18 @@ type SankeyLinks() =
176172
[<Optional; DefaultParameterValue(null)>] ?Target: seq<int>,
177173
[<Optional; DefaultParameterValue(null)>] ?Value: seq<#IConvertible>
178174
) =
179-
(fun (sankeyLinks: SankeyLinks) ->
180-
181-
ArrowLen |> DynObj.setOptionalProperty sankeyLinks "arrowlen"
182-
Color |> DynObj.setOptionalProperty sankeyLinks "color"
183-
ColorScales |> DynObj.setOptionalProperty sankeyLinks "colorscales"
184-
CustomData |> DynObj.setOptionalProperty sankeyLinks "customdata"
185-
HoverInfo |> DynObj.setOptionalPropertyBy sankeyLinks "hoverinfo" StyleParam.HoverInfo.convert
186-
HoverLabel |> DynObj.setOptionalProperty sankeyLinks "hoverlabel"
187-
HoverTemplate |> DynObj.setOptionalProperty sankeyLinks "hovertemplate"
188-
MultiHoverTemplate |> DynObj.setOptionalProperty sankeyLinks "multihovertemplate"
189-
Label |> DynObj.setOptionalProperty sankeyLinks "label"
190-
Line |> DynObj.setOptionalProperty sankeyLinks "line"
191-
Source |> DynObj.setOptionalProperty sankeyLinks "source"
192-
Target |> DynObj.setOptionalProperty sankeyLinks "target"
193-
Value |> DynObj.setOptionalProperty sankeyLinks "value"
194-
195-
196-
sankeyLinks)
175+
fun (sankeyLinks: SankeyLinks) ->
176+
177+
sankeyLinks
178+
|> DynObj.withOptionalProperty "arrowlen" ArrowLen
179+
|> DynObj.withOptionalProperty "color" Color
180+
|> DynObj.withOptionalProperty "colorscales" ColorScales
181+
|> DynObj.withOptionalProperty "customdata" CustomData
182+
|> DynObj.withOptionalPropertyBy "hoverinfo" HoverInfo StyleParam.HoverInfo.convert
183+
|> DynObj.withOptionalProperty "hoverlabel" HoverLabel
184+
|> DynObj.withOptionalSingleOrMultiProperty "hovertemplate" (HoverTemplate, MultiHoverTemplate)
185+
|> DynObj.withOptionalProperty "label" Label
186+
|> DynObj.withOptionalProperty "line" Line
187+
|> DynObj.withOptionalProperty "source" Source
188+
|> DynObj.withOptionalProperty "target" Target
189+

‎src/Plotly.NET/Traces/ObjectAbstractions/SplomDiagonal.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ type SplomDiagonal() =
1616

1717
fun (splomDiagonal: SplomDiagonal) ->
1818

19-
Visible |> DynObj.setOptionalProperty splomDiagonal "visible"
20-
2119
splomDiagonal
20+
|> DynObj.withOptionalProperty "visible" Visible

0 commit comments

Comments
 (0)