michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IperlHead.DetermineExtraDataFileName( ) fixed, ver. 2.31.1996

Browse Source
This commit is contained in:
Milan Hanajik 2022-12-13 16:32:46 +01:00
parent d83762ddec
commit 0849467857
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -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")]

7
TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -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
///