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

Author: muehlhaus

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

@@ -3,13 +3,10 @@
 #r "../../bin/FSharp.Plotly.dll"
 
 (** 
-# FSharp.Plotly: Pie and Doughnut Charts
+# FSharp.Plotly: Mesh3d
 
-*Summary:* This example shows how to create pie and doughnut charts in F#.
+*Summary:* This example shows how to create 3D-Mesh 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.
 *)
 
 open System
@@ -46,6 +43,8 @@ let cont = DynamicObj()
 cont?show <- true
 cont?width <- 3
 
+
+(*** define-output:mesh3d_1 ***)
 Trace3d.initMesh3d 
     (fun mesh3d ->
         mesh3d?x <- a
@@ -56,24 +55,6 @@ Trace3d.initMesh3d
         mesh3d
         )
 |> GenericChart.ofTraceObject 
-|> Chart.Show 
-
-
-//(*** define-output:contour1 ***)
-//z
-//|> Chart.Surface
-//|> Chart.withSize(600.,600.)
-//(*** include-it:contour1 ***)
-//
-//// Create simple example data were x y and z is given (z is a xy-Matrix)
-//let x' = [0.;2.5]
-//let y' = [0.;2.5]
-//let z' = [
-//    [1.;1.;]; // row wise (length x)
-//    [1.;1.;];
-//    ] // column (length y)
-//
-//Chart.Surface(z',x',y')
-
+(*** include-it:mesh3d_1 ***)
 
 

docs/content/histograms.fsx

@@ -20,6 +20,6 @@ let x = [for i=0 to 500 do yield rnd.NextDouble() ]
 x
 |> Chart.Histogram
 |> Chart.withSize(500.,500.)
-//(*** include-it:histo1 ***)
-|> Chart.Show
+(*** include-it:histo1 ***)
+
 

docs/tools/templates/template.cshtml

@@ -54,13 +54,15 @@
               <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/windrose-charts.html">Polar Charts</a></li>
+              <li><a href="@Root/windrose-charts.html">Windrose 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-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><a href="@Root/3d-mesh-plots.html">3D MEsh Plots</a></li>
+              <li><a href="@Root/3d-mesh-plots.html">3D Mesh Plots</a></li>
+            <li class="nav-header">Styling</li>
+              <li><a href="@Root/shapes.html">Shapes</a></li>
             <li class="nav-header">Plotly WPF</li>
               <li><a href="@Root/plotly-wpf.html">Using Plotly PopUp window</a></li>            
 

src/FSharp.Plotly.WPF/FSharp.Plotly.WPF.fsproj

@@ -10,7 +10,7 @@
     <RootNamespace>FSharp.Plotly.WPF</RootNamespace>
     <AssemblyName>FSharp.Plotly.WPF</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>FSharp.Plotly.WPF</Name>
     <TargetFrameworkProfile />

src/FSharp.Plotly/Chart.fs

@@ -2,13 +2,33 @@ namespace FSharp.Plotly
 
 open System
 open System.IO
-open FSharp.Care.Collections
+//open FSharp.Care.Collections
 
 open GenericChart
 open Trace
 open Trace3d
 
 
+// ###########
+// Copied from FSharp.Care.Collections to remove dependancies
+[<AutoOpen>]
+module Seq = 
+
+    /// Splits a sequence of pairs into two sequences
+    let unzip (input:seq<_>) =
+        let (lstA, lstB) = 
+            Seq.foldBack (fun (a,b) (accA, accB) -> 
+                a::accA, b::accB) input ([],[])
+        (Seq.ofList lstA, Seq.ofList lstB)    
+
+    /// Splits a sequence of triples into three sequences
+    let unzip3 (input:seq<_>) =
+        let (lstA, lstB, lstC) = 
+            Seq.foldBack (fun (a,b,c) (accA, accB, accC) -> 
+                a::accA, b::accB, c::accC) input ([],[],[])
+        (Seq.ofList lstA, Seq.ofList lstB, Seq.ofList lstC) 
+
+
 /// Provides a set of static methods for creating charts.
 type Chart =
 

src/FSharp.Plotly/FSharp.Plotly.fsproj

@@ -87,9 +87,6 @@
     <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Care">
-      <HintPath>..\..\lib\FSharp.Care.dll</HintPath>
-    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />