X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FTypes.fs;h=a98d7b0270d29d0c396ec4731d697a330481b0af;hp=7d8029487095efe6ffc2f0e6d22ccf749fcc7e4f;hb=8cf2153bd18919de41745534d3dbf134f085e13c;hpb=4bfa3cbdc6145e6944f02e24829ab2ef3a851ac1

diff --git a/Parasitemia/ParasitemiaUI/Types.fs b/Parasitemia/ParasitemiaUI/Types.fs
index 7d80294..a98d7b0 100644
--- a/Parasitemia/ParasitemiaUI/Types.fs
+++ b/Parasitemia/ParasitemiaUI/Types.fs
@@ -1,24 +1,57 @@
 module ParasitemiaUI.Types
 
-open System
 open System.Windows
 
-open Emgu.CV
-open Emgu.CV.Structure
+open Newtonsoft.Json
 
-type RBC = {
-    num: int
+open ParasitemiaCore.UnitsOfMeasure
 
-    mutable infected: bool
-    mutable setManually: bool
+type RBC =
+    {
+        num : int
 
-    center: Point
-    size: Size
-    infectedArea: int }
+        [<JsonIgnore>]
+        mutable infected : bool
 
-type SourceImage = {
-    mutable num: int
-    mutable config: ParasitemiaCore.Config.Config
-    mutable dateLastAnalysis: DateTime // UTC.
-    img: Image<Bgr, byte>
-    mutable rbcs: RBC list }
\ No newline at end of file
+        [<JsonIgnore>]
+        mutable setManually : bool
+
+        center : Point
+        size : Size
+        infectedArea : int
+    }
+
+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
+    }
+    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″" }
+    ]