Skip to content

Commit 9a0713e

Browse files
kMutagenekMutagene
committed
port layoutobjects to DynamicObj v4
1 parent cdacd3b commit 9a0713e

29 files changed

Lines changed: 479 additions & 487 deletions

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/ActiveSelection.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ActiveSelection() =
2222
) =
2323
(fun (activeSelection: ActiveSelection) ->
2424

25-
FillColor |> DynObj.setOptionalProperty activeSelection "fillcolor"
26-
Opacity |> DynObj.setOptionalProperty activeSelection "opacity"
27-
28-
activeSelection)
25+
activeSelection
26+
|> DynObj.withOptionalProperty "fillcolor" FillColor
27+
|> DynObj.withOptionalProperty "opacity" Opacity
28+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/ActiveShape.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ActiveShape() =
2222
) =
2323
(fun (activeShape: ActiveShape) ->
2424

25-
FillColor |> DynObj.setOptionalProperty activeShape "fillcolor"
26-
Opacity |> DynObj.setOptionalProperty activeShape "opacity"
27-
28-
activeShape)
25+
activeShape
26+
|> DynObj.withOptionalProperty "fillcolor" FillColor
27+
|> DynObj.withOptionalProperty "opacity" Opacity
28+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/Annotation.fs‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -148,47 +148,47 @@ type Annotation() =
148148
) =
149149
(fun (ann: Annotation) ->
150150

151-
X |> DynObj.setOptionalProperty ann "x"
152-
Y |> DynObj.setOptionalProperty ann "y"
153-
Align |> DynObj.setOptionalPropertyBy ann "align" StyleParam.AnnotationAlignment.convert
154-
ArrowColor |> DynObj.setOptionalProperty ann "arrowcolor"
155-
ArrowHead |> DynObj.setOptionalPropertyBy ann "arrowhead" StyleParam.ArrowHead.convert
156-
ArrowSide |> DynObj.setOptionalPropertyBy ann "arrowside" StyleParam.ArrowSide.convert
157-
ArrowSize |> DynObj.setOptionalProperty ann "arrowsize"
158-
AX |> DynObj.setOptionalProperty ann "ax"
159-
AXRef |> DynObj.setOptionalProperty ann "axref"
160-
AY |> DynObj.setOptionalProperty ann "ay"
161-
AYRef |> DynObj.setOptionalProperty ann "ayref"
162-
BGColor |> DynObj.setOptionalProperty ann "bgcolor"
163-
BorderColor |> DynObj.setOptionalProperty ann "bordercolor"
164-
BorderPad |> DynObj.setOptionalProperty ann "borderpad"
165-
BorderWidth |> DynObj.setOptionalProperty ann "borderwidth"
166-
CaptureEvents |> DynObj.setOptionalProperty ann "captureevents"
167-
ClickToShow |> DynObj.setOptionalPropertyBy ann "clicktoshow" StyleParam.ClickToShow.convert
168-
Font |> DynObj.setOptionalProperty ann "font"
169-
Height |> DynObj.setOptionalProperty ann "height"
170-
HoverLabel |> DynObj.setOptionalProperty ann "hoverlabel"
171-
HoverText |> DynObj.setOptionalProperty ann "hovertext"
172-
Name |> DynObj.setOptionalProperty ann "name"
173-
Opacity |> DynObj.setOptionalProperty ann "opacity"
174-
ShowArrow |> DynObj.setOptionalProperty ann "showarrow"
175-
StandOff |> DynObj.setOptionalProperty ann "standoff"
176-
StartArrowHead |> DynObj.setOptionalProperty ann "startarrowhead"
177-
StartArrowSize |> DynObj.setOptionalProperty ann "startarrowsize"
178-
StartStandOff |> DynObj.setOptionalProperty ann "startstandoff"
179-
TemplateItemName |> DynObj.setOptionalProperty ann "templateitemname"
180-
Text |> DynObj.setOptionalProperty ann "text"
181-
TextAngle |> DynObj.setOptionalProperty ann "textangle"
182-
VAlign |> DynObj.setOptionalPropertyBy ann "valign" StyleParam.VerticalAlign.convert
183-
Visible |> DynObj.setOptionalProperty ann "visible"
184-
Width |> DynObj.setOptionalProperty ann "width"
185-
XAnchor |> DynObj.setOptionalPropertyBy ann "xanchor" StyleParam.XAnchorPosition.convert
186-
XClick |> DynObj.setOptionalProperty ann "xclick"
187-
XRef |> DynObj.setOptionalProperty ann "xref"
188-
XShift |> DynObj.setOptionalProperty ann "xshift"
189-
YAnchor |> DynObj.setOptionalPropertyBy ann "yanchor" StyleParam.YAnchorPosition.convert
190-
YClick |> DynObj.setOptionalProperty ann "yclick"
191-
YRef |> DynObj.setOptionalProperty ann "yref"
192-
YShift |> DynObj.setOptionalProperty ann "yshift"
193-
194-
ann)
151+
ann
152+
|> DynObj.withOptionalProperty "x" X
153+
|> DynObj.withOptionalProperty "y" Y
154+
|> DynObj.withOptionalPropertyBy "align" Align StyleParam.AnnotationAlignment.convert
155+
|> DynObj.withOptionalProperty "arrowcolor" ArrowColor
156+
|> DynObj.withOptionalPropertyBy "arrowhead" ArrowHead StyleParam.ArrowHead.convert
157+
|> DynObj.withOptionalPropertyBy "arrowside" ArrowSide StyleParam.ArrowSide.convert
158+
|> DynObj.withOptionalProperty "arrowsize" ArrowSize
159+
|> DynObj.withOptionalProperty "ax" AX
160+
|> DynObj.withOptionalProperty "axref" AXRef
161+
|> DynObj.withOptionalProperty "ay" AY
162+
|> DynObj.withOptionalProperty "ayref" AYRef
163+
|> DynObj.withOptionalProperty "bgcolor" BGColor
164+
|> DynObj.withOptionalProperty "bordercolor" BorderColor
165+
|> DynObj.withOptionalProperty "borderpad" BorderPad
166+
|> DynObj.withOptionalProperty "borderwidth" BorderWidth
167+
|> DynObj.withOptionalProperty "captureevents" CaptureEvents
168+
|> DynObj.withOptionalPropertyBy "clicktoshow" ClickToShow StyleParam.ClickToShow.convert
169+
|> DynObj.withOptionalProperty "font" Font
170+
|> DynObj.withOptionalProperty "height" Height
171+
|> DynObj.withOptionalProperty "hoverlabel" HoverLabel
172+
|> DynObj.withOptionalProperty "hovertext" HoverText
173+
|> DynObj.withOptionalProperty "name" Name
174+
|> DynObj.withOptionalProperty "opacity" Opacity
175+
|> DynObj.withOptionalProperty "showarrow" ShowArrow
176+
|> DynObj.withOptionalProperty "standoff" StandOff
177+
|> DynObj.withOptionalProperty "startarrowhead" StartArrowHead
178+
|> DynObj.withOptionalProperty "startarrowsize" StartArrowSize
179+
|> DynObj.withOptionalProperty "startstandoff" StartStandOff
180+
|> DynObj.withOptionalProperty "templateitemname" TemplateItemName
181+
|> DynObj.withOptionalProperty "text" Text
182+
|> DynObj.withOptionalProperty "textangle" TextAngle
183+
|> DynObj.withOptionalPropertyBy "valign" VAlign StyleParam.VerticalAlign.convert
184+
|> DynObj.withOptionalProperty "visible" Visible
185+
|> DynObj.withOptionalProperty "width" Width
186+
|> DynObj.withOptionalPropertyBy "xanchor" XAnchor StyleParam.XAnchorPosition.convert
187+
|> DynObj.withOptionalProperty "xclick" XClick
188+
|> DynObj.withOptionalProperty "xref" XRef
189+
|> DynObj.withOptionalProperty "xshift" XShift
190+
|> DynObj.withOptionalPropertyBy "yanchor" YAnchor StyleParam.YAnchorPosition.convert
191+
|> DynObj.withOptionalProperty "yclick" YClick
192+
|> DynObj.withOptionalProperty "yref" YRef
193+
|> DynObj.withOptionalProperty "yshift" YShift
194+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/Button.fs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ type Button() =
4242
) =
4343
(fun (button: Button) ->
4444

45-
Visible |> DynObj.setOptionalProperty button "visible"
46-
Step |> DynObj.setOptionalPropertyBy button "step" StyleParam.TimeStep.convert
47-
StepMode |> DynObj.setOptionalPropertyBy button "stepmode" StyleParam.TimeStepMode.convert
48-
Count |> DynObj.setOptionalProperty button "count"
49-
Label |> DynObj.setOptionalProperty button "label"
50-
Name |> DynObj.setOptionalProperty button "name"
51-
TemplateItemName |> DynObj.setOptionalProperty button "templateitemname"
52-
53-
button)
45+
button
46+
|> DynObj.withOptionalProperty "visible" Visible
47+
|> DynObj.withOptionalPropertyBy "step" Step StyleParam.TimeStep.convert
48+
|> DynObj.withOptionalPropertyBy "stepmode" StepMode StyleParam.TimeStepMode.convert
49+
|> DynObj.withOptionalProperty "count" Count
50+
|> DynObj.withOptionalProperty "label" Label
51+
|> DynObj.withOptionalProperty "name" Name
52+
|> DynObj.withOptionalProperty "templateitemname" TemplateItemName
53+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/ColorAxis.fs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ type ColorAxis() =
7272
) =
7373
fun (ca: ColorAxis) ->
7474

75-
AutoColorScale |> DynObj.setOptionalProperty ca "autocolorscale"
76-
CAuto |> DynObj.setOptionalProperty ca "cauto"
77-
CMin |> DynObj.setOptionalProperty ca "cmin"
78-
CMid |> DynObj.setOptionalProperty ca "cmid"
79-
CMax |> DynObj.setOptionalProperty ca "cmax"
80-
ColorBar |> DynObj.setOptionalProperty ca "colorbar"
81-
ColorScale |> DynObj.setOptionalPropertyBy ca "colorscale" StyleParam.Colorscale.convert
82-
ShowScale |> DynObj.setOptionalProperty ca "showscale"
83-
ReverseScale |> DynObj.setOptionalProperty ca "reversescale"
84-
8575
ca
76+
|> DynObj.withOptionalProperty "autocolorscale" AutoColorScale
77+
|> DynObj.withOptionalProperty "cauto" CAuto
78+
|> DynObj.withOptionalProperty "cmin" CMin
79+
|> DynObj.withOptionalProperty "cmid" CMid
80+
|> DynObj.withOptionalProperty "cmax" CMax
81+
|> DynObj.withOptionalProperty "colorbar" ColorBar
82+
|> DynObj.withOptionalPropertyBy "colorscale" ColorScale StyleParam.Colorscale.convert
83+
|> DynObj.withOptionalProperty "showscale" ShowScale
84+
|> DynObj.withOptionalProperty "reversescale" ReverseScale
85+

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/DefaultColorScales.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ type DefaultColorScales() =
2929
) =
3030
(fun (defaultColorScales: DefaultColorScales) ->
3131

32-
Diverging |> DynObj.setOptionalPropertyBy defaultColorScales "diverging" StyleParam.Colorscale.convert
33-
Sequential |> DynObj.setOptionalPropertyBy defaultColorScales "sequential" StyleParam.Colorscale.convert
34-
SequentialMinus |> DynObj.setOptionalPropertyBy defaultColorScales "sequentialminus" StyleParam.Colorscale.convert
35-
36-
defaultColorScales)
32+
defaultColorScales
33+
|> DynObj.withOptionalPropertyBy "diverging" Diverging StyleParam.Colorscale.convert
34+
|> DynObj.withOptionalPropertyBy "sequential" Sequential StyleParam.Colorscale.convert
35+
|> DynObj.withOptionalPropertyBy "sequentialminus" SequentialMinus StyleParam.Colorscale.convert
36+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/Domain.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ type Domain() =
2929
[<Optional; DefaultParameterValue(null)>] ?Column: int
3030
) =
3131
(fun (dom: Domain) ->
32-
X |> DynObj.setOptionalPropertyBy dom "x" StyleParam.Range.convert
33-
Y |> DynObj.setOptionalPropertyBy dom "y" StyleParam.Range.convert
34-
Row |> DynObj.setOptionalProperty dom "row"
35-
Column |> DynObj.setOptionalProperty dom "column"
3632

37-
// out ->
38-
dom)
33+
dom
34+
|> DynObj.withOptionalPropertyBy "x" X StyleParam.Range.convert
35+
|> DynObj.withOptionalPropertyBy "y" Y StyleParam.Range.convert
36+
|> DynObj.withOptionalProperty "row" Row
37+
|> DynObj.withOptionalProperty "column" Column
38+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/Hoverlabel.fs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ type Hoverlabel() =
5757
[<Optional; DefaultParameterValue(null)>] ?Namelength: int
5858
) =
5959
(fun (label: Hoverlabel) ->
60-
BgColor |> DynObj.setOptionalProperty label "bgcolor"
61-
BorderColor |> DynObj.setOptionalProperty label "bordercolor"
62-
Font |> DynObj.setOptionalProperty label "font"
63-
GroupTitleFont |> DynObj.setOptionalProperty label "grouptitlefont"
64-
Align |> DynObj.setOptionalPropertyBy label "align" StyleParam.Align.convert
65-
Namelength |> DynObj.setOptionalProperty label "namelength"
6660

67-
label)
61+
label
62+
|> DynObj.withOptionalProperty "bgcolor" BgColor
63+
|> DynObj.withOptionalProperty "bordercolor" BorderColor
64+
|> DynObj.withOptionalProperty "font" Font
65+
|> DynObj.withOptionalProperty "grouptitlefont" GroupTitleFont
66+
|> DynObj.withOptionalPropertyBy "align" Align StyleParam.Align.convert
67+
|> DynObj.withOptionalProperty "namelength" Namelength
68+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/LayoutGrid.fs‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,22 @@ type LayoutGrid() =
8585
[<Optional; DefaultParameterValue(null)>] ?YSide: StyleParam.LayoutGridYSide
8686
) =
8787
(fun (layoutGrid: LayoutGrid) ->
88-
SubPlots
89-
|> DynObj.setOptionalPropertyBy
90-
layoutGrid
91-
"subplots"
92-
(Array.map (
88+
layoutGrid
89+
|> DynObj.withOptionalPropertyBy "subplots" SubPlots (
90+
Array.map (
9391
Array.map (fun (x, y) ->
9492
$"{StyleParam.LinearAxisId.toString x}{StyleParam.LinearAxisId.toString y}")
95-
))
96-
97-
XAxes |> DynObj.setOptionalPropertyBy layoutGrid "xaxes" (Array.map StyleParam.LinearAxisId.toString)
98-
YAxes |> DynObj.setOptionalPropertyBy layoutGrid "yaxes" (Array.map StyleParam.LinearAxisId.toString)
99-
Rows |> DynObj.setOptionalProperty layoutGrid "rows"
100-
Columns |> DynObj.setOptionalProperty layoutGrid "columns"
101-
RowOrder |> DynObj.setOptionalPropertyBy layoutGrid "roworder" StyleParam.LayoutGridRowOrder.toString
102-
Pattern |> DynObj.setOptionalPropertyBy layoutGrid "pattern" StyleParam.LayoutGridPattern.toString
103-
XGap |> DynObj.setOptionalProperty layoutGrid "xgap"
104-
YGap |> DynObj.setOptionalProperty layoutGrid "ygap"
105-
Domain |> DynObj.setOptionalProperty layoutGrid "domain"
106-
XSide |> DynObj.setOptionalPropertyBy layoutGrid "xside" StyleParam.LayoutGridXSide.toString
107-
YSide |> DynObj.setOptionalPropertyBy layoutGrid "yside" StyleParam.LayoutGridYSide.toString
108-
109-
layoutGrid)
93+
)
94+
)
95+
|> DynObj.withOptionalPropertyBy "xaxes" XAxes (Array.map StyleParam.LinearAxisId.toString)
96+
|> DynObj.withOptionalPropertyBy "yaxes" YAxes (Array.map StyleParam.LinearAxisId.toString)
97+
|> DynObj.withOptionalProperty "rows" Rows
98+
|> DynObj.withOptionalProperty "columns" Columns
99+
|> DynObj.withOptionalPropertyBy "roworder" RowOrder StyleParam.LayoutGridRowOrder.toString
100+
|> DynObj.withOptionalPropertyBy "pattern" Pattern StyleParam.LayoutGridPattern.toString
101+
|> DynObj.withOptionalProperty "xgap" XGap
102+
|> DynObj.withOptionalProperty "ygap" YGap
103+
|> DynObj.withOptionalProperty "domain" Domain
104+
|> DynObj.withOptionalPropertyBy "xside" XSide StyleParam.LayoutGridXSide.toString
105+
|> DynObj.withOptionalPropertyBy "yside" YSide StyleParam.LayoutGridYSide.toString
106+
)

‎src/Plotly.NET/Layout/ObjectAbstractions/Common/LayoutImage.fs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,20 @@ type LayoutImage() =
6565
[<Optional; DefaultParameterValue(null)>] ?YRef: string
6666
) =
6767
(fun (layoutImage: LayoutImage) ->
68-
69-
Layer |> DynObj.setOptionalPropertyBy layoutImage "layer" StyleParam.Layer.convert
70-
Name |> DynObj.setOptionalProperty layoutImage "name"
71-
Opacity |> DynObj.setOptionalProperty layoutImage "opacity"
72-
SizeX |> DynObj.setOptionalProperty layoutImage "sizex"
73-
SizeY |> DynObj.setOptionalProperty layoutImage "sizey"
74-
Sizing |> DynObj.setOptionalPropertyBy layoutImage "sizing" StyleParam.LayoutImageSizing.convert
75-
Source |> DynObj.setOptionalProperty layoutImage "source"
76-
TemplateItemname |> DynObj.setOptionalProperty layoutImage "templateitemname"
77-
Visible |> DynObj.setOptionalProperty layoutImage "visible"
78-
X |> DynObj.setOptionalProperty layoutImage "x"
79-
XAnchor |> DynObj.setOptionalPropertyBy layoutImage "xanchor" StyleParam.XAnchorPosition.convert
80-
XRef |> DynObj.setOptionalProperty layoutImage "xref"
81-
Y |> DynObj.setOptionalProperty layoutImage "y"
82-
YAnchor |> DynObj.setOptionalPropertyBy layoutImage "yanchor" StyleParam.YAnchorPosition.convert
83-
YRef |> DynObj.setOptionalProperty layoutImage "yref"
84-
85-
layoutImage)
68+
layoutImage
69+
|> DynObj.withOptionalPropertyBy "layer" Layer StyleParam.Layer.convert
70+
|> DynObj.withOptionalProperty "name" Name
71+
|> DynObj.withOptionalProperty "opacity" Opacity
72+
|> DynObj.withOptionalProperty "sizex" SizeX
73+
|> DynObj.withOptionalProperty "sizey" SizeY
74+
|> DynObj.withOptionalPropertyBy "sizing" Sizing StyleParam.LayoutImageSizing.convert
75+
|> DynObj.withOptionalProperty "source" Source
76+
|> DynObj.withOptionalProperty "templateitemname" TemplateItemname
77+
|> DynObj.withOptionalProperty "visible" Visible
78+
|> DynObj.withOptionalProperty "x" X
79+
|> DynObj.withOptionalPropertyBy "xanchor" XAnchor StyleParam.XAnchorPosition.convert
80+
|> DynObj.withOptionalProperty "xref" XRef
81+
|> DynObj.withOptionalProperty "y" Y
82+
|> DynObj.withOptionalPropertyBy "yanchor" YAnchor StyleParam.YAnchorPosition.convert
83+
|> DynObj.withOptionalProperty "yref" YRef
84+
)

0 commit comments

Comments
 (0)