From 0849467857e8006da50308191716dc198ba814d8 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 13 Dec 2022 16:32:46 +0100 Subject: [PATCH] IperlHead.DetermineExtraDataFileName( ) fixed, ver. 2.31.1996 --- TBF/Properties/AssemblyInfo.cs | 4 ++-- .../TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index fa6f76047..5642a984e 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.31.1994.0")] -[assembly: AssemblyFileVersion("2.31.1994.0")] +[assembly: AssemblyVersion("2.31.1996.0")] +[assembly: AssemblyFileVersion("2.31.1996.0")] diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs index 242548506..f1e53ad0b 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs @@ -749,10 +749,11 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead if (wmPosition.Length == 1) wmPosition = "0" + wmPosition; string cycleStartTime = StateMachine.CycleStartTimeStamp.ToString("HH_mm_ss"); string[] designations = string.IsNullOrEmpty(test.RawDataDesignation) ? new string[0] : test.RawDataDesignation.Split(new char[] { '~' }); + int testId = test.RawDataId + repetitionNr * test.RawDataIdRepetMulti; string designation = string.IsNullOrEmpty(test.RawDataDesignation) - ? (test.RawDataId + repetitionNr * test.RawDataIdRepetMulti).ToString("D2") /// Name is generated from Id - : (designations.Length > repetitionNr - 1) ? designations[repetitionNr - 1] /// Name is from 'RawDataDesignation' parameter - : string.Format("{0}{1}", test.Name, repetitionNr); /// Name is form test name and repetition nr. + ? testId.ToString(testId > 0 ? "D2" : "D1") /// Name is generated from Id + : (designations.Length > repetitionNr - 1) ? designations[repetitionNr - 1] /// Name is from 'RawDataDesignation' parameter + : string.Format("{0}{1}", test.Name, repetitionNr); /// Name is form test name and repetition nr. /// /// Return the file name ///