X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FPiaZ.fs;h=bdd6d07d24e5b4cfbf4177d83d3820549e4a28ce;hp=92397be46d9df87547913dd2cb1aa6c990d6d083;hb=db49e167a602ef1df02a8b5f7de334355a4917dd;hpb=c4a76a01f62568c6353396ff85551a3151fc5236

diff --git a/Parasitemia/ParasitemiaUI/PiaZ.fs b/Parasitemia/ParasitemiaUI/PiaZ.fs
index 92397be..bdd6d07 100644
--- a/Parasitemia/ParasitemiaUI/PiaZ.fs
+++ b/Parasitemia/ParasitemiaUI/PiaZ.fs
@@ -95,7 +95,7 @@ let updateDocumentData (fromVersion: int) (toVersion: int) (data: DocumentData)
 /// </summary>
 /// <param name="filePath"></param>
 /// <exception cref="System.IOException">If the file cannot be read</exception>
-let load (filePath: string) : DocumentData =
+let load (filePath: string) (defaultConfig: ParasitemiaCore.Config.Config) : DocumentData =
     use file = ZipFile.Open(filePath, ZipArchiveMode.Read)
 
     let mainEntry = file.GetEntry(mainEntryName)
@@ -114,7 +114,12 @@ let load (filePath: string) : DocumentData =
                             let imgJSONEntry = file.GetEntry(imgEntry.Name + ".json")
                             use imgJSONFileReader = new StreamReader(imgJSONEntry.Open())
                             let imgInfo = JsonConvert.DeserializeObject<JSONSourceImage>(imgJSONFileReader.ReadToEnd())
-                            let config = ParasitemiaCore.Config.Config(imgInfo.parameters)
+
+                            let config = defaultConfig.Copy()
+                            config.Parameters <-
+                                { ParasitemiaCore.Config.defaultParameters with
+                                    resolution = imgInfo.parameters.resolution }
+
                             config.SetRBCRadius imgInfo.RBCRadius
                             yield { num = imgNum
                                     name = imgInfo.name