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

Common.Data --> TBF.Data and TBF.DB

Browse Source
This commit is contained in:
Milan Hanajik
2021-09-19 14:44:55 +02:00
parent 709636e82b
commit a0aea713b0
86 changed files with 473 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Process/ProcessTabPageExCtrl.cs
+6 -6
View File
@@ -172,7 +172,7 @@ namespace TBF.UI.Process
}
else if (metersKind == MetersKind.Combined)
{
for (int z = 0; z < Common.Data.CompoundWMsCount; z++)
for (int z = 0; z < TBF.Data.CompoundWMsCount; z++)
{
ListViewItem lvi = new ListViewItem(string.Format("{0} {1}", Strings.Compound_meter_0, z + 1));
lvi.SubItems.Add(string.Empty); /// sensor
@@ -244,7 +244,7 @@ namespace TBF.UI.Process
}
else if (currentMetersKind == MetersKind.Combined)
{
for (int z = 0; z < Math.Min(Common.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
for (int z = 0; z < Math.Min(TBF.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
{
metersListView.Items[3 * z + 1].SubItems[(int)Columns.Sensor].Text = "---";
metersListView.Items[3 * z + 2].SubItems[(int)Columns.Sensor].Text = "---";
@@ -309,7 +309,7 @@ namespace TBF.UI.Process
}
else if (currentMetersKind == MetersKind.Combined)
{
for (int z = 0; z < Math.Min(Common.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
for (int z = 0; z < Math.Min(TBF.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
{
/// Compound
metersListView.Items[3 * z].SubItems[(int)Columns.RefPulses].Text = "---";
@@ -400,7 +400,7 @@ namespace TBF.UI.Process
}
else if (currentMetersKind == MetersKind.Combined)
{
for (int z = 0; z < Math.Min(Common.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
for (int z = 0; z < Math.Min(TBF.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
{
metersListView.Items[3 * z + 1].SubItems[(int)Columns.Sensor].Text
= ((args.MetersPath.RegisterReaders != null) && (args.MetersPath.RegisterReaders.Length > 2 * z) && (args.MetersPath.RegisterReaders[2 * z] != null))
@@ -485,7 +485,7 @@ namespace TBF.UI.Process
}
else if (currentMetersKind == MetersKind.Combined)
{
for (int z = 0; z < Math.Min(Common.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
for (int z = 0; z < Math.Min(TBF.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
{
Rig.GenericDevices.IRegReader rrMain = (ProcessData.RegisterReaders.Length > 2 * z) ? ProcessData.RegisterReaders[2 * z] : null;
Rig.GenericDevices.IRegReader rrAux = (ProcessData.RegisterReaders.Length > 2 * z + 1) ? ProcessData.RegisterReaders[2 * z + 1] : null;
@@ -602,7 +602,7 @@ namespace TBF.UI.Process
///
/// Test results for compond meters
///
for (int z = 0; z < Math.Min(Common.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
for (int z = 0; z < Math.Min(TBF.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
{
WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[z];
if (wm == null && !wm.Disabled) continue;