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

Correction curve for pressure meters extended for negative pressures, etc., ver. 2.33.2065

Browse Source
This commit is contained in:
Milan Hanajik 2023-06-27 17:40:18 +02:00
parent d2631c8c88
commit 72a8f1dac6
5 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Formulas.cs
View File

@ -214,9 +214,9 @@ namespace Config
/// </summary>
public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
{
if (trueVolume <= float.Epsilon)
if (-float.Epsilon <= trueVolume && trueVolume <= float.Epsilon)
{
if (measuredVolume <= float.Epsilon)
if (-float.Epsilon <= measuredVolume && measuredVolume <= float.Epsilon)
{
log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
return -100.0;

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.33.2064.0")]
[assembly: AssemblyFileVersion("2.33.2064.0")]
[assembly: AssemblyVersion("2.33.2065.0")]
[assembly: AssemblyFileVersion("2.33.2065.0")]

3
TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs
View File

@ -194,8 +194,9 @@ namespace TBF.UI.Bench.Metrology
double correction; /// Correction in default unit
double error = 0;
if (subItem == 1 && Utils.TryParseEDouble(strValue, out oriMeasurement) && (measurement = Units.ConvertFrom(currentUnit, oriMeasurement)) >= 0)
if (subItem == 1 && Utils.TryParseEDouble(strValue, out oriMeasurement))
{
measurement = Units.ConvertFrom(currentUnit, oriMeasurement);
(item.Tag as MeasurementCorrection).Measurement = measurement;
/// Update error (if possible)

3
TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs
View File

@ -140,6 +140,8 @@ namespace TBF.UI.Bench.TestProfiles
{
base.OkBtnClicked();
if (session != null && session.IsOpen)
{
using (ITransaction transaction = session.BeginTransaction())
{
try
@ -164,6 +166,7 @@ namespace TBF.UI.Bench.TestProfiles
MessageBox.Show(Strings.Cannot_save_changes, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
}
}
SaveUISettings();

3
TBF/UI/Procedures/ProceduresCtrl.cs
View File

@ -267,6 +267,8 @@ namespace TBF.UI.Procedures
/// Update the entities and save them to the database
/// </summary>
public void OkBtnClicked()
{
if (Session != null && Session.IsOpen)
{
using (ITransaction transaction = Session.BeginTransaction())
{
@ -292,6 +294,7 @@ namespace TBF.UI.Procedures
MessageBox.Show(Strings.Cannot_save_changes, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
}
}
SaveUISettings();