X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGUI%2FState.fs;h=44de2e335f3f2245f077dbda2e3d3cdcd0995bb9;hp=a1ae0521c01ea831a35876f05053eef6d4052366;hb=8013d6a586604e443332e6e9a715c86df444a875;hpb=999a48b8eb25c92e4403c9280fd4fe68f9bc4b7b

diff --git a/Parasitemia/Parasitemia/GUI/State.fs b/Parasitemia/Parasitemia/GUI/State.fs
index a1ae052..44de2e3 100644
--- a/Parasitemia/Parasitemia/GUI/State.fs
+++ b/Parasitemia/Parasitemia/GUI/State.fs
@@ -15,6 +15,16 @@ type State () =
     member val FilePath: string = "" with get, set
     member val PatientID: string = "" with get, set
 
+    member this.ImageParasitemia (srcImg: SourceImage) : int * int =
+        List.length srcImg.rbcs,
+        srcImg.rbcs |> List.fold (fun nbInfected rbc -> if rbc.infected then nbInfected + 1 else nbInfected) 0
+
+    member this.GlobalParasitemia : int * int =
+        sourceImages
+        |> Seq.fold (fun (nbTotal, nbTotalInfected) srcImg ->
+                        let nb, nbInfected = this.ImageParasitemia srcImg
+                        nbTotal + nb, nbTotalInfected + nbInfected) (0, 0)
+
     member this.Save () =
         let data = { PiaZ.sources = List.ofSeq sourceImages; PiaZ.patientID = this.PatientID }
         PiaZ.save this.FilePath data
@@ -24,23 +34,30 @@ type State () =
         this.PatientID <- data.patientID
         sourceImages.Clear()
         sourceImages.InsertRange(0, data.sources)
+        if sourceImages.Count > 0
+        then this.CurrentImage <- Some sourceImages.[0]
 
     member this.AddSourceImage (filePath: string) : SourceImage =
         let srcImg = { num = sourceImages.Count + 1; rbcs = []; img = new Image<Bgr, byte>(filePath) }
         sourceImages.Add(srcImg)
+        if sourceImages.Count = 1
+        then this.CurrentImage <- Some sourceImages.[0]
         srcImg
 
-    member this.SetResult (num: int) (cells: Cell list) =
-        let sourceImage = sourceImages.Find(fun srcImg -> srcImg.num = num)
+    member this.SetResult (imgNum: int) (cells: Cell list) =
+        let sourceImage = sourceImages.Find(fun srcImg -> srcImg.num = imgNum)
+        let w = sourceImage.img.Width
+        let h = sourceImage.img.Height
         sourceImage.rbcs <- cells
             |> List.filter (fun cell -> match cell.cellClass with HealthyRBC | InfectedRBC -> true | _ -> false )
+            |> List.sortByDescending (fun cell -> cell.infectedArea, (w - cell.center.X) + (h - cell.center.Y))
             |> List.mapi (fun i cell ->
-                { num = i
+                { num = i + 1
                   infected = cell.cellClass = InfectedRBC
                   setManually = false
                   center = Point(float cell.center.X, float cell.center.Y)
                   size = Size(float cell.elements.Width, float cell.elements.Height)
-                  stainArea = cell.stainArea })
+                  infectedArea = cell.infectedArea })
 
     member this.SourceImages : SourceImage seq =
         sourceImages :> SourceImage seq