Add subplots

Author: muehlhaus

docs/content/errorbars.fsx

@@ -53,3 +53,5 @@ Chart.Line([1; 2; 3; 4],[90; 110; 190; 120],Name="anchor 2")
 
 // Simple Subplot
 
+
+

docs/content/multiple-charts.fsx

@@ -52,4 +52,14 @@ Chart.Line([1; 2; 3; 4],[90; 110; 190; 120],Name="anchor 2")
 
 
 // Simple Subplot
+[for i=1 to 8 do yield (Chart.Scatter ([1; 2; 3; 4],[12; 9; 15; 12],StyleParam.Mode.Lines_Markers) |> Chart.withY_AxisStyle("y-title") )]
+
+|> Chart.stackHorizontal(Col=2,Space=0.15)
+|> Chart.Combine
+|> Chart.Show
+
+//|> Chart.withX_AxisStyle("Title1")
+//|> Chart.withX_AxisStyle(sprintf "Title%i" 3,Id=3)
+//|> Chart.Show
+
 

src/FSharp.Plotly/ChartExtensions.fs

@@ -13,6 +13,10 @@ module ChartExtensions =
     open Trace
     //open StyleParam
 
+    //open ChartExtensions
+
+    //open StyleParam
+
     /// Provides a set of static methods for creating charts.
     type Chart with   
 
@@ -122,7 +126,7 @@ module ChartExtensions =
                     let layout =
                         let id = if Id.IsSome then StyleParam.AxisId.X Id.Value else StyleParam.AxisId.X 1
                         GenericChart.getLayout ch 
-                        |> Layout.AddLinearAxis(id,axis=xAxis)
+                        |> Layout.UpdateLinearAxisById(id,axis=xAxis)
                     GenericChart.setLayout layout ch
                 | true  -> 
                     let layout =
@@ -157,7 +161,7 @@ module ChartExtensions =
                     let layout =
                         let id = if Id.IsSome then StyleParam.AxisId.Y Id.Value else StyleParam.AxisId.Y 1
                         GenericChart.getLayout ch 
-                        |> Layout.AddLinearAxis(id,axis=yAxis)
+                        |> Layout.UpdateLinearAxisById(id,axis=yAxis)
                     GenericChart.setLayout layout ch
                 | true  -> 
                     let layout =
@@ -275,8 +279,7 @@ module ChartExtensions =
                 let margin = 
                     Margin.init ( ?Left=Left,?Right=Right,?Top=Top,?Bottom=Bottom,?Pad=Pad,?Autoexpand=Autoexpand )
                 Chart.withMargin(margin) 
-
-                
+              
 
         // TODO: Include withLegend & withLegendStyle
 
@@ -304,6 +307,70 @@ module ChartExtensions =
         static member Combine(gCharts:seq<GenericChart>) =
             GenericChart.combine gCharts
 
+
+        /// Create a combined chart with the given charts merged   
+        static member Stack (?ColCount:int, ?Space) = 
+            (fun (charts:#seq<GenericChart>) ->  
+
+                let col = defaultArg ColCount 2
+                let len      = charts |> Seq.length
+                let colWidth = 1. / float col
+                let rowWidth = 
+                    let tmp = float len / float col |> ceil
+                    1. / tmp
+                let space = 
+                    let s = defaultArg Space 0.05                    
+                    if s < 0. || s > 1. then 
+                        printfn "Space should be between 0.0 - 1.0. Automaticaly set to default (0.05)"
+                        0.05
+                    else
+                        s  
+
+                charts
+                |> Seq.mapi (fun i ch ->
+                    let colI,rowI,index = (i%col+1), (i/col+1),(i+1)
+                    let xdomain = (colWidth * float (colI-1), (colWidth * float colI) - space ) 
+                    let ydomain = (1. - ((rowWidth * float rowI) - space ),1. - (rowWidth * float (rowI-1)))
+                    let xaxis,yaxis,layout = 
+                        let layout = GenericChart.getLayout ch
+                        let xName, yName = StyleParam.AxisId.X 1 |> StyleParam.AxisId.toString, StyleParam.AxisId.Y 1 |> StyleParam.AxisId.toString
+                        match (layout.TryGetTypedValue<Axis.LinearAxis> xName),(layout.TryGetTypedValue<Axis.LinearAxis> yName) with
+                        | Some x, Some y ->                             
+                            // remove axis
+                            DynObj.remove layout xName
+                            DynObj.remove layout yName
+                            
+                            x |> Axis.LinearAxis.style(Anchor=StyleParam.AxisAnchorId.Y index,Domain=StyleParam.Range.MinMax xdomain),
+                            y |> Axis.LinearAxis.style(Anchor=StyleParam.AxisAnchorId.X index,Domain=StyleParam.Range.MinMax ydomain),
+                            layout
+                        | Some x, None -> 
+                            // remove x - axis
+                            DynObj.remove layout xName
+                            x |> Axis.LinearAxis.style(Anchor=StyleParam.AxisAnchorId.Y index,Domain=StyleParam.Range.MinMax xdomain),
+                            Axis.LinearAxis.init(Anchor=StyleParam.AxisAnchorId.X index,Domain=StyleParam.Range.MinMax ydomain),
+                            layout
+                        | None, Some y -> 
+                            // remove y - axis
+                            DynObj.remove layout yName
+                            Axis.LinearAxis.init(Anchor=StyleParam.AxisAnchorId.Y index,Domain=StyleParam.Range.MinMax xdomain),
+                            y |> Axis.LinearAxis.style(Anchor=StyleParam.AxisAnchorId.X index,Domain=StyleParam.Range.MinMax ydomain),
+                            layout
+                        | None, None ->
+                            Axis.LinearAxis.init(Anchor=StyleParam.AxisAnchorId.Y index,Domain=StyleParam.Range.MinMax xdomain),
+                            Axis.LinearAxis.init(Anchor=StyleParam.AxisAnchorId.X index,Domain=StyleParam.Range.MinMax ydomain),
+                            layout
+                    
+                    ch
+                    |> GenericChart.setLayout layout
+                    |> Chart.withAxisAnchor(X=index,Y=index) 
+                    |> Chart.withX_Axis(xaxis,index)
+                    |> Chart.withY_Axis(yaxis,index)
+                    )
+                
+                |> Chart.Combine            
+                )
+
+
         /// Save chart as html single page
         static member SaveHtmlAs pathName (ch:GenericChart,?Verbose) =                                     
             let html = GenericChart.toEmbeddedHTML ch

src/FSharp.Plotly/DynamicObj.fs

@@ -99,6 +99,17 @@ module ReflectionHelper =
         tryUpdatePropertyValue o expr f |> ignore
 
 
+    /// Removes property 
+    let removeProperty (o:obj) (propName:string) =        
+        match tryGetPropertyInfo o propName with         
+        | Some property ->
+            try 
+                property.SetValue(o, null, null)
+                true
+            with
+            | :? System.ArgumentException -> false
+            | :? System.NullReferenceException -> false
+        | None -> false
 
 
 
@@ -118,6 +129,17 @@ type DynamicObj internal (dict:Dictionary<string, obj>) =
         | true,value ->  Some value
         // Next check for Public properties via Reflection
         | _ -> ReflectionHelper.tryGetPropertyValue this name
+
+
+    /// Gets property value
+    member this.TryGetTypedValue<'a> name = 
+        match (this.TryGetValue name) with
+        | None -> None
+        | Some o -> 
+            match o with
+            | :? 'a -> o :?> 'a |> Some
+            | _ -> None
+
 
     /// Sets property value, creating a new property if none exists
     member this.SetValue (name,value) = // private
@@ -142,6 +164,12 @@ type DynamicObj internal (dict:Dictionary<string, obj>) =
             | true,_ -> properties.[name] <- value
             | _      -> properties.Add(name,value)
 
+    member this.Remove name =
+        match ReflectionHelper.removeProperty this name with
+        | true -> true
+        // Maybe in map
+        | false -> properties.Remove(name)
+
 
     override this.TryGetMember(binder:GetMemberBinder,result:obj byref ) =     
         match this.TryGetValue binder.Name with
@@ -177,6 +205,8 @@ type DynamicObj internal (dict:Dictionary<string, obj>) =
     static member GetValue (lookup:DynamicObj,name) =
         lookup.TryGetValue(name).Value
 
+    static member Remove (lookup:DynamicObj,name) =
+        lookup.Remove(name)
 
 
 // ###############################
@@ -207,7 +237,7 @@ module DynObj =
         new DynamicObj(dict)
 
 
-    // /// Merges two DynamicObj (Warning: In case of dublicate property names the second member override the first)
+    // 
     // let rec merge (first:#DynamicObj) (second:#DynamicObj) = 
     //     let dict = new Dictionary<string, obj>()
 
@@ -225,8 +255,11 @@ module DynObj =
     //     new DynamicObj(dict)
 
     //let rec combine<'t when 't :> DynamicObj > (first:'t) (second:'t) =
+    
+
+    /// Merges two DynamicObj (Warning: In case of dublicate property names the second member override the first)
     let rec combine (first:DynamicObj) (second:DynamicObj) =
-        printfn "Type %A" (first.GetType())
+        //printfn "Type %A" (first.GetType())
         /// Consider deep-copy of first
         for kv in (second.GetProperties true) do 
             match kv.Value with
@@ -259,3 +292,9 @@ module DynObj =
         match dyn.TryGetMember name with
         | true,value ->  Some value
         | _ -> None
+
+    let remove (dyn:DynamicObj) propName = 
+        DynamicObj.Remove (dyn, propName) |> ignore
+
+
+

src/FSharp.Plotly/Layout.fs

@@ -255,4 +255,22 @@ type Layout() =
                 layout
             )
 
+    // Updates the style of current axis with given AxisId
+    static member UpdateLinearAxisById
+        (   
+            id   : StyleParam.AxisId,
+            axis : Axis.LinearAxis
+        ) =
+            (fun (layout:Layout) -> 
+
+                let axis' = 
+                  match layout.TryGetValue (StyleParam.AxisId.toString id) with
+                  | Some a -> DynObj.combine (unbox a) axis
+                  | None  -> axis :>  DynamicObj
+                
+                axis'           |> DynObj.setValue layout (StyleParam.AxisId.toString id)
+
+                layout
+            )
+