Skip to content

Commit d73145a

Browse files
committed
Add Chart.withColorBar and Chart.withColorBarStyle
1 parent 2e3fce2 commit d73145a

File tree

5 files changed

+48
-10
lines changed

5 files changed

+48
-10
lines changed

Diff for: RELEASE_NOTES.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
* [Add Rangesliders for linear Axis](https://github.com/muehlhaus/FSharp.Plotly/commit/544641492195b1938697721b72814e0187a6c979)
33
* [Improve jupyter notebook integration](https://github.com/muehlhaus/FSharp.Plotly/commit/e9560656bbc8dbf767c9eb6ca35f321c98195238)
44
* [Updated Violin Chart](https://github.com/muehlhaus/FSharp.Plotly/commit/4d3afc527b11cd2f5a18c1d9876ad4e3f83beb02)
5+
* [Refactor Chart.Stack]():
6+
* new Charts:
7+
* Chart.Grid: Uses the grid object of plotly.js to generate various types of subplot grids
8+
* Chart.SingleStack: Basically Chart.Grid with one Column
9+
* Add Chart.withColorBar and Chart.withColorBarStyle to change the appearance of colorbars
10+
511

612
### 1.2.2 - Apr 9 2020
713
* [Opening Charts is now more or less OS agnostic](https://github.com/muehlhaus/FSharp.Plotly/commit/f6e3dceade085e43e7e56b478b9cf7b533a4fe55)

Diff for: src/FSharp.Plotly/ChartExtensions.fs

+20
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,27 @@ module ChartExtensions =
302302
let zaxis = Axis.LinearAxis.init(Title=title,?Range=range,?Showgrid=Showgrid,?Showline=Showline,?Anchor=Anchor,?Domain=domain)
303303
Chart.withZ_Axis(zaxis)
304304

305+
[<CompiledName("WithColorBar")>]
306+
static member withColorBar(colorbar:Colorbar) =
307+
(fun (ch:GenericChart) ->
308+
ch
309+
|> GenericChart.mapTrace(fun t ->
310+
colorbar |> DynObj.setValue t "colorbar"
311+
t
312+
)
313+
)
305314

315+
316+
[<CompiledName("withColorbar")>]
317+
static member withColorBarStyle(title,
318+
[<Optional;DefaultParameterValue(null)>] ?TitleSide: StyleParam.Side,
319+
[<Optional;DefaultParameterValue(null)>] ?TitleFont: Font,
320+
[<Optional;DefaultParameterValue(null)>] ?Length,
321+
[<Optional;DefaultParameterValue(null)>] ?OutlineColor,
322+
[<Optional;DefaultParameterValue(null)>] ?BorderColor,
323+
[<Optional;DefaultParameterValue(null)>] ?BGColor) =
324+
let colorbar = Colorbar.init(Title=title,?Titleside=TitleSide,?Titlefont=TitleFont,?Len = Length,?Outlinecolor=OutlineColor,?Bgcolor=BGColor,?Bordercolor=BorderColor)
325+
Chart.withColorBar(colorbar)
306326
//// Sets second x-Axis of 2d- Charts
307327
//static member withX_Axis2(xAxis2:Axis.LinearAxis) =
308328
// (fun (ch:GenericChart) ->

Diff for: src/FSharp.Plotly/Colorbar.fs

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ type Colorbar () =
4545
?Showticksuffix,
4646
?Exponentformat,
4747
?Showexponent,
48-
?Title,
49-
?Titlefont,
50-
?Titleside,
48+
?Title:string,
49+
?Titlefont:Font,
50+
?Titleside:StyleParam.Side,
5151
?Tickvalssrc,
5252
?Ticktextsrc
5353

@@ -138,9 +138,9 @@ type Colorbar () =
138138
?Showticksuffix,
139139
?Exponentformat,
140140
?Showexponent,
141-
?Title,
142-
?Titlefont,
143-
?Titleside,
141+
?Title:string,
142+
?Titlefont:Font,
143+
?Titleside:StyleParam.Side,
144144
?Tickvalssrc,
145145
?Ticktextsrc
146146

@@ -184,7 +184,7 @@ type Colorbar () =
184184
Showexponent |> DynObj.setValueOpt colorbar "showexponent"
185185
Title |> DynObj.setValueOpt colorbar "title"
186186
Titlefont |> DynObj.setValueOpt colorbar "titlefont"
187-
Titleside |> DynObj.setValueOpt colorbar "titleside"
187+
Titleside |> DynObj.setValueOptBy colorbar "titleside" (StyleParam.Side.convert)
188188
Tickvalssrc |> DynObj.setValueOpt colorbar "tickvalssrc"
189189
Ticktextsrc |> DynObj.setValueOpt colorbar "ticktextsrc"
190190

Diff for: src/FSharp.Plotly/FSharp.Plotly.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<Compile Include="StyleParams.fs" />
2828
<Compile Include="DynamicObj.fs" />
2929
<Compile Include="Colors.fs" />
30+
<Compile Include="Font.fs" />
3031
<Compile Include="Colorbar.fs" />
3132
<Compile Include="RangeSlider.fs" />
3233
<Compile Include="Light.fs" />
@@ -37,7 +38,6 @@
3738
<Compile Include="Box.fs" />
3839
<Compile Include="Meanline.fs" />
3940
<Compile Include="Marker.fs" />
40-
<Compile Include="Font.fs" />
4141
<Compile Include="Hoverlabel.fs" />
4242
<Compile Include="Axis.fs" />
4343
<Compile Include="Bins.fs" />

Diff for: src/FSharp.Plotly/Playground.fsx

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#load "StyleParams.fs"
22
#load "DynamicObj.fs"
33
#load "Colors.fs"
4+
#load "Font.fs"
45
#load "Colorbar.fs"
56
#load "RangeSlider.fs"
67
#load "Light.fs"
@@ -11,7 +12,6 @@
1112
#load "Box.fs"
1213
#load "Meanline.fs"
1314
#load "Marker.fs"
14-
#load "Font.fs"
1515
#load "Hoverlabel.fs"
1616
#load "Axis.fs"
1717
#load "Bins.fs"
@@ -201,4 +201,16 @@ generateDomainRanges 8 1
201201
|> Chart.withLayoutGridStyle(XSide=StyleParam.LayoutGridXSide.Bottom)
202202
|> Chart.withTitle("Hi i am the new SingleStackChart")
203203
|> Chart.withX_AxisStyle("im the shared xAxis")
204-
|> Chart.Show
204+
|> Chart.Show
205+
206+
[
207+
[1;2]
208+
[3;4]
209+
]
210+
|> Chart.Heatmap
211+
|> Chart.withColorbarStyle(
212+
"Hallo?",
213+
TitleSide=StyleParam.Side.Right,
214+
TitleFont=Font.init(Size=20)
215+
)
216+
|> Chart.Show

0 commit comments

Comments
 (0)