X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FState.fs;h=befbdecaf5bf68a54ce3adc67be80f719cd98c44;hb=2f335ec0c462159ed9f424e3793b7af290404062;hp=d09fe23a23c4fca8309bbd2bda71398ae002ffe6;hpb=b87b35b922551f122228df1fd9c530bbb807935a;p=master-thesis.git diff --git a/Parasitemia/ParasitemiaUI/State.fs b/Parasitemia/ParasitemiaUI/State.fs index d09fe23..befbdec 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() + let sourceImages = List () let mutable alteredSinceLastSave = false let mutable patientID = "" @@ -25,36 +25,11 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) = alteredSinceLastSave <- true patientID <- id - 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.ImageNbManuallyChangedRBC (srcImg : SourceImage) (setAsInfected : bool) : int * int = - List.length srcImg.rbcs, - srcImg.rbcs |> List.fold (fun nb rbc -> if rbc.setManually && rbc.infected = setAsInfected then nb + 1 else nb) 0 - - member this.ImageNbManuallyChangedRBCStr (srcImg : SourceImage) (setAsInfected : bool) : string = - Utils.percentText (this.ImageNbManuallyChangedRBC srcImg setAsInfected) - - member this.ImageManuallyChangedRBC (srcImg : SourceImage) (setAsInfected : bool) : int seq = - query { - for rbc in srcImg.rbcs do - where (rbc.setManually && rbc.infected = setAsInfected) - select rbc.num - } - - member this.ImageManuallyChangedRBCStr (srcImg : SourceImage) (setAsInfected : bool) : string = - let listStr = Utils.listAsStr <| this.ImageManuallyChangedRBC srcImg setAsInfected - if listStr = "" then - "" - else - "[" + listStr + "]" - member this.GlobalParasitemia : int * int = sourceImages |> Seq.fold ( fun (nbTotal, nbTotalInfected) srcImg -> - let nb, nbInfected = this.ImageParasitemia srcImg + let nb, nbInfected = srcImg.ImageParasitemia nbTotal + nb, nbTotalInfected + nbInfected ) (0, 0) @@ -80,8 +55,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 @@ -89,19 +64,8 @@ type State (defaultConfig : ParasitemiaCore.Config.Config) = /// /// If the image cannot be read member this.AddSourceImage (filePath : string) (defaultConfig : ParasitemiaCore.Config.Config) : SourceImage = - let srcImg = - { - num = sourceImages.Count + 1 - name = System.IO.FileInfo(filePath).Name - config = defaultConfig.Copy() - dateLastAnalysis = DateTime(0L) - rbcs = [] - img = new Image(filePath) - healthyRBCBrightness = 1.f - infectedRBCBrightness = 1.f - } - - sourceImages.Add(srcImg) + let srcImg = SourceImage (sourceImages.Count + 1, System.IO.FileInfo(filePath).Name, defaultConfig.Copy (), DateTime (0L), new Image (filePath), []) + sourceImages.Add srcImg if sourceImages.Count = 1 then this.CurrentImage <- Some sourceImages.[0] alteredSinceLastSave <- true @@ -113,40 +77,46 @@ 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 // Re-numbered the images. - sourceImages |> Seq.iteri (fun i srcImg -> srcImg.num <- i + 1) + sourceImages |> Seq.iteri (fun i srcImg -> srcImg.Num <- i + 1) member this.SetName (srcImg : SourceImage) (name : string) = - if name <> srcImg.name then - srcImg.name <- name + if name <> srcImg.Name then + srcImg.Name <- name alteredSinceLastSave <- true - member this.SetResult (imgNum : int) (cells : ParasitemiaCore.Types.Cell list) = - let sourceImage = sourceImages.Find(fun srcImg -> srcImg.num = imgNum) + member this.SetResult (imgId : string) (result : ParasitemiaCore.Types.AnalysisResult) = + let sourceImage = sourceImages.Find (fun srcImg -> srcImg.RomanNum = imgId) - let w = sourceImage.img.Width - let h = sourceImage.img.Height + let w = sourceImage.Img.Width + let h = sourceImage.Img.Height - sourceImage.dateLastAnalysis <- DateTime.UtcNow + sourceImage.DateLastAnalysis <- DateTime.UtcNow // To match with previously manually altered RBC. - let manuallyAlteredPreviousRBCS = sourceImage.rbcs |> List.filter (fun rbc -> rbc.setManually) - let tolerance = (float sourceImage.config.RBCRadius.Pixel) * 0.5 // +/-. + 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 + sourceImage.RBCs <- + result.Cells |> List.filter (fun cell -> match cell.cellClass with ParasitemiaCore.Types.HealthyRBC | ParasitemiaCore.Types.InfectedRBC -> true | _ -> false ) |> 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 +127,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 +141,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