Remove the parasite detection function from Ma.

[master-thesis.git] / Parasitemia / ParasitemiaUI / State.fs

diff --git a/Parasitemia/ParasitemiaUI/State.fs b/Parasitemia/ParasitemiaUI/State.fs
index 96dfc24..5b6a91c 100644 (file)
--- a/Parasitemia/ParasitemiaUI/State.fs
+++ b/Parasitemia/ParasitemiaUI/State.fs
@@ -9,7 +9,7 @@ open Emgu.CV.Structure
 
 open Types
 
-type State () =
+type State (defaultConfig: ParasitemiaCore.Config.Config) =
     let sourceImages = List<SourceImage>()
     let mutable alteredSinceLastSave = false
     let mutable patientID = ""
@@ -77,7 +77,7 @@ type State () =
     /// </summary>
     /// <exception cref="System.IOException">If the file cannot be loaded</exception>
     member this.Load () =
-        let data = PiaZ.load this.FilePath
+        let data = PiaZ.load this.FilePath defaultConfig
         this.PatientID <- data.patientID
         sourceImages.Clear()
         sourceImages.InsertRange(0, data.images)
@@ -142,7 +142,7 @@ type State () =
 
         sourceImage.rbcs <- cells
             |> List.filter (fun cell -> match cell.cellClass with ParasitemiaCore.Types.HealthyRBC | ParasitemiaCore.Types.InfectedRBC -> true | _ -> false )
-            |> List.sortByDescending (fun cell -> cell.infectedArea, (w - cell.center.X) + (h - cell.center.Y))
+            |> 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 infected, setManually =
@@ -155,7 +155,7 @@ type State () =
                   setManually = setManually
                   center = center
                   size = Size(float cell.elements.Width, float cell.elements.Height)
-                  infectedArea = cell.infectedArea })
+                  infectedArea = cell.nucleusArea })
 
         alteredSinceLastSave <- true