From 7319a9aee40644fd76a0d2405b886496a020f38b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 10 Feb 2017 10:20:07 +0100 Subject: [PATCH] MassStart, MassEnd added to (old) results items, ver. 2.12.456 --- Results/ItemSpec.cs | 5 ++++- Results/Properties/AssemblyInfo.cs | 4 ++-- Results/Resources/Strings.Designer.cs | 18 ++++++++++++++++++ Results/Resources/Strings.resx | 6 ++++++ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Results/ItemSpec.cs b/Results/ItemSpec.cs index ac847d088..c653ab999 100644 --- a/Results/ItemSpec.cs +++ b/Results/ItemSpec.cs @@ -208,7 +208,10 @@ namespace Results AllItems.Add(new ItemSpec("Temp lo st", "T lo st", null, null, (x, z) => z.TestRslt.Custom7.ToString("F3"))); AllItems.Add(new ItemSpec("Temp lo en", "T lo en", null, null, (x, z) => z.TestRslt.Custom8.ToString("F3"))); AllItems.Add(new ItemSpec("Temp lo av", "T lo av", null, null, (x, z) => ((z.TestRslt.Custom7 + z.TestRslt.Custom8) / 2).ToString("F3"))); - } + + AllItems.Add(new ItemSpec("Start mass", Strings.Start_mass + " [kg]", x => x.TestRslt.MassStart.ToString("F4"), (x, y, z) => z.TestRslt.MassStart.ToString("F4"), (x, z) => z.TestRslt.MassStart.ToString("F4"))); + AllItems.Add(new ItemSpec("End mass", Strings.End_mass + " [kg]", x => x.TestRslt.MassEnd.ToString("F4"), (x, y, z) => z.TestRslt.MassEnd.ToString("F4"), (x, z) => z.TestRslt.MassEnd.ToString("F4"))); + } public static ItemSpec GetItem(string name) { diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 54810920d..14b5ba7b2 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/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.424.0")] -[assembly: AssemblyFileVersion("2.12.424.0")] +[assembly: AssemblyVersion("2.12.456.0")] +[assembly: AssemblyFileVersion("2.12.456.0")] diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 22dbef2c9..3cc59a3cc 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -177,6 +177,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to End mass. + /// + internal static string End_mass { + get { + return ResourceManager.GetString("End_mass", resourceCulture); + } + } + /// /// Looks up a localized string similar to End state. /// @@ -717,6 +726,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Start mass. + /// + internal static string Start_mass { + get { + return ResourceManager.GetString("Start_mass", resourceCulture); + } + } + /// /// Looks up a localized string similar to Start volume. /// diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 97a34857a..193f30bf2 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -420,4 +420,10 @@ Volume main + + End mass + + + Start mass + \ No newline at end of file diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 163ea85f4..ca80fd193 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.455.1")] -[assembly: AssemblyFileVersion("2.12.455.1")] +[assembly: AssemblyVersion("2.12.456.1")] +[assembly: AssemblyFileVersion("2.12.456.1")]