Skip to content

fix color assignment of pie and doughnut charts #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2021
Merged

fix color assignment of pie and doughnut charts #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9ad8c7
fix light axis templates
Mar 19, 2021
2bbb35a
fix colors in pie chart
Mar 19, 2021
1d66eba
add sunburst chart documentation
Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions docs/2_5_pie-doughnut-charts.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ let labels = ["Residential"; "Non-Residential"; "Utility"]

(**

A pie or a doughnut chart can be created using the `Chart.Pie` and `Chart.Doughnut` functions.
When creating pie or doughnut charts, it is usually desirable to provide both labels and
values.
A pie, doughnut, or sunburst chart can be created using the `Chart.Pie`, `Chart.Doughnut`, and `Chart.Sunburst` functions.
When creating pie charts, it is usually desirable to provide both labels and values.

*)

Expand Down Expand Up @@ -60,4 +59,21 @@ doughnut1

(***hide***)
doughnut1 |> GenericChart.toChartHTML
(***include-it-raw***)
(***include-it-raw***)

let sunburst1 =
Chart.Sunburst(
["A";"B";"C";"D";"E"],
["";"";"B";"B";""],
Values=[5.;0.;3.;2.;3.],
Text=["At";"Bt";"Ct";"Dt";"Et"]
)

(*** condition: ipynb ***)
#if IPYNB
sunburst1
#endif // IPYNB

(***hide***)
sunburst1 |> GenericChart.toChartHTML
(***include-it-raw***)
16 changes: 8 additions & 8 deletions src/Plotly.NET/Chart.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,15 +1269,15 @@ type Chart =
[<Optional;DefaultParameterValue(null)>] ?Labels,
[<Optional;DefaultParameterValue(null)>] ?Name,
[<Optional;DefaultParameterValue(null)>] ?Showlegend,
[<Optional;DefaultParameterValue(null)>] ?Color,
[<Optional;DefaultParameterValue(null)>] ?Colors,
[<Optional;DefaultParameterValue(null)>] ?TextPosition,
[<Optional;DefaultParameterValue(null)>] ?TextFont,
[<Optional;DefaultParameterValue(null)>] ?Hoverinfo,
[<Optional;DefaultParameterValue(null)>] ?Textinfo,
[<Optional;DefaultParameterValue(null)>] ?Opacity) =
Trace.initPie (TraceStyle.Pie(Values=values,?Labels=Labels,?Textinfo=Textinfo))
|> TraceStyle.TraceInfo(?Name=Name,?Showlegend=Showlegend,?Opacity=Opacity,?Hoverinfo=Hoverinfo)
|> TraceStyle.Marker(?Color=Color)
|> TraceStyle.Marker(?Colors=Colors)
|> TraceStyle.TextLabel(?Text=Labels,?Textposition=TextPosition,?Textfont=TextFont)
|> GenericChart.ofTraceObject

Expand All @@ -1286,22 +1286,22 @@ type Chart =
static member Pie(data:seq<#IConvertible*#IConvertible>,
[<Optional;DefaultParameterValue(null)>] ?Name,
[<Optional;DefaultParameterValue(null)>] ?Showlegend,
[<Optional;DefaultParameterValue(null)>] ?Color,
[<Optional;DefaultParameterValue(null)>] ?Colors,
[<Optional;DefaultParameterValue(null)>] ?TextPosition,
[<Optional;DefaultParameterValue(null)>] ?TextFont,
[<Optional;DefaultParameterValue(null)>] ?Hoverinfo,
[<Optional;DefaultParameterValue(null)>] ?Textinfo,
[<Optional;DefaultParameterValue(null)>] ?Opacity) =
let values,labels = Seq.unzip data
Chart.Pie(values,Labels=labels,?Name=Name,?Showlegend=Showlegend,?Color=Color,?TextPosition=TextPosition,?TextFont=TextFont,?Hoverinfo=Hoverinfo,?Textinfo=Textinfo,?Opacity=Opacity)
Chart.Pie(values,Labels=labels,?Name=Name,?Showlegend=Showlegend,?Colors=Colors,?TextPosition=TextPosition,?TextFont=TextFont,?Hoverinfo=Hoverinfo,?Textinfo=Textinfo,?Opacity=Opacity)


/// Shows how proportions of data, shown as pie-shaped pieces, contribute to the data as a whole.
static member Doughnut(values,
[<Optional;DefaultParameterValue(null)>] ?Labels,
[<Optional;DefaultParameterValue(null)>] ?Name,
[<Optional;DefaultParameterValue(null)>] ?Showlegend,
[<Optional;DefaultParameterValue(null)>] ?Color,
[<Optional;DefaultParameterValue(null)>] ?Colors,
[<Optional;DefaultParameterValue(null)>] ?Hole,
[<Optional;DefaultParameterValue(null)>] ?TextPosition,
[<Optional;DefaultParameterValue(null)>] ?TextFont,
Expand All @@ -1311,7 +1311,7 @@ type Chart =
let hole' = if Hole.IsSome then Hole.Value else 0.4
Trace.initPie (TraceStyle.Pie(Values=values,?Labels=Labels,?Textinfo=Textinfo,Hole=hole'))
|> TraceStyle.TraceInfo(?Name=Name,?Showlegend=Showlegend,?Opacity=Opacity,?Hoverinfo=Hoverinfo)
|> TraceStyle.Marker(?Color=Color)
|> TraceStyle.Marker(?Colors=Colors)
|> TraceStyle.TextLabel(?Text=Labels,?Textposition=TextPosition,?Textfont=TextFont)
|> GenericChart.ofTraceObject

Expand All @@ -1320,15 +1320,15 @@ type Chart =
static member Doughnut(data:seq<#IConvertible*#IConvertible>,
[<Optional;DefaultParameterValue(null)>] ?Name,
[<Optional;DefaultParameterValue(null)>] ?Showlegend,
[<Optional;DefaultParameterValue(null)>] ?Color,
[<Optional;DefaultParameterValue(null)>] ?Colors,
[<Optional;DefaultParameterValue(null)>] ?Hole,
[<Optional;DefaultParameterValue(null)>] ?TextPosition,
[<Optional;DefaultParameterValue(null)>] ?TextFont,
[<Optional;DefaultParameterValue(null)>] ?Hoverinfo,
[<Optional;DefaultParameterValue(null)>] ?Textinfo,
[<Optional;DefaultParameterValue(null)>] ?Opacity) =
let values,labels = Seq.unzip data
Chart.Doughnut(values,Labels=labels,?Name=Name,?Showlegend=Showlegend,?Color=Color,?Hole=Hole,?TextPosition=TextPosition,?TextFont=TextFont,?Hoverinfo=Hoverinfo,?Textinfo=Textinfo,?Opacity=Opacity)
Chart.Doughnut(values,Labels=labels,?Name=Name,?Showlegend=Showlegend,?Colors=Colors,?Hole=Hole,?TextPosition=TextPosition,?TextFont=TextFont,?Hoverinfo=Hoverinfo,?Textinfo=Textinfo,?Opacity=Opacity)


/// Uses points, line or both depending on the mode to represent data points in a polar chart
Expand Down
20 changes: 19 additions & 1 deletion src/Plotly.NET/Playground.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#load "Layout.fs"
#load "Template.fs"
#load "Config.fs"
#r @"..\..\packages\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll"
#r "nuget: Newtonsoft.Json, 12.0.3"
#load "GenericChart.fs"
#load "Chart.fs"
#load "ChartExtensions.fs"
Expand Down Expand Up @@ -493,3 +493,21 @@ generateDomainRanges 8 1
TitleFont=Font.init(Size=20)
)
|> Chart.Show

let values,labels =
[
1,"v1"
2,"v2"
]
|> Seq.unzip

let cols =[|"black";"blue"|]

let doughnut1 =
Chart.Pie(
values,
labels,
Colors=cols,
Textinfo=labels
)
|> Chart.Show
90 changes: 76 additions & 14 deletions src/Plotly.NET/Template.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,41 @@ module ChartTemplates =
|]

let light =

let defaultFont = Font.init (Size = 40)
let initLightAxisTemplate() =
Axis.LinearAxis.init(
Showline = true,
Zeroline = true
)

let defaultLayout =
Layout.init (
Paper_bgcolor = "white",
Plot_bgcolor= "white",
Font = defaultFont
Plot_bgcolor = "white"
)
|> Layout.AddLinearAxis((StyleParam.AxisId.X 1),(initLightAxisTemplate()))
|> Layout.AddLinearAxis((StyleParam.AxisId.Y 1),(initLightAxisTemplate()))

Template.init(defaultLayout)

let lightMirrored =
let initLightAxisTemplate() =
Axis.LinearAxis.init(
Showline = true,
Zeroline = true,
Mirror = StyleParam.Mirror.All,
Ticks = StyleParam.TickOptions.Inside
//Showgrid = false
)

let defaultLayout =
Layout.init (
Paper_bgcolor = "white",
Plot_bgcolor = "white"
)
|> Layout.AddLinearAxis((StyleParam.AxisId.X 1),(initLightAxisTemplate()))
|> Layout.AddLinearAxis((StyleParam.AxisId.Y 1),(initLightAxisTemplate()))

Template.init(defaultLayout, TraceTemplates = [||])
Template.init(defaultLayout)

let dark =

Expand All @@ -103,8 +126,9 @@ module ChartTemplates =
Zerolinecolor = "rgb(204, 204, 204)",
Gridcolor = "rgba(204, 204, 204, 0.3)",
Tickcolor = "rgba(204, 204, 204, 0.5)",
Showline= true,
Zeroline=true
Ticks = StyleParam.TickOptions.Inside,
Showline = true,
Zeroline = true
)

let darkLayoutTemplate =
Expand Down Expand Up @@ -136,22 +160,60 @@ module ChartTemplates =

let initFslabAxisTemplate() =
Axis.LinearAxis.init(
Linecolor = "#438AFE",
Linecolor = "white",
Zerolinecolor = "rgba(67, 138, 254, 0.5)",
Gridcolor = "rgba(67, 138, 254, 0.5)",
Tickcolor = "rgba(67, 138, 254, 0.5)",
Showline= true,
Zeroline=true
Ticks = StyleParam.TickOptions.Inside,
Showline = true,
Zeroline = true
)

let fslabLayoutTemplate =
Layout.init(
Paper_bgcolor = "#2D3E50",
Plot_bgcolor= "#2D3E50",
Font = Font.init(Color = "#438AFE")
Paper_bgcolor = "#200117",
Plot_bgcolor= "#200117",
Font = Font.init(Color = "white")
)
|> Layout.AddLinearAxis((StyleParam.AxisId.X 1),(initFslabAxisTemplate()))
|> Layout.AddLinearAxis((StyleParam.AxisId.Y 1),(initFslabAxisTemplate()))

Template.init(fslabLayoutTemplate)
|> Template.withColorWay ColorWays.fslab
|> Template.withColorWay ColorWays.fslab


let transparent =
let initTransparentAxisTemplate() =
Axis.LinearAxis.init(
Showline = true,
Zeroline = true
)

let defaultLayout =
Layout.init (
Paper_bgcolor = "rgba(255, 255, 255, 0)",
Plot_bgcolor = "rgba(255, 255, 255, 0)"
)
|> Layout.AddLinearAxis((StyleParam.AxisId.X 1),(initTransparentAxisTemplate()))
|> Layout.AddLinearAxis((StyleParam.AxisId.Y 1),(initTransparentAxisTemplate()))

Template.init(defaultLayout)

let transparentMirrored =
let initTransparentAxisTemplate() =
Axis.LinearAxis.init(
Showline = true,
Zeroline = true,
Mirror = StyleParam.Mirror.All,
Ticks = StyleParam.TickOptions.Inside
)

let defaultLayout =
Layout.init (
Paper_bgcolor = "rgba(255, 255, 255, 0)",
Plot_bgcolor = "rgba(255, 255, 255, 0)"
)
|> Layout.AddLinearAxis((StyleParam.AxisId.X 1),(initTransparentAxisTemplate()))
|> Layout.AddLinearAxis((StyleParam.AxisId.Y 1),(initTransparentAxisTemplate()))

Template.init(defaultLayout)