Merge pull request #233 from plotly/fix-trace-templates

Author: kMutagene

Diff for: src/Plotly.NET/Playground.fsx

@@ -161,6 +161,30 @@ open FSharpAux
 open System
 open System.IO
 
+let layout =
+    Layout.init (Font = Font.init (Family = StyleParam.FontFamily.Raleway, Size = 14.))
+
+let traceTemplates = [
+    Trace2D.initScatter (
+        Trace2DStyle.Scatter(Marker = Marker.init (Symbol = StyleParam.MarkerSymbol.Diamond, Size = 20))
+    )
+    Trace2D.initScatter (
+        Trace2DStyle.Scatter(Marker = Marker.init (Symbol = StyleParam.MarkerSymbol.ArrowBarLeft, Size = 10))
+    )
+]
+
+let template = Template.init (layout, traceTemplates)
+
+[
+    Chart.Scatter(x = [ 0; 1; 2 ], y = [ 2; 1; 3 ], mode = StyleParam.Mode.Markers)
+    Chart.Scatter(x = [ 0; 1; 2 ], y = [ 1; 2; 4 ], mode = StyleParam.Mode.Markers)
+]
+|> Chart.combine
+|> Chart.withLayout (Layout.init (Title = Title.init ("Figure Title")))
+|> Chart.withTemplate template
+//|> GenericChart.mapTrace (fun t -> t.Remove("marker"); t)
+|> Chart.show
+
 let y=[2.37; 2.16; 4.82; 1.73; 1.04; 0.23; 1.32; 2.91; 0.11; 4.51; 0.51; 3.75; 1.35; 2.98; 4.50; 0.18; 4.66; 1.30; 2.06; 1.19]
 
 [

Diff for: src/Plotly.NET/Template/Template.fs

@@ -12,7 +12,7 @@ type Template() =
     static member init
         (
             layoutTemplate: Layout   ,
-            [<Optional;DefaultParameterValue(null)>] ?TraceTemplates: #Trace []  
+            [<Optional;DefaultParameterValue(null)>] ?TraceTemplates: seq<#Trace>
         ) =
             Template()
             |> Template.style
@@ -24,11 +24,41 @@ type Template() =
     static member style
         (
             layoutTemplate: Layout   ,
-            [<Optional;DefaultParameterValue(null)>] ?TraceTemplates: #Trace []  
+            [<Optional;DefaultParameterValue(null)>] ?TraceTemplates: seq<#Trace>
         ) =
             (fun (template:Template) -> 
+
+                let traceTemplates =
+                    TraceTemplates
+                    |> Option.map (fun traceTemplates ->
+                        traceTemplates
+                        |> Seq.groupBy (fun t -> t.``type``)
+                        |> (fun groupedTemplates ->
+                            groupedTemplates
+                            |> Seq.map (fun (id, templates) ->
+                                id,
+                                templates 
+                                |> Seq.map (fun t ->
+                                    let tmp = DynamicObj()
+                                    t.CopyDynamicPropertiesTo(tmp)
+                                    tmp
+                                )
+
+                            )
+                        )
+                    )
+                    |> fun traceTemplates ->
+                        let tmp = DynamicObj()
+                        traceTemplates 
+                        |> Option.iter (Seq.iter (fun (id,traceTemplate) ->
+                            traceTemplate  |> DynObj.setValue tmp id
+                            )
+                        )
+                        tmp
+
+
                 layoutTemplate   |> DynObj.setValue template "layout"
-                TraceTemplates   |> DynObj.setValueOpt template "data"
+                traceTemplates   |> DynObj.setValue template "data"
 
                 template
                 )