diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs
index 1277f8533..470b15c91 100644
--- a/Results/Output/SensusTestInfo.cs
+++ b/Results/Output/SensusTestInfo.cs
@@ -131,6 +131,8 @@ namespace Results.Output
/// true when compatible
public static bool AreCompatible(IList oracleTestInfo, SensusTestInfo[] completeTestInfo)
{
+ if (oracleTestInfo == null) return false;
+
/// All tests in oracleTestInfo must exist in completeTestInfo
foreach (var oti in oracleTestInfo)
{
diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs
index 6bffc8ac2..84da8b751 100644
--- a/TBF/Resources/Strings.Designer.cs
+++ b/TBF/Resources/Strings.Designer.cs
@@ -3930,6 +3930,15 @@ namespace TBF.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Processing statistics.
+ ///
+ internal static string Processing_statistics {
+ get {
+ return ResourceManager.GetString("Processing_statistics", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Producer.
///
diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx
index daa9dac9d..58d388d6e 100644
--- a/TBF/Resources/Strings.cs.resx
+++ b/TBF/Resources/Strings.cs.resx
@@ -1674,4 +1674,7 @@
Hlavice vypnutá v konfiguraci
+
+ Spracování statistik
+
\ No newline at end of file
diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx
index 333be7d0a..154fb83b1 100644
--- a/TBF/Resources/Strings.resx
+++ b/TBF/Resources/Strings.resx
@@ -2305,4 +2305,7 @@
Close form keys
+
+ Processing statistics
+
\ No newline at end of file
diff --git a/TBF/Rig/Sequences/MainSeq.cs b/TBF/Rig/Sequences/MainSeq.cs
index c0aaeeb5e..97b4ef559 100644
--- a/TBF/Rig/Sequences/MainSeq.cs
+++ b/TBF/Rig/Sequences/MainSeq.cs
@@ -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)
diff --git a/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs b/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs
index a26addfdf..42b322460 100644
--- a/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs
+++ b/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs
@@ -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 batches = session.QueryOver()
- .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")