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

RealDensity, AtTemperature, Buoyancy are stored in Results DB in Batch table.

Browse Source
This commit is contained in:
Milan Hanajik
2021-01-28 13:55:27 +01:00
parent 4609abe6ea
commit 0fa8057324
9 changed files with 45 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/DataContainers/Buoyancy/Component.cs
-3
View File
@@ -32,9 +32,6 @@ namespace TBF.BenchControl.DataContainers.Buoyancy
/// This is to use data in formulas
Config.Data.Buoyancy = Buoyancy;
/// This is to have data in reports
Results.WMeterRsltItemSpec.Buoyancy = Buoyancy;
log.Warn(this.ToString());
}
TBF/BenchControl/DataContainers/Density/Component.cs
-4
View File
@@ -34,10 +34,6 @@ namespace TBF.BenchControl.DataContainers.Density
Config.Data.RealDensity = RealDensity;
Config.Data.AtTemperature = AtTemperature;
/// This is to have data in reports
Results.WMeterRsltItemSpec.RealDensity = RealDensity;
Results.WMeterRsltItemSpec.AtTemperature = AtTemperature;
log.Warn(this.ToString());
}
TBF/BenchControl/Sequences/MainSeqUtils.cs
+3 -2
View File
@@ -636,8 +636,9 @@ namespace TBF.BenchControl.Sequences
StateMachine.Procedure,
waterMeterData,
waterMeterParts,
Config.Formulas.DensityCorrection(Config.Formulas.RealDensity(),
Config.Formulas.AtTemperature()));
Config.Formulas.RealDensity(),
Config.Formulas.AtTemperature(),
Config.Formulas.Buoyancy());
}
/// <summary>
TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs
+1 -2
View File
@@ -84,8 +84,7 @@ namespace TBF.UI.Bench.Metrology
{
double buoyancy = Utils.ParseUDouble(buoyancyTextBox.Text);
Results.WMeterRsltItemSpec.Buoyancy =
Config.Data.Buoyancy = BuoyancyCfg.Buoyancy = buoyancy;
Config.Data.Buoyancy = BuoyancyCfg.Buoyancy = buoyancy;
Component modified = BuoyancyCfg.CreateDbEntity();
MeterEntity.Parameters = modified.Parameters;
TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
+3 -5
View File
@@ -113,11 +113,9 @@ namespace TBF.UI.Bench.Metrology
double realDensity = Utils.ParseUDouble(densityTextBox.Text);
double atTemperature = Utils.ParseUDouble(temperatureTextBox.Text);
Results.WMeterRsltItemSpec.RealDensity =
Config.Data.RealDensity = DensityCfg.RealDensity = realDensity;
Results.WMeterRsltItemSpec.AtTemperature =
Config.Data.AtTemperature = DensityCfg.AtTemperature = atTemperature;
Config.Data.RealDensity = DensityCfg.RealDensity = realDensity;
Config.Data.AtTemperature = DensityCfg.AtTemperature = atTemperature;
DensityCfg.CalibCertificateNr = calibCertificateNrTextBox.Text;
DensityCfg.CalibDate = calibDateTimePicker.Value.Date;
DensityCfg.CalibValidDate = calibExpirationDateTimePicker.Value.Date;