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

Refactorization : Common.Utils.GetTestName(...) replaces Results.Utils.GetTestName(...)

Browse Source
This commit is contained in:
Milan Hanajik 2022-12-12 17:36:40 +01:00
parent 4640018e78
commit d83762ddec
39 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Results/Entities/TestRslt.cs
View File

@ -147,7 +147,7 @@ namespace Results.Entities
public virtual int Counter5 { get; set; } public virtual int Counter5 { get; set; }
/// Wrappers /// Wrappers
public virtual string Name() { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); } public virtual string Name() { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
public virtual int Repeats() { return TestData.Repeats; } public virtual int Repeats() { return TestData.Repeats; }
public virtual double Qfrom() { return TestData.Qfrom; } public virtual double Qfrom() { return TestData.Qfrom; }
public virtual double Qto() { return TestData.Qto; } public virtual double Qto() { return TestData.Qto; }

5
Results/Utils.cs
View File

@ -11,11 +11,6 @@ namespace Results
{ {
public static int MaxTestIndex = 0; public static int MaxTestIndex = 0;
public static string GetTestName(string name, int repeats, int repetitionNr)
{
return Common.Utils.GetTestName(name, repeats, repetitionNr);
}
public static int BenchIdOracle2Asc(int benchIdOracle) public static int BenchIdOracle2Asc(int benchIdOracle)
{ {

6
TBF/Rig/Sequences/SequenceBase.cs
View File

@ -1539,7 +1539,7 @@ namespace TBF.Rig.Sequences
/// <returns>Test result</returns> /// <returns>Test result</returns>
public void MakeSimulatedTrivial(Config.Entities.Test test, int repetitionNr, int part) public void MakeSimulatedTrivial(Config.Entities.Test test, int repetitionNr, int part)
{ {
string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string fullTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part);
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
@ -1656,7 +1656,7 @@ namespace TBF.Rig.Sequences
/// <returns>Test result</returns> /// <returns>Test result</returns>
public void MakeSimulated(Config.Entities.Test test, int repetitionNr, int part, float errorPctBase) public void MakeSimulated(Config.Entities.Test test, int repetitionNr, int part, float errorPctBase)
{ {
string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string fullTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part);
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
@ -1772,7 +1772,7 @@ namespace TBF.Rig.Sequences
/// <returns>Test result</returns> /// <returns>Test result</returns>
protected void MakeSimulatedCompound(Config.Entities.Test test, int repetitionNr, int part, float errorPct, float mainPart) protected void MakeSimulatedCompound(Config.Entities.Test test, int repetitionNr, int part, float errorPct, float mainPart)
{ {
string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string fullTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part);

2
TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -125,7 +125,7 @@ namespace TBF.Rig.TestMethods.Adjustment
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// Read pressure and temperature once before calling Bridge.OnTestSelected(...) /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name)) State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))

2
TBF/Rig/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs
View File

@ -42,7 +42,7 @@ namespace TBF.Rig.TestMethods.ChangeFlowDirection
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;

4
TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -145,7 +145,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
@ -880,7 +880,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
} }
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------ //------------------------------------------------

2
TBF/Rig/TestMethods/Counter/CounterSeq.cs
View File

@ -38,7 +38,7 @@ namespace TBF.Rig.TestMethods.Counter
TBF.UiBridge.Bridge.OnSaveSettings(this, null); TBF.UiBridge.Bridge.OnSaveSettings(this, null);
/// Update results /// Update results
var testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); var testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
var testResults = BatchRslts.GetTestRslt(testName, test.Part); var testResults = BatchRslts.GetTestRslt(testName, test.Part);
global::Results.Utils.GetCounterStates(testResults, Program.LocalSettings.Counters); global::Results.Utils.GetCounterStates(testResults, Program.LocalSettings.Counters);
if (testResults != null) if (testResults != null)

2
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
View File

@ -117,7 +117,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, null, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, null, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;

2
TBF/Rig/TestMethods/Dummy/DummySeq.cs
View File

@ -31,7 +31,7 @@ namespace TBF.Rig.TestMethods.Dummy
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
/// ///

2
TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs
View File

@ -125,7 +125,7 @@ namespace TBF.Rig.TestMethods.Endurance
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;

2
TBF/Rig/TestMethods/Evacuation/EvacuationSeq.cs
View File

@ -51,7 +51,7 @@ namespace TBF.Rig.TestMethods.Evacuation
/// ///
/// Populate TestResult data entity with data /// Populate TestResult data entity with data
/// ///
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)

2
TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
View File

@ -117,7 +117,7 @@ namespace TBF.Rig.TestMethods.FixedStart
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// ///
/// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test

2
TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
View File

@ -124,7 +124,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;

4
TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
View File

@ -40,7 +40,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval
intermediateData = new IntermediateData intermediateData = new IntermediateData
{ {
Compound = compound, Compound = compound,
TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr), TestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr),
TestPart = test.Part, TestPart = test.Part,
}; };
@ -136,7 +136,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// ///
/// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test

4
TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
View File

@ -40,7 +40,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
intermediateData = new IntermediateData intermediateData = new IntermediateData
{ {
Compound = compound, Compound = compound,
TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr), TestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr),
TestPart = test.Part, TestPart = test.Part,
}; };
@ -152,7 +152,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// ///
/// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test

2
TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -132,7 +132,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// ///
/// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test

2
TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
View File

@ -134,7 +134,7 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// ///

4
TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -115,7 +115,7 @@ namespace TBF.Rig.TestMethods.FlyingStart
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
/// ///
@ -796,7 +796,7 @@ namespace TBF.Rig.TestMethods.FlyingStart
else MakeSimulated(test, 1, 0, 0.9f); else MakeSimulated(test, 1, 0, 0.9f);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------------------------ //------------------------------------------------------------------

6
TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
View File

@ -137,7 +137,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
bool drainTheTank = (repetitionNr == 1) ? test.DoDraining : false; bool drainTheTank = (repetitionNr == 1) ? test.DoDraining : false;
@ -784,7 +784,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
} }
else else
{ {
Results.Entities.TestRslt tstResRepet1 = BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, test.Repeats, 1), test.Part); Results.Entities.TestRslt tstResRepet1 = BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, test.Repeats, 1), test.Part);
tstRslt.TimeBtwnMassMsrmnts = 0; tstRslt.TimeBtwnMassMsrmnts = 0;
tstRslt.MassOfEvapWater = 0; tstRslt.MassOfEvapWater = 0;
@ -1125,7 +1125,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
} }
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------------------------- //-------------------------------------------------------------------

2
TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
View File

@ -151,7 +151,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;

4
TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -138,7 +138,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, targetTotalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, targetTotalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
@ -1249,7 +1249,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
} }
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------------------------- //-------------------------------------------------------------------

6
TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -133,7 +133,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
@ -1160,7 +1160,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
} }
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------------------------- //-------------------------------------------------------------------
@ -1235,7 +1235,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
MakeSimulated(test, repetitionNr, test.Part, errorPctBase + repetitionNr * 0.1f); MakeSimulated(test, repetitionNr, test.Part, errorPctBase + repetitionNr * 0.1f);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
} }

2
TBF/Rig/TestMethods/FlyingStartMassCollection/Single/Component.cs
View File

@ -45,7 +45,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection.Single
/// DebugLevel == DebugMode.Simulate /// DebugLevel == DebugMode.Simulate
(new FlyingStartMassCollectionSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); (new FlyingStartMassCollectionSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
return new List<Event> { Event.Done }; return new List<Event> { Event.Done };
} }
} }

4
TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
View File

@ -129,7 +129,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
@ -815,7 +815,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection
} }
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------------------------- //-------------------------------------------------------------------

2
TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs
View File

@ -76,7 +76,7 @@ namespace TBF.Rig.TestMethods.LeakTest
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, 1); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, 1);
//------------------------------------------------ //------------------------------------------------
Bridge.OnActivity(this, Strings.Starting_the_pump); Bridge.OnActivity(this, Strings.Starting_the_pump);

2
TBF/Rig/TestMethods/LeakTest/TestMethod.cs
View File

@ -46,7 +46,7 @@ namespace TBF.Rig.TestMethods.LeakTest
/// DebugLevel == DebugMode.Simulate /// DebugLevel == DebugMode.Simulate
(new LeakTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); (new LeakTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
return new List<Event> { Event.Done }; return new List<Event> { Event.Done };
} }
} }

2
TBF/Rig/TestMethods/ManualEntry/ManualEntrySeq.cs
View File

@ -45,7 +45,7 @@ namespace TBF.Rig.TestMethods.ManualEntry
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// ///
/// Populate TestResult data entity with default data /// Populate TestResult data entity with default data

2
TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs
View File

@ -59,7 +59,7 @@ namespace TBF.Rig.TestMethods.PMaxTest
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, 1); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, 1);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
//------------------------------------------------ //------------------------------------------------

2
TBF/Rig/TestMethods/PMaxTest/TestMethod.cs
View File

@ -49,7 +49,7 @@ namespace TBF.Rig.TestMethods.PMaxTest
/// DebugLevel == DebugMode.Simulate /// DebugLevel == DebugMode.Simulate
(new PMaxTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); (new PMaxTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
return new List<Event> { Event.Done }; return new List<Event> { Event.Done };
} }
} }

2
TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs
View File

@ -120,7 +120,7 @@ namespace TBF.Rig.TestMethods.PulsesTest
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
/// Read pressure and temperature once before calling Bridge.OnTestSelected(...) /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name)) State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))

2
TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
View File

@ -134,7 +134,7 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));

2
TBF/Rig/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs
View File

@ -45,7 +45,7 @@ namespace TBF.Rig.TestMethods.Q2CorrectionFromHistory
/// ///
/// Populate TestResult data entity with data /// Populate TestResult data entity with data
/// ///
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {

2
TBF/Rig/TestMethods/RoiDetection/RoiDetectionSeq.cs
View File

@ -49,7 +49,7 @@ namespace TBF.Rig.TestMethods.RoiDetection
// Start the test // Start the test
//==================== //====================
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
//------------------------------------------------- //-------------------------------------------------

2
TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs
View File

@ -143,7 +143,7 @@ namespace TBF.Rig.TestMethods.SensitivityTest
/// Start the test, initialize test results /// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
TestStartTime = DateTime.Now; TestStartTime = DateTime.Now;
Qrise = 0; Qrise = 0;

2
TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs
View File

@ -115,7 +115,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// DebugLevel == DebugMode.Simulate /// DebugLevel == DebugMode.Simulate
(new iPerlCommunicationSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); (new iPerlCommunicationSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
return new List<Event> { Event.Done }; return new List<Event> { Event.Done };
} }
} }

2
TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
View File

@ -302,7 +302,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
else if (testParams.Activity.Substring(cmd.Length).ToLower() == "compound fall") MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f); else if (testParams.Activity.Substring(cmd.Length).ToLower() == "compound fall") MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f);
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.Completed)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.Completed));
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file
//------------------------------------------------ //------------------------------------------------

2
TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
View File

@ -206,7 +206,7 @@ namespace TBF.UI.Procedures.TestWizard
{ {
/// This is a regular test, /// This is a regular test,
/// not an internal/unpublished test, neither an auto action test /// not an internal/unpublished test, neither an auto action test
wmTestNames.Add(Results.Utils.GetTestName(t.Name, 1, 1)); wmTestNames.Add(Common.Utils.GetTestName(t.Name, 1, 1));
} }
} }

4
TBF/UiBridge/ProcessDataEventArgs.cs
View File

@ -27,7 +27,7 @@ namespace TBF.UiBridge
public ProcessDataEventArgs(string testName, int testRepeats, int testPart, int repetitionNr, Progress testPhase) public ProcessDataEventArgs(string testName, int testRepeats, int testPart, int repetitionNr, Progress testPhase)
{ {
CompleteTestName = Results.Utils.GetTestName(testName, testRepeats, repetitionNr); CompleteTestName = Common.Utils.GetTestName(testName, testRepeats, repetitionNr);
Part = testPart; Part = testPart;
Repeats = testRepeats; Repeats = testRepeats;
RepetitionNr = repetitionNr; RepetitionNr = repetitionNr;
@ -42,7 +42,7 @@ namespace TBF.UiBridge
public ProcessDataEventArgs(Test test, int repetitionNr, Progress testPhase) public ProcessDataEventArgs(Test test, int repetitionNr, Progress testPhase)
{ {
CompleteTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); CompleteTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Part = test.Part; Part = test.Part;
Repeats = test.Repeats; Repeats = test.Repeats;
RepetitionNr = repetitionNr; RepetitionNr = repetitionNr;

2
TBF/UiBridge/TestProgressEventArgs.cs
View File

@ -87,7 +87,7 @@ namespace TBF.UiBridge
public TestProgressEventArgs(Test test, int repetitionNr, Progress progress) public TestProgressEventArgs(Test test, int repetitionNr, Progress progress)
: this(progress) : this(progress)
{ {
TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Part = test.Part; Part = test.Part;
Repeats = test.Repeats; Repeats = test.Repeats;
RepetitionNr = repetitionNr; RepetitionNr = repetitionNr;