X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FState.fs;h=3355a429b849cdd38a97f721cfa008f9e1842a2d;hp=d09fe23a23c4fca8309bbd2bda71398ae002ffe6;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=d715615d0b1da40fd10e9dbabbd4530cd5125a19

diff --git a/Parasitemia/ParasitemiaUI/State.fs b/Parasitemia/ParasitemiaUI/State.fs
index d09fe23..3355a42 100644
--- a/Parasitemia/ParasitemiaUI/State.fs
+++ b/Parasitemia/ParasitemiaUI/State.fs
@@ -10,7 +10,7 @@ open Emgu.CV.Structure
 open Types
 
 type State (defaultConfig : ParasitemiaCore.Config.Config) =
-    let sourceImages = List<SourceImage>()
+    let sourceImages = List<SourceImage> ()
     let mutable alteredSinceLastSave = false
     let mutable patientID = ""
 
@@ -80,8 +80,8 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
     member this.Load () =
         let data = PiaZ.load this.FilePath defaultConfig
         this.PatientID <- data.patientID
-        sourceImages.Clear()
-        sourceImages.InsertRange(0, data.images)
+        sourceImages.Clear ()
+        sourceImages.InsertRange (0, data.images)
         this.CurrentImage <- if sourceImages.Count > 0 then Some sourceImages.[0] else None
         alteredSinceLastSave <- false
 
@@ -93,15 +93,15 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
             {
                 num = sourceImages.Count + 1
                 name = System.IO.FileInfo(filePath).Name
-                config = defaultConfig.Copy()
-                dateLastAnalysis = DateTime(0L)
+                config = defaultConfig.Copy ()
+                dateLastAnalysis = DateTime (0L)
                 rbcs = []
-                img = new Image<Bgr, byte>(filePath)
+                img = new Image<Bgr, byte> (filePath)
                 healthyRBCBrightness = 1.f
                 infectedRBCBrightness = 1.f
             }
 
-        sourceImages.Add(srcImg)
+        sourceImages.Add srcImg
         if sourceImages.Count = 1 then
             this.CurrentImage <- Some sourceImages.[0]
         alteredSinceLastSave <- true
@@ -113,7 +113,7 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
             | Some srcImg' -> srcImg = srcImg'
             | _ -> false
 
-        if sourceImages.Remove(srcImg) then
+        if sourceImages.Remove srcImg then
             alteredSinceLastSave <- true
             if isCurrent then
                 this.CurrentImage <- if sourceImages.Count > 0 then Some sourceImages.[0] else None
@@ -126,7 +126,7 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
             alteredSinceLastSave <- true
 
     member this.SetResult (imgNum : int) (cells : ParasitemiaCore.Types.Cell list) =
-        let sourceImage = sourceImages.Find(fun srcImg -> srcImg.num = imgNum)
+        let sourceImage = sourceImages.Find (fun srcImg -> srcImg.num = imgNum)
 
         let w = sourceImage.img.Width
         let h = sourceImage.img.Height
@@ -137,8 +137,14 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
         let manuallyAlteredPreviousRBCS = sourceImage.rbcs |> List.filter (fun rbc -> rbc.setManually)
         let tolerance = (float sourceImage.config.RBCRadius.Pixel) * 0.5 // +/-.
         let getPreviousManuallyAlteredRBC (center : Point) : RBC option =
-            manuallyAlteredPreviousRBCS |> List.tryFind (fun rbc -> rbc.center.X > center.X - tolerance && rbc.center.X < center.X + tolerance &&
-                                                                    rbc.center.Y > center.Y - tolerance && rbc.center.Y < center.Y + tolerance)
+            manuallyAlteredPreviousRBCS
+            |> List.tryFind (
+                fun rbc ->
+                    rbc.center.X > center.X - tolerance &&
+                    rbc.center.X < center.X + tolerance &&
+                    rbc.center.Y > center.Y - tolerance &&
+                    rbc.center.Y < center.Y + tolerance
+            )
 
         sourceImage.rbcs <-
             cells
@@ -146,7 +152,7 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
             |> List.sortByDescending (fun cell -> cell.nucleusArea, (w - cell.center.X) + (h - cell.center.Y))
             |> List.mapi (
                 fun i cell ->
-                    let center = Point(float cell.center.X, float cell.center.Y)
+                    let center = Point (float cell.center.X, float cell.center.Y)
                     let infected, setManually =
                         let infected = cell.cellClass = ParasitemiaCore.Types.InfectedRBC
                         match getPreviousManuallyAlteredRBC center with
@@ -157,7 +163,7 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
                         infected = infected
                         setManually = setManually
                         center = center
-                        size = Size(float cell.elements.Width, float cell.elements.Height)
+                        size = Size (float cell.elements.Width, float cell.elements.Height)
                         infectedArea = cell.nucleusArea
                     }
             )
@@ -171,5 +177,5 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) =
         this.PatientID <- ""
         this.FilePath <- ""
         this.CurrentImage <- None
-        sourceImages.Clear()
+        sourceImages.Clear ()
         alteredSinceLastSave <- false
\ No newline at end of file