X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FTypes.fs;h=a98d7b0270d29d0c396ec4731d697a330481b0af;hp=fa99d9023a72f0ee1f6848b31d7669019419baa8;hb=HEAD;hpb=9343c4deb0bf88c58d9c92d465d8e99f64656875

diff --git a/Parasitemia/ParasitemiaUI/Types.fs b/Parasitemia/ParasitemiaUI/Types.fs
index fa99d90..a98d7b0 100644
--- a/Parasitemia/ParasitemiaUI/Types.fs
+++ b/Parasitemia/ParasitemiaUI/Types.fs
@@ -1,79 +1,57 @@
 module ParasitemiaUI.Types
 
-open System
 open System.Windows
-open System.Windows.Media
-
-open Emgu.CV
-open Emgu.CV.Structure
 
 open Newtonsoft.Json
 
 open ParasitemiaCore.UnitsOfMeasure
 
-let healthyRBColor = Color.FromRgb(255uy, 255uy, 0uy) // Yellow-green.
-let infectedRBColor = Color.FromRgb(255uy, 0uy, 40uy) // Red with a bit of blue.
-
-type RBC = {
-    num: int
-
-    [<JsonIgnore>]
-    mutable infected: bool
-
-    [<JsonIgnore>]
-    mutable setManually: bool
-
-    center: Point
-    size: Size
-    infectedArea: int }
-
-type SourceImage = {
-    mutable num: int
-    mutable name: string
+type RBC =
+    {
+        num : int
 
-    mutable config: ParasitemiaCore.Config.Config
-    mutable dateLastAnalysis: DateTime // UTC.
-    img: Image<Bgr, byte>
-    mutable rbcs: RBC list
+        [<JsonIgnore>]
+        mutable infected : bool
 
-    mutable healthyRBCBrightness: float32
-    mutable infectedRBCBrightness: float32 } with
+        [<JsonIgnore>]
+        mutable setManually : bool
 
-    member this.HealthyRBCColor: SolidColorBrush =
-        let mutable color = healthyRBColor * this.healthyRBCBrightness
-        color.A <- 255uy;
-        SolidColorBrush(color)
+        center : Point
+        size : Size
+        infectedArea : int
+    }
 
-    member this.InfectedRBCColor: SolidColorBrush =
-        let mutable color = infectedRBColor * this.infectedRBCBrightness
-        color.A <- 255uy;
-        SolidColorBrush(color)
-
-type PredefinedPPI = {
-    ppi: int<ppi>
-    label: string } with
-    override this.ToString() =
+type PredefinedPPI =
+    {
+        ppi : int<ppi>
+        label : string
+    }
+    override this.ToString () =
         sprintf "%s: %d" this.label this.ppi
 
-type SensorSize = {
-    w: float<mm>
-    h: float<mm>
-    label: string } with
+type SensorSize =
+    {
+        w : float<mm>
+        h : float<mm>
+        label : string
+    }
     override this.ToString () =
         sprintf "%g mm × %g mm%s" this.w this.h (if this.label = "" then "" else " (" + this.label + ")")
 
-let defaultPredefinedPPI = [
-    { ppi = 230000<ppi>; label = "50×" }
-    { ppi = 460000<ppi>; label = "100×" } ]
-
-let defaultSensorSizes = [
-    { w = 3.2<mm>;  h = 2.4<mm>;  label = "1/4″" }
-    { w = 4.8<mm>;  h = 3.6<mm>;  label = "1/3″" }
-    { w = 5.76<mm>; h = 4.29<mm>; label = "1/2.5″" }
-    { w = 6.4<mm>;  h = 4.8<mm>;  label = "1/2″" }
-    { w = 7.18<mm>; h = 5.32<mm>; label = "1/1.8″" }
-    { w = 7.6<mm>;  h = 5.7<mm>;  label = "1/1.7″" }
-    { w = 8.8<mm>;  h = 6.6<mm>;  label = "2/3″" }
-    { w = 13.2<mm>; h = 8.8<mm>;  label = "1″" } ]
-
-
+let defaultPredefinedPPI =
+    [
+        { ppi = 230000<ppi>; label = "50×" }
+        { ppi = 460000<ppi>; label = "100×" }
+    ]
+
+let defaultSensorSizes =
+    [
+        { w = 3.2<mm>;  h = 2.4<mm>;  label = "1/4″" }
+        { w = 4.8<mm>;  h = 3.6<mm>;  label = "1/3″" }
+        { w = 5.76<mm>; h = 4.29<mm>; label = "1/2.5″" }
+        { w = 6.4<mm>;  h = 4.8<mm>;  label = "1/2″" }
+        { w = 7.18<mm>; h = 5.32<mm>; label = "1/1.8″" }
+        { w = 7.6<mm>;  h = 5.7<mm>;  label = "1/1.7″" }
+        { w = 8.8<mm>;  h = 6.6<mm>;  label = "2/3″" }
+        { w = 13.2<mm>; h = 8.8<mm>;  label = "1″" }
+    ]