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

Separate string SerialNrAux and int SerialNrEx in Results. Other fixes. Version 2.1.180

Browse Source
This commit is contained in:
Milan Hanajik
2016-01-08 17:10:05 +01:00
parent b131ba01a8
commit 68c4bf5956
14 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.172.0")] [assembly: AssemblyVersion("2.1.180.0")]
[assembly: AssemblyFileVersion("2.1.172.0")] [assembly: AssemblyFileVersion("2.1.180.0")]
Results/Entities/WaterMeter.cs
+2 -1
View File
@@ -10,7 +10,7 @@ namespace Results.Entities
{ {
public virtual int Id { get; protected set; } 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 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 string PurchaseOrder { get; set; }
public virtual int YearOfProduction { get; set; } public virtual int YearOfProduction { get; set; }
public virtual int WMPosition { get; set; } public virtual int WMPosition { get; set; }
@@ -20,6 +20,7 @@ namespace Results.Entities
public virtual double QFall { get; set; } ///![m3/h] detected Q_fall of a composed meter public virtual double QFall { get; set; } ///![m3/h] detected Q_fall of a composed meter
public virtual bool Passed { get; set; } public virtual bool Passed { get; set; }
#if IPERLST #if IPERLST
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 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 CalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!!
public virtual double Q2ErrWOCorrection { get; set; } public virtual double Q2ErrWOCorrection { get; set; }
Results/Mappings/WaterMeterMap.cs
+2 -1
View File
@@ -12,7 +12,7 @@ namespace Results.Mappings
{ {
Id(x => x.Id); Id(x => x.Id);
Map(x => x.SerialNr); Map(x => x.SerialNr);
Map(x => x.SerialNrEx); Map(x => x.SerialNrAux);
Map(x => x.PurchaseOrder); Map(x => x.PurchaseOrder);
Map(x => x.YearOfProduction); Map(x => x.YearOfProduction);
Map(x => x.WMPosition); Map(x => x.WMPosition);
@@ -22,6 +22,7 @@ namespace Results.Mappings
Map(x => x.QFall); Map(x => x.QFall);
Map(x => x.Passed); Map(x => x.Passed);
#if IPERLST #if IPERLST
Map(x => x.SerialNrEx);
Map(x => x.OrigCalibFactor); Map(x => x.OrigCalibFactor);
Map(x => x.CalibFactor); Map(x => x.CalibFactor);
Map(x => x.Q2ErrWOCorrection); Map(x => x.Q2ErrWOCorrection);
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.172.0")] [assembly: AssemblyVersion("2.1.180.0")]
[assembly: AssemblyFileVersion("2.1.172.0")] [assembly: AssemblyFileVersion("2.1.180.0")]
ResultsBrowser/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.172.0")] [assembly: AssemblyVersion("2.1.180.0")]
[assembly: AssemblyFileVersion("2.1.172.0")] [assembly: AssemblyFileVersion("2.1.180.0")]
TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
+2 -2
View File
@@ -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; 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("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("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("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("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 parm = new OracleParameter("Q2CORRECTIONRIGHT", OracleDbType.Int32); parm.Value = (int)Math.Round(wm.Q2Correction / 2); cmd.Parameters.Add(parm); ///:11
TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs
+1 -1
View File
@@ -201,7 +201,7 @@ namespace TBF.BenchControl.DataEntry.Combined
if (waterMeters[i] != null) if (waterMeters[i] != null)
{ {
serialNr[2 * i] = waterMeters[i].SerialNr = dlg.MainSNText[i]; 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]; disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
} }
} }
TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
+3 -3
View File
@@ -143,11 +143,11 @@ namespace TBF.BenchControl.DataEntry.Munich
if (modelessDlg is CycleBeginningForm) 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].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].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].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) else if (modelessDlg is CycleEndForm)
{ {
TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs
+1 -1
View File
@@ -159,7 +159,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
if (compound) if (compound)
{ {
PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :"); PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrEx); PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
} }
lineNr++; lineNr++;
TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
+2 -2
View File
@@ -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.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 sb.Append(";"); sb.Append(mtrRslt.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK
#if IPERLST #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 #else
sb.Append(";"); sb.Append(" "); /// nechat prazdne sb.Append(";"); sb.Append(" "); /// nechat prazdne
#endif #endif
@@ -829,7 +829,7 @@ namespace TBF.BenchControl.Sequences
sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr);
break; break;
case CompoundMeterId.CompoundAux: case CompoundMeterId.CompoundAux:
sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNrEx); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNrAux);
break; break;
case CompoundMeterId.Compound: case CompoundMeterId.Compound:
sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr);
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+2 -2
View File
@@ -286,8 +286,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime; meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime;
iPerl.VolumeLtrRef = meterRslt.VolumeRef; iPerl.VolumeLtrRef = meterRslt.VolumeRef;
#if IPERLST #if IPERLST
meterRslt.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0;
meterRslt.Q2Correction = iPerl.CurrentQ2Correction; meterRslt.WaterMeter.Q2Correction = iPerl.CurrentQ2Correction;
#endif #endif
iPerl.LastTestResult = meterRslt; /// Save this water meter test result to iPerl WM 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 iPerl.NominalTestFlow = 500.0 * (test.Qfrom + test.Qto); /// Ave. + convert to liter/hour
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+2 -2
View File
@@ -474,8 +474,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime; meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime;
iPerl.VolumeLtrRef = meterRslt.VolumeRef; iPerl.VolumeLtrRef = meterRslt.VolumeRef;
#if IPERLST #if IPERLST
meterRslt.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0;
meterRslt.Q2Correction = iPerl.CurrentQ2Correction; meterRslt.WaterMeter.Q2Correction = iPerl.CurrentQ2Correction;
#endif #endif
iPerl.LastTestResult = meterRslt; /// Save this water meter test result to iPerl WM 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 iPerl.NominalTestFlow = 500.0 * (double)(test.Qfrom + test.Qto); /// Ave. + convert to liter/hour
TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs
+9
View File
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.IO.Ports; using System.IO.Ports;
using System.Threading; using System.Threading;
using System.Windows.Forms;
using log4net; using log4net;
using Config.Entities; using Config.Entities;
using TBF.BenchControl; using TBF.BenchControl;
@@ -529,6 +530,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
void SaveOptoData() void SaveOptoData()
{ {
string directory = "C:\\TBF\\ProcessData\\"; /// TODO: determine correct relative path string directory = "C:\\TBF\\ProcessData\\"; /// TODO: determine correct relative path
try
{
Directory.CreateDirectory(directory); Directory.CreateDirectory(directory);
directory += (StateMachine.CycleStartYY + "\\"); directory += (StateMachine.CycleStartYY + "\\");
Directory.CreateDirectory(directory); Directory.CreateDirectory(directory);
@@ -546,6 +549,12 @@ namespace TBF.BenchControl.WaterMeters.iPerl
optoLogFile.Close(); 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() void ReadPulses()
{ {
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.1.172.1")] [assembly: AssemblyVersion("2.1.180.1")]
[assembly: AssemblyFileVersion("2.1.172.1")] [assembly: AssemblyFileVersion("2.1.180.1")]