Fix histogram

Author: muehlhaus

docs/content/box-plots.fsx

@@ -45,3 +45,6 @@ let y' =  [2.; 1.5; 5.; 1.5; 2.; 2.5; 2.1; 2.5; 1.5; 1.;2.; 1.5; 5.; 1.5; 3.; 2.
 |> Chart.Combine
 (*** include-it:box3 ***)
 
+
+
+

docs/content/getting-started.fsx

@@ -16,25 +16,48 @@ The library provides a complete mapping for the configuration options of the und
 #r "../../bin/FSharp.Plotly.dll"
 open FSharp.Plotly
 
+// Functional F# scripting style
 
-Trace.initScatter (fun scatter ->
-    scatter?x <- [1; 2; 3; 4]
-    scatter?y <- [1; 2; 3; 4]
-    scatter?mode <- "lines+markers"
-    scatter?name <- "lines and markers"
-    scatter
-    )
+
+Chart.Scatter ([1; 2; 3; 4],[12; 9; 15; 12],
+      StyleParam.Mode.Lines_Markers,
+      Name="lines and markers")
+
+
+// Dynanic object
+
+let scattern = 
+    let dyn = Trace("scatter")
+    dyn?x <- [1; 2; 3; 4]
+    dyn?y <- [12; 9; 15; 12]
+    dyn?mode <- "lines+markers"
+    dyn?name <- "lines and markers"
+    dyn
+
+scattern
 |> GenericChart.ofTraceObject
-|> Chart.Show
 
 
 
 
+Trace.initScatter (
+       Trace.TraceStyle.Scatter
+            ( X    = [1; 2; 3; 4],
+              Y    = [12; 9; 15; 12], 
+              Mode = StyleParam.Mode.Lines_Markers
+            )     )               
+|> Trace.TraceStyle.TraceInfo(Name="lines and markers")
+|> GenericChart.ofTraceObject 
+
 
-open FSharp.Care.Colors
-let red' = FSharp.Care.Colors.toHex false Table.Office.red
 
-Chart.Point([1; 2; 3; 4],[12; 9; 15; 12])
-|> Chart.withMarkerStyle(Color=red')
-|> Chart.Show
+Trace.initScatter 
+    (fun scatter ->
+        scatter?x <- [1; 2; 3; 4]
+        scatter?y <- [12; 9; 15; 12]
+        scatter?mode <- "lines+markers"
+        scatter?name <- "lines and markers"
+        scatter
+    )
+|> GenericChart.ofTraceObject
 

src/FSharp.Plotly/Chart.fs

@@ -378,20 +378,21 @@ type Chart =
         |> GenericChart.ofTraceObject 
 
      /// Computes a histogram with auto-determined the bin size.
-    static member Histogram(data,?Orientation,?Name,?Showlegend,?Marker,?HistNorm,?HistFunc,?nBinsx,?nBinsy,?Xbins,?Ybins,?xError,?yError) =         
+    static member Histogram(data,?Orientation,?Name,?Showlegend,?Opacity,?Color,?HistNorm,?HistFunc,?nBinsx,?nBinsy,?Xbins,?Ybins,?xError,?yError) =         
         Trace.initHistogram (
             TraceStyle.Histogram (X=data,?Orientation=Orientation,?HistNorm=HistNorm,?HistFunc=HistFunc,
                                     ?nBinsx=nBinsx,?nBinsy=nBinsy,?xBins=Xbins,?yBins=Ybins)
                              )
-        |> TraceStyle.TraceInfo(?Name=Name,?Showlegend=Showlegend)//,?Opacity=Opacity)   
+        |> TraceStyle.Marker(?Color=Color)
+        |> TraceStyle.TraceInfo(?Name=Name,?Showlegend=Showlegend,?Opacity=Opacity)   
         |> GenericChart.ofTraceObject
 
      /// Computes the bi-dimensional histogram of two data samples and auto-determines the bin size.
-    static member Histogram2d(x,y,?Z,?Name,?Showlegend,?Colorscale,?Showscale,?zSmooth,?Colorbar,?zAuto,?zMin,?zMax,?nBinsx,?nBinsy,?Xbins,?Ybins,?HistNorm,?HistFunc) =         
+    static member Histogram2d(x,y,?Z,?Name,?Showlegend,?Opacity,?Colorscale,?Showscale,?zSmooth,?Colorbar,?zAuto,?zMin,?zMax,?nBinsx,?nBinsy,?Xbins,?Ybins,?HistNorm,?HistFunc) =         
         Trace.initHistogram2d (
             TraceStyle.Histogram2d (X=x, Y=y,? Z=Z,
                                 ?Colorscale=Colorscale,?Showscale=Showscale,?zSmooth=zSmooth,?Colorbar=Colorbar) )
-        |> TraceStyle.TraceInfo(?Name=Name)//,?Showlegend=Showlegend,?Opacity=Opacity)   
+        |> TraceStyle.TraceInfo(?Name=Name,?Showlegend=Showlegend,?Opacity=Opacity)   
         |> GenericChart.ofTraceObject