X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGUI%2FPiaZ.fs;h=d551b8d720ca7b6e0656c7fe2dd78ce003ddf7ab;hp=22359e9ab38517a9e65d614b238ebfdb69b1f734;hb=aaa250fab2ac3227bf45704355d389bc1a4ee7fc;hpb=05be8164d308447b916544ae3ce4211500dfd8da

diff --git a/Parasitemia/Parasitemia/GUI/PiaZ.fs b/Parasitemia/Parasitemia/GUI/PiaZ.fs
index 22359e9..d551b8d 100644
--- a/Parasitemia/Parasitemia/GUI/PiaZ.fs
+++ b/Parasitemia/Parasitemia/GUI/PiaZ.fs
@@ -25,6 +25,7 @@ type JSONInformation = {
 // Information associated to each images.
 type JSONSourceImage = {
     num: int
+    RBCRadius: float32 // The RBC Radius found by granulometry.
     parameters: Config.Parameters
     dateLastAnalysis: DateTime
     rbcs: RBC List
@@ -57,7 +58,7 @@ let save (filePath: string) (data: FileData) =
 
         let imgJSONEntry = file.CreateEntry(imgFilename + ".json", CompressionLevel.Fastest)
         use imgJSONFileWriter = new StreamWriter(imgJSONEntry.Open())
-        imgJSONFileWriter.Write(JsonConvert.SerializeObject({ num = srcImg.num; parameters = srcImg.config.Parameters; dateLastAnalysis = srcImg.dateLastAnalysis; rbcs = srcImg.rbcs }))
+        imgJSONFileWriter.Write(JsonConvert.SerializeObject({ num = srcImg.num; RBCRadius = srcImg.config.RBCRadius.Pixel; parameters = srcImg.config.Parameters; dateLastAnalysis = srcImg.dateLastAnalysis; rbcs = srcImg.rbcs }))
 
 
 let load (filePath: string) : FileData =
@@ -77,8 +78,10 @@ let load (filePath: string) : FileData =
                         let imgEntry = file.GetEntry(imgEntry.Name + ".json")
                         use imgEntryFileReader = new StreamReader(imgEntry.Open())
                         let imgInfo = JsonConvert.DeserializeObject<JSONSourceImage>(imgEntryFileReader.ReadToEnd())
+                        let config = Config.Config(imgInfo.parameters)
+                        config.SetRBCRadius imgInfo.RBCRadius
                         yield { num = imgNum
-                                config = Config.Config(imgInfo.parameters)
+                                config = config
                                 dateLastAnalysis = imgInfo.dateLastAnalysis
                                 img = img
                                 rbcs = imgInfo.rbcs } ] }
\ No newline at end of file