Add: Pie and doughnut charts

Author: muehlhaus

docs/content/pie-daughnut-charts.fsx

@@ -22,5 +22,8 @@ Chart.Pie(values,labels)
 (*** include-it:pie1 ***)
 
 (*** define-output:doughnut1 ***)
-Chart.Doughnut(values,labels,Hole=0.3)
+Chart.Doughnut(values,labels,Hole=0.3,Text=labels)
 (*** include-it:doughnut1 ***)
+|> Chart.Show
+
+

src/FSharp.Plotly/Chart.fs

@@ -307,28 +307,38 @@ type Chart =
         GenericChart.Chart (trace,None)
 
 
-//    /// Shows how proportions of data, shown as pie-shaped pieces, contribute to the data as a whole.
-//    static member Pie(values,?labels,?Name,?Showlegend,?Color,?Hoverinfo,?Textinfo,?Textposition) =         
-//        let trace = 
-//            Pie()
-//            |> Options.Pie(Values=values,?Labels=labels,
-//                    TraceOptions=Options.Trace(?Name=Name,?Showlegend=Showlegend,?Hoverinfo=Hoverinfo),
-//                    Marker=Options.Marker(?Color=Color),
-//                    ?Textinfo=Textinfo,?Textposition=Textposition)                
-//        GenericChart.Chart (trace,None)
+    /// Shows how proportions of data, shown as pie-shaped pieces, contribute to the data.
+    static member Pie(values,?Labels,?Name,?Showlegend,?Color,?Text,?Textposition,?TextFont,?Hoverinfo,?Textinfo,?Opacity) =         
+        let trace = 
+            Pie()
+            |> Options.Pie(Values=values,?Labels=Labels,?Textinfo=Textinfo)
+            |> Options.ITraceInfo(?Name=Name,?Showlegend=Showlegend,?Opacity=Opacity,?Hoverinfo=Hoverinfo)
+            |> Options.ITextLabel(?Text=Text,?Textposition=Textposition,?Textfont=TextFont)
+            |> Options.IMarker(Marker=Options.Marker(?Color=Color))
+                                    
+        GenericChart.Chart (trace,None)
 
+    /// Shows how proportions of data, shown as pie-shaped pieces, contribute to the data.
+    static member Pie(data:seq<#IConvertible*#IConvertible>,?Name,?Showlegend,?Color,?Text,?Textposition,?TextFont,?Hoverinfo,?Textinfo,?Opacity) =         
+        let values,labels = Seq.unzip data 
+        Chart.Pie(values,Labels=labels,?Name=Name,?Showlegend=Showlegend,?Color=Color,?Text=Text,?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,?labels,?Name,?Showlegend,?Color,?Hole,?Hoverinfo,?Textinfo,?Textposition) =         
-//        let hole' = if Hole.IsSome then Hole.Value else 0.4
-//        let trace = 
-//            Pie()
-//            |> Options.Pie(Values=values,?Labels=labels,
-//                    TraceOptions=Options.Trace(?Name=Name,?Showlegend=Showlegend,?Hoverinfo=Hoverinfo),
-//                    Marker=Options.Marker(?Color=Color),
-//                    ?Textinfo=Textinfo,?Textposition=Textposition,Hole=hole')                
-//        GenericChart.Chart (trace,None)
+    /// Shows how proportions of data, shown as pie-shaped pieces, contribute to the data as a whole.
+    static member Doughnut(values,?Labels,?Name,?Showlegend,?Color,?Hole,?Text,?Textposition,?TextFont,?Hoverinfo,?Textinfo,?Opacity) =         
+        let hole' = if Hole.IsSome then Hole.Value else 0.4
+        let trace = 
+            Pie()
+            |> Options.Pie(Values=values,?Labels=Labels,?Textinfo=Textinfo,Hole=hole')
+            |> Options.ITraceInfo(?Name=Name,?Showlegend=Showlegend,?Opacity=Opacity,?Hoverinfo=Hoverinfo)
+            |> Options.ITextLabel(?Text=Text,?Textposition=Textposition,?Textfont=TextFont)
+            |> Options.IMarker(Marker=Options.Marker(?Color=Color))
+              
+        GenericChart.Chart (trace,None)
 
+    /// Shows how proportions of data, shown as pie-shaped pieces, contribute to the data as a whole.
+    static member Doughnut(data:seq<#IConvertible*#IConvertible>,?Name,?Showlegend,?Color,?Hole,?Text,?Textposition,?TextFont,?Hoverinfo,?Textinfo,?Opacity) =         
+        let values,labels = Seq.unzip data 
+        Chart.Doughnut(values,Labels=labels,?Name=Name,?Showlegend=Showlegend,?Color=Color,?Hole=Hole,?Text=Text,?Textposition=Textposition,?TextFont=TextFont,?Hoverinfo=Hoverinfo,?Textinfo=Textinfo,?Opacity=Opacity)
 
 
 

src/FSharp.Plotly/Options.fs

@@ -599,7 +599,7 @@ type Options() =
             ?dLabel,   
             ?Scalegroup,
             ?Textinfo,
-            ?Textfont: FontOptions,                    
+            //?Textfont: FontOptions,                    
             ?Insidetextfont: FontOptions,
             ?Outsidetextfont: FontOptions,
             ?Domain, // TODO
@@ -634,7 +634,7 @@ type Options() =
 
                 // Update
                 //Marker          |> Option.iter (updatePropertyValueAndIgnore pie <@ pie.marker          @>)
-                Textfont        |> Option.iter (updatePropertyValueAndIgnore pie <@ pie.textfont        @>)
+                //Textfont        |> Option.iter (updatePropertyValueAndIgnore pie <@ pie.textfont        @>)
                 Insidetextfont  |> Option.iter (updatePropertyValueAndIgnore pie <@ pie.insidetextfont  @>)
                 Outsidetextfont |> Option.iter (updatePropertyValueAndIgnore pie <@ pie.outsidetextfont @>)