From 1133a2d5bff738fe63a3e9631e08643c0baed799 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 3 Jan 2022 15:15:25 +0100 Subject: [PATCH] Bug fixes : 1 Saving results cannot be stopped, 2 Processing statistics, 3 SensusTestInfo --- .gitignore | 2 ++ Results/Output/SensusTestInfo.cs | 18 +++++++++++++++--- TBF/Resources/Strings.Designer.cs | 9 +++++++++ TBF/Resources/Strings.cs.resx | 3 +++ TBF/Resources/Strings.resx | 3 +++ TBF/Rig/Sequences/MainSeq.cs | 14 +++++++------- .../StatisticsMonitoring/ProcessStatistics.cs | 4 ++-- clean.bat | 2 ++ 8 files changed, 43 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index d98c24149..2bb9f35a2 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ Results/bin/ Results/obj/ ResultsBrowser/bin/ ResultsBrowser/obj/ +ResultsParser/bin/ +ResultsParser/obj/ SharedDatabase/bin SharedDatabase/obj SchematicDrawing/bin diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs index 3a80c1898..470b15c91 100644 --- a/Results/Output/SensusTestInfo.cs +++ b/Results/Output/SensusTestInfo.cs @@ -14,6 +14,7 @@ namespace Results.Output Just_Q3Q2adjQ1, /// pNrs = -1,3,2,1 Just_Q3Q2adjQ1_Alt, /// pNrs = -1,5,2,1 JustA0A4_Q3Q2adjQ1, /// pNrs = -2,-1,3,2,1 (Australia 169 MHz, raw data pNrs: -2,-1,4,3,2,1) + JustA0A4_Q3Q2Q1, /// pNrs = -2,-1,3,2,1 (Australia 169 MHz smart, raw data pNrs: -2,-1,3,2,1) DEWA, /// Q4, Q3, Q2adj, Q2, Q1 DEWA_wo_Q2, /// Q4, Q3, Q2adj, Q1 Suez, /// Two directions, with Q2 and Q2ac @@ -280,6 +281,17 @@ namespace Results.Output new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; + + case LogType.JustA0A4_Q3Q2Q1: /// Australia 169 MHz with default Q2 corrections and conditional update at the end of cycle + return new SensusTestInfo[] + { + /// TBF Oracle DB Opto RAW LU logfiles + new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Q-1", Range.R95_105), + new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Q-2", Range.R95_105), + new SensusTestInfo("Q3", 3, "Q3", 3, "03", 3, "Q3", Range.R90_100), + new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), + new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), + }; case LogType.DEWA: /// DEWA (with Q4 and Q2 after correction) return new SensusTestInfo[] @@ -437,7 +449,7 @@ namespace Results.Output return new SensusTestInfo[] { /// TBF Oracle DB Opto RAW LU logfiles - new SensusTestInfo("Q3", 3, "Q3", 3, "04", 3, "Q3", Range.R90_100), + new SensusTestInfo("Q3", 3, "Q3", 3, "03", 3, "Q3", Range.R90_100), new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; @@ -446,7 +458,7 @@ namespace Results.Output return new SensusTestInfo[] { /// TBF Oracle DB Opto RAW LU logfiles - new SensusTestInfo("Q3", 5, "Q3", 5, "04", 5, "Q3", Range.R90_100), + new SensusTestInfo("Q3", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100), new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; @@ -455,7 +467,7 @@ namespace Results.Output return new SensusTestInfo[] { /// TBF Oracle DB Opto RAW LU logfiles - new SensusTestInfo("Q4", 5, "Q4", 5, "04", 5, "Q4", Range.R90_100), + new SensusTestInfo("Q4", 5, "Q4", 5, "05", 5, "Q4", Range.R90_100), new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index bf9ddd423..29e62b45c 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -4002,6 +4002,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 5e9db5385..6a0b0a8fc 100644 --- a/TBF/Resources/Strings.cs.resx +++ b/TBF/Resources/Strings.cs.resx @@ -1701,4 +1701,7 @@ Určitě chcete vymazat všechny kódy ? + + Spracování statistik + \ No newline at end of file diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 0e9781a75..abea1244e 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -2356,4 +2356,7 @@ Database and water meters selection + + Processing statistics + \ No newline at end of file diff --git a/TBF/Rig/Sequences/MainSeq.cs b/TBF/Rig/Sequences/MainSeq.cs index 8d19ffe20..2eeb42bb1 100644 --- a/TBF/Rig/Sequences/MainSeq.cs +++ b/TBF/Rig/Sequences/MainSeq.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Linq; using log4net; using NHibernate; using Common; @@ -1331,18 +1332,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 @@ -1352,7 +1349,8 @@ namespace TBF.Rig.Sequences /// /// Save results to 'summary results' logger /// - foreach (var tr in ProcessData.BatchRslts.Batch.TestRslts) + log.WarnFormat("Saving SummaryResults of batch {0}", ProcessData.BatchRslts.Batch.BatchNr); + foreach (var tr in ProcessData.BatchRslts.Batch.TestRslts) { summaryResults.Info(TestResult2CsvLine(tr)); } @@ -1381,6 +1379,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 c30503591..7d3d6411a 100644 --- a/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs +++ b/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs @@ -27,12 +27,12 @@ namespace TBF.Rig.Various.StatisticsMonitoring : base(cfg) { statisticsCfg = cfg as StatisticsCfg; - log.Warn(this.ToString()); } public override void Initialize() { ApplyConfig(); + log.FatalFormat("{0} initialized: {1}", Name, this); } void ApplyConfig() @@ -130,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") diff --git a/clean.bat b/clean.bat index 859188b46..43ac1f498 100644 --- a/clean.bat +++ b/clean.bat @@ -40,6 +40,8 @@ rmdir /s /q Results\bin rmdir /s /q Results\obj rmdir /s /q ResultsBrowser\bin rmdir /s /q ResultsBrowser\obj +rmdir /s /q ResultsParser\bin +rmdir /s /q ResultsParser\obj rmdir /s /q SharedDatabase\bin rmdir /s /q SharedDatabase\obj rmdir /s /q SchematicDrawing\bin