From 68c4bf5956dfe357f0814109de9231d5b3590d96 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 8 Jan 2016 16:57:37 +0100 Subject: [PATCH] Separate string SerialNrAux and int SerialNrEx in Results. Other fixes. Version 2.1.180 --- Config/Properties/AssemblyInfo.cs | 4 ++-- Results/Entities/WaterMeter.cs | 5 +++-- Results/Mappings/WaterMeterMap.cs | 3 ++- Results/Properties/AssemblyInfo.cs | 4 ++-- ResultsBrowser/Properties/AssemblyInfo.cs | 4 ++-- .../BenchControl/DB/SensusOracle/Database.cs | 4 ++-- .../BenchControl/DataEntry/Combined/EntryForm.cs | 2 +- .../BenchControl/DataEntry/Munich/EntryForm.cs | 6 +++--- .../ResultsPrinters/Munich/MunichPrintDocument.cs | 2 +- .../BenchControl/Sequences/SequenceBase.cs | 4 ++-- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 4 ++-- .../FlyingStartMassCollectionSeq.cs | 4 ++-- .../BenchControl/WaterMeters/iPerl/WaterMeter.cs | 9 +++++++++ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 14 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 572280b8d..5bca9ce81 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/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.1.172.0")] -[assembly: AssemblyFileVersion("2.1.172.0")] +[assembly: AssemblyVersion("2.1.180.0")] +[assembly: AssemblyFileVersion("2.1.180.0")] diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 5460d0e7c..803216b23 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -10,7 +10,7 @@ namespace Results.Entities { public virtual int Id { get; protected set; } public virtual string SerialNr { get; set; } /// Main s/n for compound meters, PCB Number for iPerl water meter - public virtual string SerialNrEx { get; set; } /// Aux s/n for compound meters, Serial number for iPerl water meter + public virtual string SerialNrAux { get; set; } /// Aux s/n for compound meters, Serial number for iPerl water meter public virtual string PurchaseOrder { get; set; } public virtual int YearOfProduction { get; set; } public virtual int WMPosition { get; set; } @@ -20,7 +20,8 @@ namespace Results.Entities public virtual double QFall { get; set; } ///![m3/h] detected Q_fall of a composed meter public virtual bool Passed { get; set; } #if IPERLST - public virtual double OrigCalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! + public virtual int SerialNrEx { get; set; } /// Aux s/n for compound meters, Serial number for iPerl water meter + public virtual double OrigCalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! public virtual double CalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! public virtual double Q2ErrWOCorrection { get; set; } public virtual bool Q2CorrectionDone { get; set; } /// true = iPerl Q2 correction was done diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index 5a9230b08..2f0537271 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -12,7 +12,7 @@ namespace Results.Mappings { Id(x => x.Id); Map(x => x.SerialNr); - Map(x => x.SerialNrEx); + Map(x => x.SerialNrAux); Map(x => x.PurchaseOrder); Map(x => x.YearOfProduction); Map(x => x.WMPosition); @@ -22,6 +22,7 @@ namespace Results.Mappings Map(x => x.QFall); Map(x => x.Passed); #if IPERLST + Map(x => x.SerialNrEx); Map(x => x.OrigCalibFactor); Map(x => x.CalibFactor); Map(x => x.Q2ErrWOCorrection); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 913078b0d..983c666ea 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/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.1.172.0")] -[assembly: AssemblyFileVersion("2.1.172.0")] +[assembly: AssemblyVersion("2.1.180.0")] +[assembly: AssemblyFileVersion("2.1.180.0")] diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 321c5c30d..c44288ee6 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.1.172.0")] -[assembly: AssemblyFileVersion("2.1.172.0")] +[assembly: AssemblyVersion("2.1.180.0")] +[assembly: AssemblyFileVersion("2.1.180.0")] diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 668ec40cc..17bdce644 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -564,7 +564,7 @@ namespace TBF.BenchControl.DB.SensusOracle } - int SaveOrUpdateWM(Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung) + void SaveOrUpdateWM(Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung) { int sekundaere_Adr = wm.Passed ? 1 : 0; @@ -651,7 +651,7 @@ namespace TBF.BenchControl.DB.SensusOracle parm = new OracleParameter("DIFF2HZ8HZ", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:6 parm = new OracleParameter("WITHQ2CORRECTION", OracleDbType.Int32); parm.Value = wm.Q2CorrectionDone ? 1 : 0; cmd.Parameters.Add(parm); ///:7 parm = new OracleParameter("ERRQ2", OracleDbType.Double); parm.Value = wm.Q2ErrWOCorrection; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Q2CORRECTIONFLOWRIGHT", OracleDbType.Int32);parm.Value = Q2CorrFlowRight;/*1=right to left*/ cmd.Parameters.Add(parm); ///:9 + parm = new OracleParameter("Q2CORRECTIONFLOWRIGHT", OracleDbType.Int32);parm.Value = wm.Q2CorrFlowRight;/*1=right to left*/ cmd.Parameters.Add(parm); ///:9 parm = new OracleParameter("Q2CORRECTIONLEFT", OracleDbType.Int32); parm.Value = (int)Math.Round(wm.Q2Correction); cmd.Parameters.Add(parm); ///:10 parm = new OracleParameter("Q2CORRECTIONRIGHT", OracleDbType.Int32); parm.Value = (int)Math.Round(wm.Q2Correction / 2); cmd.Parameters.Add(parm); ///:11 diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs index 5a5e2db49..4847ea790 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs @@ -201,7 +201,7 @@ namespace TBF.BenchControl.DataEntry.Combined if (waterMeters[i] != null) { serialNr[2 * i] = waterMeters[i].SerialNr = dlg.MainSNText[i]; - serialNr[2 * i + 1] = waterMeters[i].SerialNrEx = dlg.AuxSNText[i]; + serialNr[2 * i + 1] = waterMeters[i].SerialNrAux = dlg.AuxSNText[i]; disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i]; } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs index 401141a03..aaf98baec 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs @@ -143,11 +143,11 @@ namespace TBF.BenchControl.DataEntry.Munich if (modelessDlg is CycleBeginningForm) { if (wMeters.Length >= 1 && wMeters[0] != null) wMeters[0].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[0]; - if (wMeters.Length >= 1 && wMeters[0] != null) wMeters[0].SerialNrEx = (modelessDlg as CycleBeginningForm).AuxSNText[0]; + if (wMeters.Length >= 1 && wMeters[0] != null) wMeters[0].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[0]; if (wMeters.Length >= 2 && wMeters[1] != null) wMeters[1].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[1]; - if (wMeters.Length >= 2 && wMeters[1] != null) wMeters[1].SerialNrEx = (modelessDlg as CycleBeginningForm).AuxSNText[1]; + if (wMeters.Length >= 2 && wMeters[1] != null) wMeters[1].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[1]; if (wMeters.Length >= 3 && wMeters[2] != null) wMeters[2].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[2]; - if (wMeters.Length >= 3 && wMeters[2] != null) wMeters[2].SerialNrEx = (modelessDlg as CycleBeginningForm).AuxSNText[2]; + if (wMeters.Length >= 3 && wMeters[2] != null) wMeters[2].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[2]; } else if (modelessDlg is CycleEndForm) { diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs index 44ad974fd..b3fa8868a 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs @@ -159,7 +159,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich if (compound) { PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrEx); + PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux); } lineNr++; diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 150c4647e..59553be34 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -804,7 +804,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(mtrRslt.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske) sb.Append(";"); sb.Append(mtrRslt.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK #if IPERLST - sb.Append(";"); sb.Append(mtrRslt.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika + sb.Append(";"); sb.Append(mtrRslt.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika #else sb.Append(";"); sb.Append(" "); /// nechat prazdne #endif @@ -829,7 +829,7 @@ namespace TBF.BenchControl.Sequences sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); break; case CompoundMeterId.CompoundAux: - sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNrEx); + sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNrAux); break; case CompoundMeterId.Compound: sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 03044c270..5af9b82ed 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -286,8 +286,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime; iPerl.VolumeLtrRef = meterRslt.VolumeRef; #if IPERLST - meterRslt.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; - meterRslt.Q2Correction = iPerl.CurrentQ2Correction; + meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; + meterRslt.WaterMeter.Q2Correction = iPerl.CurrentQ2Correction; #endif iPerl.LastTestResult = meterRslt; /// Save this water meter test result to iPerl WM iPerl.NominalTestFlow = 500.0 * (test.Qfrom + test.Qto); /// Ave. + convert to liter/hour diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 239f0447c..7ef5e657c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -474,8 +474,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime; iPerl.VolumeLtrRef = meterRslt.VolumeRef; #if IPERLST - meterRslt.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; - meterRslt.Q2Correction = iPerl.CurrentQ2Correction; + meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; + meterRslt.WaterMeter.Q2Correction = iPerl.CurrentQ2Correction; #endif iPerl.LastTestResult = meterRslt; /// Save this water meter test result to iPerl WM iPerl.NominalTestFlow = 500.0 * (double)(test.Qfrom + test.Qto); /// Ave. + convert to liter/hour diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs index 1985d1ae1..18bf4ee8f 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.IO; using System.IO.Ports; using System.Threading; +using System.Windows.Forms; using log4net; using Config.Entities; using TBF.BenchControl; @@ -529,6 +530,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl void SaveOptoData() { string directory = "C:\\TBF\\ProcessData\\"; /// TODO: determine correct relative path + try + { Directory.CreateDirectory(directory); directory += (StateMachine.CycleStartYY + "\\"); Directory.CreateDirectory(directory); @@ -545,6 +548,12 @@ namespace TBF.BenchControl.WaterMeters.iPerl for (int i = 1; i < optoDataCount; i++) optoLogFile.WriteLine(optoData[i].ToString(scalFact, optoData[i - 1])); optoLogFile.Close(); } + } + catch (Exception exc) + { + MessageBox.Show(string.Format("Chyba pri zapisovani do suboru:\r\n{0}\\{1}\r\n{2}", directory, optoDataLogFileName, exc.Message), + "Chyba", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + } } void ReadPulses() diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 299ce203c..4e3b01da9 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.172.1")] -[assembly: AssemblyFileVersion("2.1.172.1")] +[assembly: AssemblyVersion("2.1.180.1")] +[assembly: AssemblyFileVersion("2.1.180.1")]