Project refectoring with Options functions

Author: muehlhaus

docs/content/bar-charts.fsx

@@ -14,9 +14,13 @@ values.
 
 open FSharp.Plotly 
 
-let values = [19; 26; 55;]
-let labels = ["Residential"; "Non-Residential"; "Utility"]
+let yValues = [20; 14; 23;]
+let xValues = ["Product A"; "Product B"; "Product C";]
+let labels  = ["27% market share"; "24% market share"; "19% market share";]
 
 (*** define-output:pie1 ***)
-Chart.Pie(values,labels)
+Chart.Bar(xValues,yValues,Labels=labels,Opacity=0.3,Marker=Options.Marker(color="rgba(222,45,38,0.8)"))
+|> Chart.withSize(500.,500.)
 (*** include-it:pie1 ***)
+|> Chart.Show
+

src/FSharp.Plotly.WPF/ChartWPF.fs

@@ -9,16 +9,14 @@ module ChartWPF =
     open System.IO
 
     open FSharp.Plotly
-    open StyleGramar
-    open ChartArea
     open GenericChart
 
 
 
     type Chart with  
 
 
-        static member ShowWPF (ch:GenericChart) = 
+        static member ShowWPF (ch:GenericChart<_>) = 
             let guid = Guid.NewGuid().ToString()
             let html = GenericChart.toEmbeddedHTML ch
             ViewContainer.showHTML html

src/FSharp.Plotly/ApplyHelper.fs

@@ -0,0 +1,76 @@
+namespace FSharp.Plotly
+
+open System
+
+
+module internal ApplyHelper =
+    
+    open System.Reflection
+
+    /// Creates an instance of the Object according to applyStyle and applies the function..
+    let buildApply (applyStyle:'a -> 'a) =
+        let instance =
+            System.Activator.CreateInstance<'a>()
+        applyStyle instance
+
+    /// Applies 'applyStyle' to item option. If None it creates a new instance.
+    let optBuildApply (applyStyle:'a -> 'a) (item:'a option) =
+        match item with
+        | Some item' -> applyStyle item'
+        | None       -> buildApply applyStyle
+
+    /// Applies Some 'applyStyle' to item. If None it returns 'item' unchanged.
+    let optApply (applyStyle:('a -> 'a)  option) (item:'a ) =
+        match applyStyle with
+        | Some apply -> apply item
+        | None       -> item
+
+    /// Returns the proptery name from quotation expression
+    let tryGetPropertyName (expr : Microsoft.FSharp.Quotations.Expr) =
+        match expr with
+        | Microsoft.FSharp.Quotations.Patterns.PropertyGet (_,pInfo,_) -> Some pInfo.Name
+        | _ -> None
+    
+    /// Sets property value using reflection
+    let trySetPropertyValue (o:obj) (propName:string) (value:obj) =
+        let property = o.GetType().GetProperty(propName)
+        try 
+            property.SetValue(o, value, null)
+            Some o
+        with
+        | :? System.ArgumentException -> None
+        | :? System.NullReferenceException -> None
+    
+    /// Gets property value as option using reflection
+    let tryGetPropertyValue (o:obj) (propName:string) =
+        try 
+            Some (o.GetType().GetProperty(propName).GetValue(o, null))
+        with 
+        | :? System.Reflection.TargetInvocationException -> None
+        | :? System.NullReferenceException -> None
+    
+    /// Gets property value as 'a option using reflection. Cast to 'a
+    let tryGetPropertyValueAs<'a> (o:obj) (propName:string) =
+        try 
+            let v = (o.GetType().GetProperty(propName).GetValue(o, null))
+            Some (v :?> 'a)
+        with 
+        | :? System.Reflection.TargetInvocationException -> None
+        | :? System.NullReferenceException -> None
+
+    /// Updates property value by given function
+    let tryUpdatePropertyValueFromName (o:obj) (propName:string) (f: 'a -> 'a) =
+        let v = optBuildApply f (tryGetPropertyValueAs<'a> o propName)
+        trySetPropertyValue o propName v 
+        //o
+
+    /// Updates property value by given function
+    let tryUpdatePropertyValue (o:obj) (expr : Microsoft.FSharp.Quotations.Expr) (f: 'a -> 'a) =
+        let propName = tryGetPropertyName expr
+        let v = optBuildApply f (tryGetPropertyValueAs<'a> o propName.Value)
+        trySetPropertyValue o propName.Value v 
+        //o
+
+    let updatePropertyValueAndIgnore (o:obj) (expr : Microsoft.FSharp.Quotations.Expr) (f: 'a -> 'a) = 
+        tryUpdatePropertyValue o expr f |> ignore
+