X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=e5b853cc488a8fd7d412bbc91df5733eb992e051;hp=fdeed8fa0f60f2a51f83e0b4a3dea441cc894a12;hb=cd9c55f80bcdc4fc6b85eb1b81474aed005e5016;hpb=b87b35b922551f122228df1fd9c530bbb807935a

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index fdeed8f..e5b853c 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -98,7 +98,7 @@ type RBCRadius (radius : float32, parameters : Parameters) =
     member this.NucleusArea = parameters.nucleusAreaRatio * this.Area
     member this.MinimumParasiteArea = parameters.minimumParasiteAreaRatio * this.Area
 
-    override this.ToString() =
+    override this.ToString () =
         sprintf "%d px (%.1f μm)" (Utils.roundInt <| 2.f * radius) (2. * this.μm)
 
 type Config (param : Parameters) =
@@ -108,17 +108,17 @@ type Config (param : Parameters) =
         float32 rbcRadiusPx
 
     let mutable parameters : Parameters = param
-    let mutable rbcRadiusByResolution = RBCRadius(RBCadiusInPixels parameters.rbcDiameter parameters.resolution, parameters)
-    let mutable rbcRadius = RBCRadius(0.f, parameters)
+    let mutable rbcRadiusByResolution = RBCRadius (RBCadiusInPixels parameters.rbcDiameter parameters.resolution, parameters)
+    let mutable rbcRadius = RBCRadius (0.f, parameters)
 
-    new () = Config(defaultParameters)
+    new () = Config defaultParameters
 
     member this.Parameters
-        with get() = parameters
-        and set(param) =
+        with get () = parameters
+        and set param =
             parameters <- param
-            rbcRadiusByResolution <- RBCRadius(RBCadiusInPixels parameters.rbcDiameter parameters.resolution, param)
-            rbcRadius <- RBCRadius(rbcRadius.Pixel, param)
+            rbcRadiusByResolution <- RBCRadius (RBCadiusInPixels parameters.rbcDiameter parameters.resolution, param)
+            rbcRadius <- RBCRadius (rbcRadius.Pixel, param)
 
     member val Debug = DebugOff with get, set
 
@@ -134,8 +134,15 @@ type Config (param : Parameters) =
     member this.RBCRadius = rbcRadius
 
     member this.SetRBCRadius (radiusPixel : float32) =
-        rbcRadius <- RBCRadius(radiusPixel, parameters)
+        rbcRadius <- RBCRadius (radiusPixel, parameters)
 
     member this.Copy () =
-        this.MemberwiseClone() :?> Config
-
+        this.MemberwiseClone () :?> Config
+
+    override this.ToString () =
+        $"{{{nameof Config}: " +
+        $"{nameof this.LPFStandardDeviationParasite} = {this.LPFStandardDeviationParasite}, " +
+        $"{nameof this.LPFStandardDeviationRBC} = {this.LPFStandardDeviationRBC}, " +
+        $"{nameof this.RBCRadiusByResolution} = {this.RBCRadiusByResolution}, " +
+        $"{nameof this.RBCRadius} = {this.RBCRadius}, " +
+        $"{nameof this.Parameters} = {this.Parameters}}}"