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)

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

@ -140,28 +140,31 @@ namespace TBF.UI.Bench.TestProfiles
{
base.OkBtnClicked();
using (ITransaction transaction = session.BeginTransaction())
if (session != null && session.IsOpen)
{
try
using (ITransaction transaction = session.BeginTransaction())
{
foreach (var entity in ToBeRemovedItems) session.Delete(entity);
ToBeRemovedItems.Clear();
int itemNr = 0;
foreach (var entity in MyItems)
try
{
(entity as Profile).ItemNr = itemNr++;
session.SaveOrUpdate(entity);
}
foreach (var entity in ToBeRemovedItems) session.Delete(entity);
ToBeRemovedItems.Clear();
transaction.Commit();
session.Flush();
}
catch (Exception exc)
{
transaction.Rollback();
log.ErrorFormat("Cannot save changes to DB: {0}", exc.Message);
MessageBox.Show(Strings.Cannot_save_changes, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
int itemNr = 0;
foreach (var entity in MyItems)
{
(entity as Profile).ItemNr = itemNr++;
session.SaveOrUpdate(entity);
}
transaction.Commit();
session.Flush();
}
catch (Exception exc)
{
transaction.Rollback();
log.ErrorFormat("Cannot save changes to DB: {0}", exc.Message);
MessageBox.Show(Strings.Cannot_save_changes, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
}
}

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

@ -268,28 +268,31 @@ namespace TBF.UI.Procedures
/// </summary>
public void OkBtnClicked()
{
using (ITransaction transaction = Session.BeginTransaction())
if (Session != null && Session.IsOpen)
{
try
using (ITransaction transaction = Session.BeginTransaction())
{
foreach (var entity in ToBeRemovedProcedures) Session.Delete(entity);
ToBeRemovedProcedures.Clear();
int itemNr = 0;
foreach (var proc in AllProcedures)
try
{
(proc as Procedure).ItemNr = itemNr++;
Session.SaveOrUpdate(proc);
}
foreach (var entity in ToBeRemovedProcedures) Session.Delete(entity);
ToBeRemovedProcedures.Clear();
transaction.Commit();
Session.Flush();
}
catch (Exception exc)
{
transaction.Rollback();
log.ErrorFormat("Cannot save changes to DB: {0}", exc.Message);
MessageBox.Show(Strings.Cannot_save_changes, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
int itemNr = 0;
foreach (var proc in AllProcedures)
{
(proc as Procedure).ItemNr = itemNr++;
Session.SaveOrUpdate(proc);
}
transaction.Commit();
Session.Flush();
}
catch (Exception exc)
{
transaction.Rollback();
log.ErrorFormat("Cannot save changes to DB: {0}", exc.Message);
MessageBox.Show(Strings.Cannot_save_changes, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
}
}