From 60f5359bd93fb531e265970e58d950d052ef6dfd Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 11 Apr 2017 12:49:07 +0200 Subject: [PATCH] Culture invariant procedure import/export, ver. 2.12.537 --- Config/Entities/Procedure.cs | 15 +++--- Config/Entities/Test.cs | 77 ++++++++++++++++--------------- Config/Properties/AssemblyInfo.cs | 4 +- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/Config/Entities/Procedure.cs b/Config/Entities/Procedure.cs index 926c99201..754261801 100644 --- a/Config/Entities/Procedure.cs +++ b/Config/Entities/Procedure.cs @@ -3,6 +3,7 @@ /// using System; using System.Collections.Generic; +using System.Globalization; using System.IO; namespace Config.Entities @@ -102,14 +103,14 @@ namespace Config.Entities public virtual void Export(StreamWriter output) { - output.WriteLine(ItemNr.ToString()); + output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture)); output.WriteLine(Name); output.WriteLine(Description); output.WriteLine(CreationUser); - output.WriteLine(CreationTime.ToString()); + output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture)); output.WriteLine(LastChgUser); - output.WriteLine(LastChgTime.ToString()); - output.WriteLine(MetersKind.ToString()); + output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(MetersKind.ToString()); output.WriteLine(Watermeters); output.WriteLine(ProtocolTitle); output.WriteLine(DataEntry); @@ -131,13 +132,13 @@ namespace Config.Entities { Procedure result = new Procedure(); - result.ItemNr = int.Parse(input.ReadLine()); + result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); result.Name = input.ReadLine(); result.Description = input.ReadLine(); result.CreationUser = input.ReadLine(); - result.CreationTime = DateTime.Parse(input.ReadLine()); + result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture); result.LastChgUser = input.ReadLine(); - result.LastChgTime = DateTime.Parse(input.ReadLine()); + result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture); string line = input.ReadLine(); result.MetersKind = line.Equals(MetersKind.Single.ToString()) ? MetersKind.Single : (line.Equals(MetersKind.Combined.ToString()) ? MetersKind.Combined : MetersKind.HeatMeter); result.Watermeters = input.ReadLine(); diff --git a/Config/Entities/Test.cs b/Config/Entities/Test.cs index 882319fe3..e79d2b307 100644 --- a/Config/Entities/Test.cs +++ b/Config/Entities/Test.cs @@ -3,6 +3,7 @@ /// using System; using System.Collections.Generic; +using System.Globalization; using System.IO; namespace Config.Entities @@ -144,28 +145,28 @@ namespace Config.Entities public virtual void Export(StreamWriter output) { output.WriteLine(Name); - output.WriteLine(Part.ToString()); - output.WriteLine(Publish.ToString()); + output.WriteLine(Part.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(Publish.ToString(CultureInfo.InvariantCulture)); output.WriteLine(Evaluate.ToString()); - output.WriteLine(Qfrom.ToString()); - output.WriteLine(Qto.ToString()); - output.WriteLine(Volume.ToString()); - output.WriteLine(TstTime.ToString()); + output.WriteLine(Qfrom.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(Qto.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(Volume.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(TstTime.ToString(CultureInfo.InvariantCulture)); output.WriteLine(Method); - output.WriteLine(ErrLimLo.ToString()); - output.WriteLine(ErrLimHi.ToString()); - output.WriteLine(Uncertainty.ToString()); - output.WriteLine(Repeats.ToString()); + output.WriteLine(ErrLimLo.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(ErrLimHi.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(Uncertainty.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(Repeats.ToString(CultureInfo.InvariantCulture)); output.WriteLine(Draining.ToString()); output.WriteLine(Zeroing.ToString()); - output.WriteLine(PumpPower.ToString()); - output.WriteLine(MassRepeats.ToString()); - output.WriteLine(MassSpread.ToString()); - output.WriteLine(((byte)MassMethod).ToString()); - output.WriteLine(TimeBeforeFlow.ToString()); - output.WriteLine(TimeFlow2Mass.ToString()); - output.WriteLine(TimePump2StartV.ToString()); - output.WriteLine(TimeStop2Mass.ToString()); + output.WriteLine(PumpPower.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(MassRepeats.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(MassSpread.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(((byte)MassMethod).ToString(CultureInfo.InvariantCulture)); + output.WriteLine(TimeBeforeFlow.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(TimeFlow2Mass.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(TimePump2StartV.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(TimeStop2Mass.ToString(CultureInfo.InvariantCulture)); output.WriteLine(FeedingPath); output.WriteLine(BenchPath); output.WriteLine(OutputPath); @@ -187,28 +188,28 @@ namespace Config.Entities Test tst = new Test(); tst.Name = firstLine; - tst.Part = int.Parse(input.ReadLine()); - tst.Publish = sbyte.Parse(input.ReadLine()); - tst.Evaluate = bool.Parse(input.ReadLine()); - tst.Qfrom = float.Parse(input.ReadLine()); - tst.Qto = float.Parse(input.ReadLine()); - tst.Volume = float.Parse(input.ReadLine()); - tst.TstTime = float.Parse(input.ReadLine()); + tst.Part = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.Publish = sbyte.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.Evaluate = bool.Parse(input.ReadLine()); + tst.Qfrom = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.Qto = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.Volume = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.TstTime = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); tst.Method = input.ReadLine(); - tst.ErrLimLo = float.Parse(input.ReadLine()); - tst.ErrLimHi = float.Parse(input.ReadLine()); - tst.Uncertainty = float.Parse(input.ReadLine()); - tst.Repeats = int.Parse(input.ReadLine()); + tst.ErrLimLo = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.ErrLimHi = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.Uncertainty = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.Repeats = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); tst.Draining = bool.Parse(input.ReadLine()); - tst.Zeroing = bool.Parse(input.ReadLine()); - tst.PumpPower = float.Parse(input.ReadLine()); - tst.MassRepeats = int.Parse(input.ReadLine()); - tst.MassSpread = float.Parse(input.ReadLine()); - tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine()); - tst.TimeBeforeFlow = int.Parse(input.ReadLine()); - tst.TimeFlow2Mass = int.Parse(input.ReadLine()); - tst.TimePump2StartV = int.Parse(input.ReadLine()); - tst.TimeStop2Mass = int.Parse(input.ReadLine()); + tst.Zeroing = bool.Parse(input.ReadLine()); + tst.PumpPower = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.MassRepeats = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.MassSpread = float.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.TimeBeforeFlow = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.TimeFlow2Mass = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.TimePump2StartV = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); + tst.TimeStop2Mass = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture); tst.FeedingPath = input.ReadLine(); tst.BenchPath = input.ReadLine(); tst.OutputPath = input.ReadLine(); diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 0695aa1ea..0a6fb90dd 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.518.0")] -[assembly: AssemblyFileVersion("2.12.518.0")] +[assembly: AssemblyVersion("2.12.537.0")] +[assembly: AssemblyFileVersion("2.12.537.0")]