Fix: formatters.fsx

Author: muehlhaus

docs/content/contour-plots.fsx

@@ -19,12 +19,15 @@ The contour plot is an alternative to a 3-D surface plot.
 open System
 open FSharp.Plotly 
 
+
+// Generate linearly spaced vector
 let linspace (min,max,n) = 
     if n <= 2 then failwithf "n needs to be larger then 2"
     let bw = float (max - min) / (float n - 1.)
     [|min ..bw ..max|]
 
 
+// Create example data
 let size = 100
 let x = linspace(-2. * Math.PI, 2. * Math.PI, size)
 let y = linspace(-2. * Math.PI, 2. * Math.PI, size)

docs/content/index.fsx

@@ -1,7 +1,7 @@
 (*** hide ***)
 // 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.
-#I "../../bin"
+#r "../../bin/Newtonsoft.Json.dll"
 
 (**
 FSharp.Plotly
@@ -12,7 +12,7 @@ The library FSharp.Plotly implements charting suitable for use from F# scripting
 FSharp.Plotly is powered by popular JavaScript charting library [Plotly](https://plot.ly/). The library provides a complete mapping for the configuration options of the underlying library but empowers you to use the comfortable style known from the beautiful library [F# Charting](http://fslab.org/FSharp.Charting/). So you get a nice F# interface support with the full power of Plotly.
 *)
 
-#r "FSharp.Plotly.dll"
+#r "../../bin/FSharp.Plotly.dll"
 open FSharp.Plotly
 
 (**
@@ -31,7 +31,7 @@ Create the combined chart
 [
     Chart.Point(x,y,Name="scattern");
     Chart.Line(x,y',Name="line")    
-    |> Chart.withLineStyle(Width=1);
+    |> Chart.withLineStyle(Width=2);
 ] 
 |> Chart.Combine
 (*** include-it:pie1 ***)

docs/content/pie-daughnut-charts.fsx

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

docs/files/img/logo.png

@@ -41,7 +41,7 @@ let createFsiEvaluator root output =
         img.Save(output @@ "images" @@ file, System.Drawing.Imaging.ImageFormat.Png) 
         Some [ Paragraph [DirectImage ("", (root + "/images/" + file, None))]  ]
 
-    | :? GenericChart.GenericChart as ch ->
+    | :? GenericChart.GenericChart<_> as ch ->
         // Just return the inline HTML for a Plotly chart        
         let html = GenericChart.toChartHtmlWithSize 760 500 ch
         Some [InlineBlock <| html]

docs/tools/formatters.fsx

@@ -48,22 +48,21 @@ module ChartExtensions =
 //                |> Helpers.ApplyMarkerStyles(?size=Size,?color=Color,?symbol=Symbol,?opacity=Opacity)
 //            
 //            Chart.withMarkerOption(marker)         
-//            
-//        /// Apply styling to the Line(s) of the chart as Object.
-//        static member withLineOption(line:Line) =
-//            (fun (ch:GenericChart) ->                   
-//                ch |> mapTrace (fun gc -> 
-//                                    gc.set_line line
-//                                    gc)
-//            )
-//               
-//        /// Apply styling to the Line(s) of the chart.
-//        static member withLineStyle(?Width,?Color,?Shape,?Dash,?Smoothing,?ColorScale) =
-//            let line = 
-//                Line()                
-//                |> Helpers.ApplyLineStyles(?width=Width,?color=Color,?shape=Shape,?dash=Dash,?smoothing=Smoothing,?colorScale=ColorScale)
-//            
-//            Chart.withLineOption(line)  
+            
+        /// Apply styling to the Line(s) of the chart as Object.
+        static member withLineOption(line:LineOptions) =
+            (fun (ch:GenericChart<#Trace>) ->                   
+                ch |> mapTrace (fun (trace:#Trace) ->                                     
+                                    match (ApplyHelper.tryUpdatePropertyValueFromName trace "line" line) with
+                                    | Some trace' -> trace' |> unbox
+                                    | None        -> trace  |> unbox
+                               )
+            )
+               
+        /// Apply styling to the Line(s) of the chart.
+        static member withLineStyle(?Width,?Color,?Shape,?Dash,?Smoothing,?ColorScale) =
+            let line = Options.Line(?Width=Width,?Color=Color,?Shape=Shape,?Dash=Dash,?Smoothing=Smoothing,?ColorScale=ColorScale)            
+            Chart.withLineOption(line)  
 
 
 //

src/FSharp.Plotly/ChartExtensions.fs

@@ -31,7 +31,7 @@ module HTML =
 
 /// Module 
 module GenericChart =
-
+    // 'T when 'T :> Trace
     type GenericChart<'T when 'T :> Trace> =
         | Chart of 'T * (Layout -> Layout) list option
         | MultiChart of 'T list * (Layout -> Layout) list option
@@ -127,7 +127,7 @@ module GenericChart =
         html
 
     /// Converts a GenericChart to it HTML representation and set the size of the div 
-    let toChartHtmlWithSize (width:int) (height:int) gChart =
+    let toChartHtmlWithSize (width:int) (height:int) (gChart:GenericChart<#Trace>) =
         let guid = Guid.NewGuid().ToString()
         let tracesJson =
             getTraces gChart