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

diff --git a/Parasitemia/Parasitemia/GUI/State.fs b/Parasitemia/Parasitemia/GUI/State.fs
index 44de2e3..44ca21b 100644
--- a/Parasitemia/Parasitemia/GUI/State.fs
+++ b/Parasitemia/Parasitemia/GUI/State.fs
@@ -1,5 +1,6 @@
 module Parasitemia.GUI.State
 
+open System
 open System.Collections.Generic
 open System.Windows
 
@@ -10,10 +11,20 @@ open Types
 
 type State () =
     let sourceImages = List<SourceImage>()
+    let mutable alteredSinceLastSave = false
+    let mutable patientID = ""
 
+    member this.AlteredSinceLastSave = alteredSinceLastSave
     member val CurrentImage: SourceImage option = None with get, set
     member val FilePath: string = "" with get, set
-    member val PatientID: string = "" with get, set
+
+    member this.PatientID
+        with get () : string = patientID
+        and set id =
+            if id <> patientID
+            then
+                alteredSinceLastSave <- true
+                patientID <- id
 
     member this.ImageParasitemia (srcImg: SourceImage) : int * int =
         List.length srcImg.rbcs,
@@ -25,9 +36,18 @@ type State () =
                         let nb, nbInfected = this.ImageParasitemia srcImg
                         nbTotal + nb, nbTotalInfected + nbInfected) (0, 0)
 
+
+    member this.SetAsInfected (rbc: RBC) (infected: bool) =
+        if infected <> rbc.infected
+        then
+            alteredSinceLastSave <- true
+            rbc.infected <- infected
+            rbc.setManually <- not rbc.setManually
+
     member this.Save () =
         let data = { PiaZ.sources = List.ofSeq sourceImages; PiaZ.patientID = this.PatientID }
         PiaZ.save this.FilePath data
+        alteredSinceLastSave <- false
 
     member this.Load () =
         let data = PiaZ.load this.FilePath
@@ -36,32 +56,72 @@ type State () =
         sourceImages.InsertRange(0, data.sources)
         if sourceImages.Count > 0
         then this.CurrentImage <- Some sourceImages.[0]
+        alteredSinceLastSave <- false
 
     member this.AddSourceImage (filePath: string) : SourceImage =
-        let srcImg = { num = sourceImages.Count + 1; rbcs = []; img = new Image<Bgr, byte>(filePath) }
+        let srcImg = { num = sourceImages.Count + 1; rbcRadius = 0.; dateLastAnalysis = DateTime(0L); rbcs = []; img = new Image<Bgr, byte>(filePath) }
         sourceImages.Add(srcImg)
         if sourceImages.Count = 1
         then this.CurrentImage <- Some sourceImages.[0]
+        alteredSinceLastSave <- true
         srcImg
 
-    member this.SetResult (imgNum: int) (cells: Cell list) =
+    member this.RemoveSourceImage (srcImg: SourceImage) =
+        let isCurrent =
+            match this.CurrentImage with
+            | Some srcImg' -> srcImg = srcImg'
+            | _ -> false
+
+        if sourceImages.Remove(srcImg)
+        then
+            alteredSinceLastSave <- true
+            if isCurrent
+            then
+                this.CurrentImage <- if sourceImages.Count > 0 then Some sourceImages.[0] else None
+        // Re-numbered the images.
+        sourceImages |> Seq.iteri (fun i srcImg -> srcImg.num <- i + 1)
+
+    member this.SetResult (imgNum: int) (rbcRadius: float) (cells: Cell list) =
         let sourceImage = sourceImages.Find(fun srcImg -> srcImg.num = imgNum)
+
         let w = sourceImage.img.Width
         let h = sourceImage.img.Height
+
+        sourceImage.rbcRadius <- rbcRadius
+        sourceImage.dateLastAnalysis <- DateTime.UtcNow
+
+        // To match with previously manually altered RBC.
+        let manuallyAlteredPreviousRBCS = sourceImage.rbcs |> List.filter (fun rbc -> rbc.setManually)
+        let tolerance = rbcRadius * 0.5 // +/-.
+        let getPreviousRBC (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)
+
         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 ->
+                let center = Point(float cell.center.X, float cell.center.Y)
+                let infected, setManually =
+                    match getPreviousRBC center with
+                    | Some rbc -> rbc.infected, true
+                    | _ -> cell.cellClass = InfectedRBC, false
+
                 { num = i + 1
-                  infected = cell.cellClass = InfectedRBC
-                  setManually = false
-                  center = Point(float cell.center.X, float cell.center.Y)
+                  infected = infected
+                  setManually = setManually
+                  center = center
                   size = Size(float cell.elements.Width, float cell.elements.Height)
                   infectedArea = cell.infectedArea })
 
+        alteredSinceLastSave <- true
+
     member this.SourceImages : SourceImage seq =
         sourceImages :> SourceImage seq
 
     member this.Reset () =
         this.PatientID <- ""
-        sourceImages.Clear()
\ No newline at end of file
+        this.FilePath <- ""
+        this.CurrentImage <- None
+        sourceImages.Clear()
+        alteredSinceLastSave <- false
\ No newline at end of file