From a14e21eb57e5a7d6174753a6dbe7b121c1f2a4cd Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 16 Nov 2022 06:50:47 +0100 Subject: [PATCH] Profile import fixed. --- Config/Entities/PTest.cs | 22 ++++++++++++++++++++-- Config/Entities/Profile.cs | 5 ++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Config/Entities/PTest.cs b/Config/Entities/PTest.cs index 513fdd201..0933e141c 100644 --- a/Config/Entities/PTest.cs +++ b/Config/Entities/PTest.cs @@ -247,10 +247,28 @@ namespace Config.Entities tst.ErrLimHi = double.Parse(input.ReadLine(), ci); tst.TempLimLo = double.Parse(input.ReadLine(), ci); tst.TempLimHi = double.Parse(input.ReadLine(), ci); - tst.Publish = sbyte.Parse(input.ReadLine()); + tst.PressLimLo = double.Parse(input.ReadLine(), ci); + tst.PressLimHi = double.Parse(input.ReadLine(), ci); + tst.Publish = sbyte.Parse(input.ReadLine(), ci); tst.Evaluate = bool.Parse(input.ReadLine()); - /// TODO (E1 .. E21) + tst.E1 = sbyte.Parse(input.ReadLine(), ci); + tst.E2 = sbyte.Parse(input.ReadLine(), ci); + tst.E3 = sbyte.Parse(input.ReadLine(), ci); + tst.E4 = sbyte.Parse(input.ReadLine(), ci); + tst.E5 = sbyte.Parse(input.ReadLine(), ci); + tst.E6 = sbyte.Parse(input.ReadLine(), ci); + tst.E7 = sbyte.Parse(input.ReadLine(), ci); + tst.E8 = sbyte.Parse(input.ReadLine(), ci); + tst.E9 = sbyte.Parse(input.ReadLine(), ci); + tst.E10 = sbyte.Parse(input.ReadLine(), ci); + tst.E11 = sbyte.Parse(input.ReadLine(), ci); + tst.E12 = sbyte.Parse(input.ReadLine(), ci); + tst.E13 = sbyte.Parse(input.ReadLine(), ci); + tst.E14 = sbyte.Parse(input.ReadLine(), ci); + tst.E15 = sbyte.Parse(input.ReadLine(), ci); + tst.E16 = sbyte.Parse(input.ReadLine(), ci); + tst.E21 = sbyte.Parse(input.ReadLine(), ci); tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci); tst.Delta_T = double.Parse(input.ReadLine(), ci); diff --git a/Config/Entities/Profile.cs b/Config/Entities/Profile.cs index cf39b31b3..a7c2f0125 100644 --- a/Config/Entities/Profile.cs +++ b/Config/Entities/Profile.cs @@ -78,6 +78,8 @@ namespace Config.Entities output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture)); output.WriteLine(LastChgUser); output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture)); + output.WriteLine(((sbyte)ProfileType).ToString()); + output.WriteLine(((sbyte)ErrorLimitType).ToString()); foreach (var test in Tests) { test.Export(output); } output.WriteLine(); @@ -96,7 +98,8 @@ namespace Config.Entities result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture); result.LastChgUser = input.ReadLine(); result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture); - string line = input.ReadLine(); + result.ProfileType = (ProfileType)sbyte.Parse(input.ReadLine()); + result.ErrorLimitType = (ErrorLimitType)sbyte.Parse(input.ReadLine()); while (true) {