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/Uncertainties/UncertaintiesDlg.cs
+4 -3
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Windows.Forms;
using NHibernate;
using log4net;
using Common;
using Config.Entities;
using TBF.Rig;
using TBF.Resources;
@@ -27,9 +28,9 @@ namespace TBF.UI.Bench.Uncertainties
/// SharedDlgButtons configuration
#if KEMPNO_50
sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.MetrologicalAuthority };
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority };
#else
sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
sharedButtons.Unlocked += unlockButton_Click;
@@ -54,7 +55,7 @@ namespace TBF.UI.Bench.Uncertainties
int tempMetersCount = 0;
int evaporationsCount = 0;
session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
session = Config.FluentCommon.CreateSession(DBKind.Config);
cmpntEntities = session.QueryOver<Component>()
.OrderBy(x => x. ItemNr).Asc
.List();
TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
@@ -90,7 +91,7 @@ namespace TBF.UI.Bench.Uncertainties
foreach (var uncrtnty in MeterEntity.Uncertainties) AddOneLVI(uncrtnty);
}
void AddOneLVI(Uncertainty corr)
void AddOneLVI(IUncertainty corr)
{
int nr = listViewEx.Items.Count + 1;
ListViewItem lvi = new ListViewItem(nr.ToString());
TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
@@ -85,7 +86,7 @@ namespace TBF.UI.Bench.Uncertainties
foreach (var uncrtnty in MeterEntity.Uncertainties) AddOneLVI(uncrtnty);
}
void AddOneLVI(Uncertainty corr)
void AddOneLVI(IUncertainty corr)
{
int nr = listViewEx.Items.Count + 1;
ListViewItem lvi = new ListViewItem(nr.ToString());
TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
@@ -91,7 +92,7 @@ namespace TBF.UI.Bench.Uncertainties
foreach (var uncrtnty in MeterEntity.Uncertainties) AddOneLVI(uncrtnty);
}
void AddOneLVI(Uncertainty corr)
void AddOneLVI(IUncertainty corr)
{
int nr = listViewEx.Items.Count + 1;
ListViewItem lvi = new ListViewItem(nr.ToString());
TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using Results.Forms;
using TBF.Resources;
@@ -85,7 +86,7 @@ namespace TBF.UI.Bench.Uncertainties
foreach (var uncrtnty in MeterEntity.Uncertainties) AddOneLVI(uncrtnty);
}
void AddOneLVI(Uncertainty corr)
void AddOneLVI(IUncertainty corr)
{
int nr = listViewEx.Items.Count + 1;
ListViewItem lvi = new ListViewItem(nr.ToString());