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

Bug fixes in MetrologyDlgDensityTab and MetrologyDlgBuoyancyTab.

Browse Source
This commit is contained in:
Milan Hanajik
2021-08-26 13:19:53 +02:00
parent 3e674b972a
commit 6809c75613
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
+13 -9
View File
@@ -32,6 +32,7 @@ namespace TBF.UI.Bench.Metrology
public IList<MeasurementCorrection> ToBeRemoved { get; set; }
MetrologyDlg parent;
bool valuesModified;
public MetrologyDlgDensityTab()
{
@@ -41,6 +42,7 @@ namespace TBF.UI.Bench.Metrology
calibExpirationDateTimePicker.CustomFormat = Constants.DateFormat;
calibExpirationDateTimePicker.MinDate = Constants.MinDate;
ToBeRemoved = new List<MeasurementCorrection>();
valuesModified = false;
}
private void MetrologyDlgDensityTab_Load(object sender, System.EventArgs e)
@@ -73,9 +75,9 @@ namespace TBF.UI.Bench.Metrology
{
if (DensityCfg != null)
{
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");
densityTextBox.Text = DensityCfg.SampleDensity.ToString();
temperatureTextBox.Text = DensityCfg.SampleTemp.ToString();
densityCorrTextBox.Text = Formulas.DensityCorrection(DensityCfg.SampleDensity, DensityCfg.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;
@@ -97,11 +99,11 @@ namespace TBF.UI.Bench.Metrology
{
try
{
double sampleDensity = Utils.ParseUDouble(densityTextBox.Text);
double sampleTemp = Utils.ParseUDouble(temperatureTextBox.Text);
Common.Data.SampleDensity = DensityCfg.SampleDensity = sampleDensity;
Common.Data.SampleTemp = DensityCfg.SampleTemp = sampleTemp;
if (valuesModified)
{
Data.SampleDensity = DensityCfg.SampleDensity = Utils.ParseUDouble(densityTextBox.Text);
Data.SampleTemp = DensityCfg.SampleTemp = Utils.ParseUDouble(temperatureTextBox.Text);
}
DensityCfg.CalibCertificateNr = calibCertificateNrTextBox.Text;
DensityCfg.CalibDate = calibDateTimePicker.Value.Date;
@@ -138,12 +140,14 @@ namespace TBF.UI.Bench.Metrology
private void densityTextBox_TextChanged(object sender, EventArgs e)
{
UpdateDensityCorrectionDisplay();
valuesModified = true;
}
private void temperatureTextBox_TextChanged(object sender, EventArgs e)
{
UpdateDensityCorrectionDisplay();
}
valuesModified = true;
}
void UpdateDensityCorrectionDisplay()
{