X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FUtils.fs;h=fa4af25fdef19abd04dec182c532f36717e253e2;hp=6579cd61dfc26bc772eaf43a23f90648f19a51da;hb=e8d14548fc5b127970fccb19bad146512f7ac6d9;hpb=9343c4deb0bf88c58d9c92d465d8e99f64656875 diff --git a/Parasitemia/ParasitemiaUI/Utils.fs b/Parasitemia/ParasitemiaUI/Utils.fs index 6579cd6..fa4af25 100644 --- a/Parasitemia/ParasitemiaUI/Utils.fs +++ b/Parasitemia/ParasitemiaUI/Utils.fs @@ -7,12 +7,11 @@ open Newtonsoft.Json.Converters open Types -let listAsStr (s: 'a seq) = +let listAsStr (s : 'a seq) = s |> Seq.fold (fun acc obj -> acc + (if acc = "" then "" else ", ") + obj.ToString()) "" -let percentText (nbTotal: int, nb: int) : string = - if nbTotal = 0 - then +let percentText (nbTotal : int, nb : int) : string = + if nbTotal = 0 then "" else let percent = 100. * (float nb) / (float nbTotal) @@ -27,21 +26,21 @@ let predefinedPPIFilepath = Path.Combine(roamingDir, predefinedPPIFilename) let sensorSizesFilename = "sensor-sizes.json" let sensorSizesFilepath = Path.Combine(roamingDir, sensorSizesFilename) -let private savePredefinedPPIToFile (predefinedPPI: PredefinedPPI list) = +let private savePredefinedPPIToFile (predefinedPPI : PredefinedPPI list) = try use file = new StreamWriter(predefinedPPIFilepath) file.Write(JsonConvert.SerializeObject(predefinedPPI, JsonSerializerSettings(Formatting = Formatting.Indented))) with ex -> - Logger.Log.Error("Unable to save predefined PPI to file \"{0}\": {1}", predefinedPPIFilepath, ex) + Logger.Log.Error "Unable to save predefined PPI to file \"%s\": %O" predefinedPPIFilepath ex -let private saveSensorSizesToFile (sensorSizes: SensorSize list) = +let private saveSensorSizesToFile (sensorSizes : SensorSize list) = try use file = new StreamWriter(sensorSizesFilepath) file.Write(JsonConvert.SerializeObject(sensorSizes, JsonSerializerSettings(Formatting = Formatting.Indented))) with ex -> - Logger.Log.Error("Unable to save sensor sizes to file \"{0}\": {1}", sensorSizesFilepath, ex) + Logger.Log.Error "Unable to save sensor sizes to file \"%s\": %O" sensorSizesFilepath ex let predefinedPPI : PredefinedPPI list = try