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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
+10 -9
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using TBF.Resources;
@@ -51,9 +52,9 @@ namespace TBF.UI.Bench.Metrology
Localize();
/// Panel1
densityLabel.Text = string.Format("{0} [{1}]", Strings.Density, Config.Unit.kgpm3.ToDescription());
temperatureLabel.Text = string.Format("{0} [{1}]", Strings.At_temperature, Config.Unit.C.ToDescription());
densityCorrLabel.Text = string.Format("{0} [{1}]", Strings.Density_correction, Config.Unit.kgpm3.ToDescription());
densityLabel.Text = string.Format("{0} [{1}]", Strings.Density, Unit.kgpm3.ToDescription());
temperatureLabel.Text = string.Format("{0} [{1}]", Strings.At_temperature, Unit.C.ToDescription());
densityCorrLabel.Text = string.Format("{0} [{1}]", Strings.Density_correction, Unit.kgpm3.ToDescription());
/// Panel2
@@ -72,9 +73,9 @@ namespace TBF.UI.Bench.Metrology
{
if (DensityCfg != null)
{
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");
densityTextBox.Text = Common.Data.SampleDensity.ToString("F4");
temperatureTextBox.Text = Common.Data.SampleTemp.ToString("F2");
densityCorrTextBox.Text = Formulas.DensityCorrection(Common.Data.SampleDensity, Common.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;
@@ -99,8 +100,8 @@ namespace TBF.UI.Bench.Metrology
double sampleDensity = Utils.ParseUDouble(densityTextBox.Text);
double sampleTemp = Utils.ParseUDouble(temperatureTextBox.Text);
Config.Data.SampleDensity = DensityCfg.SampleDensity = sampleDensity;
Config.Data.SampleTemp = DensityCfg.SampleTemp = sampleTemp;
Common.Data.SampleDensity = DensityCfg.SampleDensity = sampleDensity;
Common.Data.SampleTemp = DensityCfg.SampleTemp = sampleTemp;
DensityCfg.CalibCertificateNr = calibCertificateNrTextBox.Text;
DensityCfg.CalibDate = calibDateTimePicker.Value.Date;
@@ -151,7 +152,7 @@ namespace TBF.UI.Bench.Metrology
if (Utils.TryParseUDouble(densityTextBox.Text, out density) &&
Utils.TryParseUDouble(temperatureTextBox.Text, out temp))
{
densityCorrTextBox.Text = Config.Formulas.DensityCorrection(density, temp).ToString();
densityCorrTextBox.Text = Formulas.DensityCorrection(density, temp).ToString();
}
}