Fix ApplyHelper get public properties with interface properties

Author: Timo Mühlhaus

docs/content/area-plots.fsx

@@ -3,22 +3,28 @@
 #r "../../bin/FSharp.Plotly.dll"
 
 (** 
-# FSharp.Plotly: Pie and Doughnut Charts
+# FSharp.Plotly: Area Charts
 
-*Summary:* This example shows how to create pie and doughnut charts in F#.
+*Summary:* This example shows how to create an area 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.
+An area chart or area graph displays graphically quantitive data. It is based on the line chart.
+The area between axis and line are commonly emphasized with colors, textures and hatchings.
 *)
 
 open FSharp.Plotly 
 
-let values = [19; 26; 55;]
-let labels = ["Residential"; "Non-Residential"; "Utility"]
+let x  = [1.; 2.; 3.; 4.; 5.; 6.; 7.; 8.; 9.; 10.; ]
+let y  = [5.; 2.5; 5.; 7.5; 5.; 2.5; 7.5; 4.5; 5.5; 5.]
+//let y' = [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
 
-(*** define-output:pie1 ***)
-Chart.Pie(values,labels)
-(*** include-it:pie1 ***)
+(*** define-output:area1 ***)
+Chart.Area(x,y)
+(*** include-it:area1 ***)
 
 
+
+(*** define-output:area2 ***)
+Chart.SplineArea(x,y)
+(*** include-it:area2 ***)
+|> Chart.Show
+

docs/content/line-scatter-plots.fsx

@@ -32,9 +32,19 @@ values of a simple function, f(x)=x^2. The values of the function are generated
 shown below.
 *)
 
-(*** define-output:sq ***)
+(*** define-output:line2 ***)
 // Drawing graph of a 'square' function 
 [ for x in 1.0 .. 100.0 -> (x, x ** 2.0) ]
 |> Chart.Line
-(*** include-it:sq ***)
+(*** include-it:line2 ***)
 |> Chart.Show
+
+
+
+(*** define-output:line3 ***)
+Chart.Spline(x,y',Name="spline")    
+|> Chart.withLineStyle(Width=2,Dash=StyleOption.DrawingStyle.Dot)
+|> Chart.withLineStyle(Width=6,Dash=StyleOption.DrawingStyle.Dot)
+(*** include-it:line3 ***)
+|> Chart.Show
+

lib/FSharp.Care.dll

@@ -48,7 +48,7 @@ module ApplyHelper =
         let property = 
             getPublicProperties (o.GetType())
             |> Array.find (fun n -> n.Name = propName)
-        printfn "%s" property.Name
+        //printfn "%s" property.Name
         try 
             property.SetValue(o, value, null)
             Some o
@@ -67,8 +67,14 @@ module ApplyHelper =
     /// 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,BindingFlags.FlattenHierarchy).GetValue(o, null))
-            Some (v :?> 'a)
+            //let v = (o.GetType().GetProperty(propName,BindingFlags.FlattenHierarchy).GetValue(o, null))
+            let propInfo =
+                getPublicProperties (o.GetType()) 
+                |> Array.tryFind (fun p -> p.Name  = propName)
+            match propInfo with
+            | Some v -> Some (v.GetValue(o,null) :?> 'a)
+            | None -> None
+            //Some (v :?> 'a)
         with 
         | :? System.Reflection.TargetInvocationException -> None
         | :? System.NullReferenceException -> None
@@ -82,7 +88,8 @@ module ApplyHelper =
     /// 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)
+        let g = (tryGetPropertyValueAs<'a> o propName.Value)
+        let v = optBuildApply f g
         trySetPropertyValue o propName.Value v 
         //o