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

diff --git a/Parasitemia/ParasitemiaUI/Types.fs b/Parasitemia/ParasitemiaUI/Types.fs
index ada2a1f..a98d7b0 100644
--- a/Parasitemia/ParasitemiaUI/Types.fs
+++ b/Parasitemia/ParasitemiaUI/Types.fs
@@ -1,19 +1,11 @@
 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
@@ -29,38 +21,13 @@ type RBC =
         infectedArea : int
     }
 
-type SourceImage =
-    {
-        mutable num : int
-        mutable name : string
-
-        mutable config : ParasitemiaCore.Config.Config
-        mutable dateLastAnalysis : DateTime // UTC.
-        img : Image<Bgr, byte>
-        mutable rbcs : RBC list
-
-        mutable healthyRBCBrightness : float32
-        mutable infectedRBCBrightness : float32
-    }
-    with
-        member this.HealthyRBCColor : SolidColorBrush =
-            let mutable color = healthyRBColor * this.healthyRBCBrightness
-            color.A <- 255uy
-            SolidColorBrush (color)
-
-        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 () =
-            sprintf "%s: %d" this.label this.ppi
+    override this.ToString () =
+        sprintf "%s: %d" this.label this.ppi
 
 type SensorSize =
     {
@@ -68,9 +35,8 @@ type SensorSize =
         h : float<mm>
         label : string
     }
-    with
-        override this.ToString () =
-            sprintf "%g mm × %g mm%s" this.w this.h (if this.label = "" then "" else " (" + this.label + ")")
+    override this.ToString () =
+        sprintf "%g mm × %g mm%s" this.w this.h (if this.label = "" then "" else " (" + this.label + ")")
 
 let defaultPredefinedPPI =
     [
@@ -89,5 +55,3 @@ let defaultSensorSizes =
         { w = 8.8<mm>;  h = 6.6<mm>;  label = "2/3″" }
         { w = 13.2<mm>; h = 8.8<mm>;  label = "1″" }
     ]
-
-