From c1f23b8481b03faf1c533bbf05a5ca85665f0d1b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 8 Jul 2020 12:24:21 +0200 Subject: [PATCH] ResultsBrowser with a custom query for SUEZ, ver. 2.26.1498 --- ResultsBrowser/OraData.cs | 2 ++ ResultsBrowser/Properties/AssemblyInfo.cs | 4 +-- ResultsBrowser/ResultsBrowserWnd.cs | 44 ++++++++++++++--------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ResultsBrowser/OraData.cs b/ResultsBrowser/OraData.cs index 90b4268e2..ae6f6df40 100644 --- a/ResultsBrowser/OraData.cs +++ b/ResultsBrowser/OraData.cs @@ -30,6 +30,8 @@ namespace ResultsBrowser public double Q3LrErr; public double Q2RlErr; public double Q2LrErr; + public double Q2acRlErr; + public double Q2acLrErr; public double Q1RlErr; public double Q1LrErr; public int CalibFactor; diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 7d7c6f98c..61ff237f5 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.26.1496.0")] -[assembly: AssemblyFileVersion("2.26.1496.0")] +[assembly: AssemblyVersion("2.26.1498.0")] +[assembly: AssemblyFileVersion("2.26.1498.0")] diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index 33ab4d6d0..093e0c9a9 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -739,13 +739,19 @@ namespace ResultsBrowser double flow = dr.GetDouble(i++); /// Q_WZ double error = dr.GetDouble(i++); /// Q_FEHLER bool testPassed = (dr.GetInt32(i++) != 0); -#if false +#if true /// SUEZ specific switch (testId) { case -2: oraD.AdjErrA4 = error; break; case -1: oraD.AdjErr = error; break; - case 5: oraD.Q3LrErr = error; break; + case 1: oraD.Q1LrErr = error; break; + case 2: oraD.Q2acLrErr = error; break; + case 3: oraD.Q2LrErr = error; break; + case 5: oraD.Q3LrErr = error; break; + case 6: oraD.Q1RlErr = error; break; + case 7: oraD.Q2acRlErr = error; break; + case 8: oraD.Q2RlErr = error; break; case 10: oraD.Q3RlErr = error; break; default: break; } @@ -947,12 +953,12 @@ namespace ResultsBrowser consoleTextBox.Text += "CSV data begin\r\n"; using (TextWriter writer = new StreamWriter(dlg.DestinationFile)) { -#if false - writer.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; AdjA4; Q3RL; Q3LR; CalF; CAlF_LNA; HP; Q2cRL; Q2cLR")); +#if true + writer.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; AdjA4; Q3RL; Q3LR; Q2RL; Q2LR; Q2acRL; Q2acLR; Q1RL; Q1LR; CalF; CAlF_LNA; HP; Q2cRL; Q2cLR")); //Console.WriteLine(string.Format("s/n;PCB nr.;bench;batch;position;Err. at 640 l/h;Err. LNA at 640 l/h;Err. Q3 RL;Err. Q3 LR;Cal.f.;Cal.f.LNA;Q2 corr.f. RL;Q2 corr.f. LR")); foreach (var oraD in oraDatas) { - writer.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20}", + writer.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20};{21};{22};{23};{24};{25};{26};{27};{28}", //Console.WriteLine(string.Format("{2};=(\"{3}\"); {4};{5};{11};{12};{13};{14};{15};{16};{17};{19};{20}", /* 0 */ oraD.PO, /* 1 */ oraD.Prefix, @@ -966,17 +972,23 @@ namespace ResultsBrowser /* 9 */ oraD.End.ToShortDateString(), /* 10 */ oraD.End.ToShortTimeString(), /* 11 */ oraD.WMPosition, - /* 12 */ oraD.AdjErr.ToString("F2"), - /* 13 */ oraD.AdjErrA4.ToString("F2"), - /* 14 */ oraD.Q3RlErr.ToString("F2"), - /* 15 */ oraD.Q3LrErr.ToString("F2"), - /* 16 */ oraD.CalibFactor, - /* 17 */ oraD.CalibFactorLNA, - /* 18 */ oraD.HydrPruefung, - /* 19 */ oraD.Q2CorrectionRl, - /* 20 */ oraD.Q2CorrectionLr, - /* 21 */ oraD.WMTypeId, - /* 22 */ oraD.WMTypeRev)); + /* 12 */ oraD.AdjErr.ToString("F3"), + /* 13 */ oraD.AdjErrA4.ToString("F3"), + /* 14 */ oraD.Q3RlErr.ToString("F3"), + /* 15 */ oraD.Q3LrErr.ToString("F3"), + /* 16 */ oraD.Q2RlErr.ToString("F3"), + /* 17 */ oraD.Q2LrErr.ToString("F3"), + /* 18 */ oraD.Q2acRlErr.ToString("F3"), + /* 19 */ oraD.Q2acLrErr.ToString("F3"), + /* 20 */ oraD.Q1RlErr.ToString("F3"), + /* 21 */ oraD.Q1LrErr.ToString("F3"), + /* 22 */ oraD.CalibFactor, + /* 23 */ oraD.CalibFactorLNA, + /* 24 */ oraD.HydrPruefung, + /* 25 */ oraD.Q2CorrectionRl, + /* 26 */ oraD.Q2CorrectionLr, + /* 27 */ oraD.WMTypeId, + /* 28 */ oraD.WMTypeRev)); } #else writer.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; Q4; Q3; Q2Adj; Q2; Q1; CalF; HP; Q2cRL; Q2cLR"));