diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index bbfebd76c..f9cec62a6 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.32.2023.0")] -[assembly: AssemblyFileVersion("2.32.2023.0")] +[assembly: AssemblyVersion("2.32.2025.0")] +[assembly: AssemblyFileVersion("2.32.2025.0")] diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 9876d36a2..dfabbfea7 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -24,14 +24,6 @@ namespace TBF.Rig.TestMethods.iPerlCommunication public const string IperlCheckCmd = "iPERL_check "; - public static Dictionary testParamsDict; - /// - static iPerlCommunicationSeq() - { - testParamsDict = new Dictionary(); - } - - System.Windows.Forms.Form modelessDlg; /// delegate void iPerlCommFormDlgt(iPerlCommunicationSeq myRef, TestMethod method, Test test, iPerlCommunicationParams testParams); @@ -64,15 +56,6 @@ namespace TBF.Rig.TestMethods.iPerlCommunication { TestMethodCfg cfg = method.Cfg as TestMethodCfg; - if (testParamsDict.ContainsKey(test.Name)) - { - testParamsDict[test.Name] = testParams; - } - else - { - testParamsDict.Add(test.Name, testParams); - } - IList e; /// Events from currently running operations checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state modelessDlg = null; @@ -140,16 +123,10 @@ namespace TBF.Rig.TestMethods.iPerlCommunication Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.FlowSetting)); - string fromTestName = testParams.Activity.Substring(cmd.Length); - iPerlCommunicationParams fromTestParams; - if (testParamsDict.TryGetValue(fromTestName, out fromTestParams) && fromTestParams.Activity.ToLower().Contains("plus")) - { - MakeQ2CorrectedFrom(test.Name, fromTestName, true); - } - else - { - MakeQ2CorrectedFrom(test.Name, fromTestName); - } + string[] args = testParams.Activity.Substring(cmd.Length).Split(new char[] { ' ' }); + string fromTestName = (args.Length >= 1) ? args[0] : string.Empty; + bool isPlus = (args.Length >= 2) ? args[1].ToLower().Contains("plus") : false; + MakeQ2CorrectedFrom(test.Name, fromTestName, isPlus); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.Completed)); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(test.Name, 0)));