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

Database cleanup, columns correctly renamed, DataContainer namespace, etc.

Browse Source
This commit is contained in:
Milan Hanajik
2021-02-24 17:42:50 +01:00
parent a9d6fa631c
commit b5f8d06e5b
91 changed files with 390 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
+8 -8
View File
@@ -28,7 +28,7 @@ namespace TBF.UI.Bench.Metrology
/// <summary>
/// Density configuration
/// </summary>
public BenchControl.DataContainers.Density.ComponentCfg DensityCfg;
public BenchControl.DataContainer.Density.ComponentCfg DensityCfg;
/// <summary>
/// A list of 'measurement-correction' pairs to be deleted from the database on OK.
@@ -84,9 +84,9 @@ namespace TBF.UI.Bench.Metrology
{
if (DensityCfg != null)
{
densityTextBox.Text = Config.Data.RealDensity.ToString("F4");
temperatureTextBox.Text = Config.Data.AtTemperature.ToString("F2");
densityCorrTextBox.Text = Config.Formulas.DensityCorrection(Config.Data.RealDensity, Config.Data.AtTemperature).ToString("F5");
densityTextBox.Text = Config.Data.SampleDensity.ToString("F4");
temperatureTextBox.Text = Config.Data.SampleTemp.ToString("F2");
densityCorrTextBox.Text = Config.Formulas.DensityCorrection(Config.Data.SampleDensity, Config.Data.SampleTemp).ToString("F5");
calibCertificateNrTextBox.Text = DensityCfg.CalibCertificateNr;
calibDateTimePicker.Value = (DensityCfg.CalibDate < Constants.MinDate) ? Constants.MinDate : DensityCfg.CalibDate;
calibExpirationDateTimePicker.Value = (DensityCfg.CalibValidDate < Constants.MinDate) ? Constants.MinDate : DensityCfg.CalibValidDate;
@@ -110,11 +110,11 @@ namespace TBF.UI.Bench.Metrology
{
try
{
double realDensity = Utils.ParseUDouble(densityTextBox.Text);
double atTemperature = Utils.ParseUDouble(temperatureTextBox.Text);
double sampleDensity = Utils.ParseUDouble(densityTextBox.Text);
double sampleTemp = Utils.ParseUDouble(temperatureTextBox.Text);
Config.Data.RealDensity = DensityCfg.RealDensity = realDensity;
Config.Data.AtTemperature = DensityCfg.AtTemperature = atTemperature;
Config.Data.SampleDensity = DensityCfg.SampleDensity = sampleDensity;
Config.Data.SampleTemp = DensityCfg.SampleTemp = sampleTemp;
DensityCfg.CalibCertificateNr = calibCertificateNrTextBox.Text;
DensityCfg.CalibDate = calibDateTimePicker.Value.Date;