Merge branch 'master' of https://github.com/muehlhaus/FSharp.Plotly.git

Author: Timo Mühlhaus

docs/content/3d-scatter-plots.fsx

@@ -3,13 +3,11 @@
 #r "../../bin/FSharp.Plotly.dll"
 
 (** 
-# FSharp.Plotly: Pie and Doughnut Charts
+# FSharp.Plotly: Scatter3d Charts
 
-*Summary:* This example shows how to create pie and doughnut charts in F#.
+*Summary:* This example shows how to create three-dimensional scatter charts in F#.
 
-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 Scatter3d chart report shows a three-dimensional spinnable view of your data
 *)
 
 open FSharp.Plotly 
@@ -20,10 +18,15 @@ let z = [19; 26; 55;]
 
 
 (*** define-output:scatter3d_1 ***)
-Chart3d.Scatter(x,y,z,StyleOption.Mode.Markers)
+Chart.Scatter3d(x,y,z,StyleOption.Mode.Markers)
+|> Chart.withX_AxisStyle("my x-axis")
+|> Chart.withY_AxisStyle("my y-axis")
+|> Chart.withZ_AxisStyle("my z-axis")
+|> Chart.withSize(800.,800.)
+
 (*** include-it:scatter3d_1 ***)
-|> Chart3d.withSize(900.,900.)
-|> Chart3d.Show
+|> Chart.Show
+
 
 
 

docs/content/area-plots.fsx

@@ -26,5 +26,5 @@ Chart.Area(x,y)
 (*** define-output:area2 ***)
 Chart.SplineArea(x,y)
 (*** include-it:area2 ***)
-|> Chart.Show
+
 

docs/content/bar-charts.fsx

@@ -5,22 +5,39 @@
 (** 
 # FSharp.Plotly: Pie and Doughnut Charts
 
-*Summary:* This example shows how to create pie and doughnut charts in F#.
+*Summary:* This example shows how to create bar and a column charts in F#.
 
-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 bar chart or bar graph is a chart that presents grouped data with rectangular bars with 
+lengths proportional to the values that they represent. The bars can be plotted vertically
+or horizontally. A vertical bar chart is called a column bar chart.
 *)
 
 open FSharp.Plotly 
 
-let yValues = [20; 14; 23;]
-let xValues = ["Product A"; "Product B"; "Product C";]
-let labels  = ["27% market share"; "24% market share"; "19% market share";]
-  
-(*** define-output:pie1 ***)
-Chart.Bar(xValues,yValues,Labels=labels,Opacity=0.3,Marker=Options.Marker(Color="rgba(222,45,38,0.8)"))
-|> Chart.withSize(500.,500.)
-(*** include-it:pie1 ***)
-|> Chart.Show
+let values = [20; 14; 23;]
+let keys   = ["Product A"; "Product B"; "Product C";]
+let labels = ["27% market share"; "24% market share"; "19% market share";]
+
+(*** define-output:bar1 ***)
+Chart.Column(keys,values,Labels=labels,Opacity=0.3,Marker=Options.Marker(Color="rgba(222,45,38,0.8)"))
+(*** include-it:bar1 ***)
+
+(*** define-output:bar2 ***)
+Chart.Bar(keys,values)
+(*** include-it:bar2 ***)
+
+
+(** 
+
+## Stacked bar chart or column charts
+The following example shows how to create a stacked bar chart by combining bar charts created by  `Chart.StackedBar` 
+*)
+
 
+(*** define-output:bar3 ***)
+[
+    Chart.StackedBar(keys,values,Name="old");
+    Chart.StackedBar(keys,[8; 21; 13;],Name="new")
+]
+|> Chart.Combine
+(*** include-it:bar3 ***)

docs/content/box-plots.fsx

@@ -18,5 +18,4 @@ let x = ["bin1";"bin2";"bin1";"bin2";"bin1";"bin2";"bin1";"bin1";"bin2";"bin1"]
 
 (*** define-output:box1 ***)
 Chart.BoxPlot(x,y,Jitter=0.3,Boxpoints=StyleOption.Boxpoints.Outliers)
-//|> Chart.Show
 (*** include-it:box1 ***)

docs/content/contour-plots.fsx

@@ -44,8 +44,4 @@ let z =
 z
 |> Chart.Contour
 |> Chart.withSize(600.,600.)
-(*** include-it:contour1 ***)
-|> Chart.Show
-
-
-
+(*** include-it:contour1 ***)

docs/content/getting-started.fsx

@@ -2,6 +2,7 @@
 // This block of code is omitted in the generated HTML documentation. Use 
 // it to define helpers that you do not want to show in the documentation.
 #r "../../bin/Newtonsoft.Json.dll"
+#r "../../lib/FSharp.Care.dll"
 
 (**
 FSharp.Plotly
@@ -36,5 +37,10 @@ GenericChart.ofTraceObject trace layout
 |> Chart.Show
 
 
+let red = FSharp.Care.Colors.Table.Office.red
+let red' = FSharp.Care.Colors.toHex false red
 
+Chart.Point([1; 2; 3; 4],[12; 9; 15; 12])
+|> Chart.withMarkerStyle(Color=red')
+|> Chart.Show
 

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
+
+

docs/tools/formatters.fsx

@@ -43,7 +43,7 @@ let createFsiEvaluator root output =
 
     | :? GenericChart.GenericChart as ch ->
         // Just return the inline HTML for a Plotly chart        
-        let html = GenericChart.toChartHtmlWithSize 760 500 ch
+        let html = GenericChart.toChartHtmlWithSize 500 500 ch
         Some [InlineBlock <| html]
 
     | _ -> None 

docs/tools/templates/template.cshtml

@@ -49,16 +49,16 @@
               <li><a href="@Root/bubble-charts.html">Bubble Charts</a></li>
               <li><a href="@Root/contour-plots.html">Contour Plots</a></li>
               <li><a href="@Root/heatmaps.html">Heatmaps</a></li>
-              <li><a href="@Root/histograms.html">Histograms</a></li>
-              <li><a href="@Root/2d-histograms.html">2D Histograms</a></li>  
+              @*<li><a href="@Root/histograms.html">Histograms</a></li>
+              <li><a href="@Root/2d-histograms.html">2D Histograms</a></li>*@  
               <li><a href="@Root/line-scatter-plots.html">Line and Scatter Plots</a></li>                          
               <li><a href="@Root/pie-daughnut-charts.html">Pie and Doughnut Charts</a></li>
               <li><a href="@Root/polar-charts.html">Polar Charts</a></li>
               <li><a href="@Root/range-plots.html">Range Plots</a></li>                                                             
             <li class="nav-header">Plotly 3d-Charts</li>
-              <li><a href="@Root/3d-line-plots.html">3D Line Plots</a></li>
-              <li><a href="@Root/3d-scatter-plots.html">3D Scatter Plots</a></li>              
-              <li><a href="@Root/3d-surface-plots.html">3D Surface Plots</a></li>            
+              <li><a href="@Root/3d-scatter-plots.html">3D Scatter Plots</a></li>           
+              @*<li><a href="@Root/3d-line-plots.html">3D Line Plots</a></li>             
+              <li><a href="@Root/3d-surface-plots.html">3D Surface Plots</a></li>*@
             <li class="nav-header">Plotly WPF</li>
               <li><a href="@Root/plotly-wpf.html">Using Plotly PopUp window</a></li>