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

Bug fixes : 1 Saving results cannot be stopped, 2 Processing statistics, 3 SensusTestInfo.AreCompatible( )

Browse Source
This commit is contained in:
Milan Hanajik 2022-01-04 14:27:58 +01:00
parent 5fea1834bb
commit 7216ac321d
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Results/Output/SensusTestInfo.cs
View File

@ -131,6 +131,8 @@ namespace Results.Output
/// <returns>true when compatible</returns>
public static bool AreCompatible(IList<SensusTestInfo> oracleTestInfo, SensusTestInfo[] completeTestInfo)
{
if (oracleTestInfo == null) return false;
/// All tests in oracleTestInfo must exist in completeTestInfo
foreach (var oti in oracleTestInfo)
{

9
TBF/Resources/Strings.Designer.cs generated
View File

@ -3930,6 +3930,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Processing statistics.
/// </summary>
internal static string Processing_statistics {
get {
return ResourceManager.GetString("Processing_statistics", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Producer.
/// </summary>

3
TBF/Resources/Strings.cs.resx
View File

@ -1674,4 +1674,7 @@
<data name="Opto_head_is_disabled_in_configuration" xml:space="preserve">
<value>Hlavice vypnutá v konfiguraci</value>
</data>
<data name="Processing_statistics" xml:space="preserve">
<value>Spracování statistik</value>
</data>
</root>

3
TBF/Resources/Strings.resx
View File

@ -2305,4 +2305,7 @@
<data name="Close_form_keys" xml:space="preserve">
<value>Close form keys</value>
</data>
<data name="Processing_statistics" xml:space="preserve">
<value>Processing statistics</value>
</data>
</root>

16
TBF/Rig/Sequences/MainSeq.cs
View File

@ -25,8 +25,6 @@ namespace TBF.Rig.Sequences
public override string ToString() { return "Sequences.MainSeq"; }
bool benchFilled;
int simultWithPurgingCount;
Generic.IComponentCfg simultWithPurgingCfg;
Generic.IProcedureParams simultWithPurgingProcParams;
@ -76,8 +74,8 @@ namespace TBF.Rig.Sequences
{
try
{
TestMethods.S640Communication.S640Activity activity; /// 1st argument
TBF.Rig.TestMethods.S640Communication.I640Cfg config; /// 2nd argument
TestMethods.S640Communication.S640Activity activity; /// 1st argument
TBF.Rig.TestMethods.S640Communication.I640Cfg config; /// 2nd argument
if (cfg is TestMethods.S640Communication.S640StartCfg)
{
activity = TestMethods.S640Communication.S640Activity.Start;
@ -1249,18 +1247,14 @@ namespace TBF.Rig.Sequences
}
}
}
savingAndPrintingRslts.AddOperation(checkUiOp)
.EnterState();
savingAndPrintingRslts.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
}
while (e.Contains(Event.Busy));
///
bool resultsSent = !e.Contains(Event.ErrorProcessingResults);
ProcessData.BatchRslts.Batch.RsltsSent = resultsSent;
ProcessData.BatchRslts.Batch.RsltsSent = !e.Contains(Event.ErrorProcessingResults);
///
/// Save results to 'Results' MySQL database
@ -1297,6 +1291,8 @@ namespace TBF.Rig.Sequences
///
if (ProcessData.StatisticsMonitoringComp is IStatisticsMonitoring)
{
Bridge.OnActivity(this, Strings.Processing_statistics);
State.Create("MainSeq : Processing statistics")
.AddOperation((ProcessData.StatisticsMonitoringComp as IStatisticsMonitoring).ProcessStatisticsOp(ProcessData.BatchRslts.Batch.BatchNr))
.AddOperation(checkUiOp)

5
TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs
View File

@ -14,7 +14,7 @@ namespace TBF.Rig.Various.StatisticsMonitoring
public class ProcessStatistics : ComponentBase, IOperation, GenericDevices.IStatisticsMonitoring
{
private static readonly ILog log = LogManager.GetLogger(typeof(ProcessStatistics));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly StatisticsCfg statisticsCfg;
@ -37,6 +37,7 @@ namespace TBF.Rig.Various.StatisticsMonitoring
void ApplyConfig()
{
// TODO
}
#region Configuration Change Handling
@ -129,7 +130,7 @@ namespace TBF.Rig.Various.StatisticsMonitoring
{
usagesMin = 0;
IList<Batch> batches = session.QueryOver<Batch>()
.Where(x => x.Id == batchNr)
.Where(x => x.BatchNr == batchNr)
.List();
batchNr--;
if (batches.Count != 1 || batches[0].TestRslts.Count < 1 || batches[0].TestRslts[0].MethodClass != "TestMethods.iPerlCommunication")