Common.Data --> TBF.Data and TBF.DB
This commit is contained in:
@@ -343,7 +343,7 @@ namespace TBF.UI.Process
|
||||
passed3Label.Text = "---";
|
||||
}
|
||||
|
||||
if (Common.Data.WMsCount >= 4)
|
||||
if (TBF.Data.WMsCount >= 4)
|
||||
{
|
||||
pulses4Label.Text = "---";
|
||||
refPulses4Label.Text = "---";
|
||||
@@ -510,7 +510,7 @@ namespace TBF.UI.Process
|
||||
}
|
||||
else if (currentMetersKind == MetersKind.Combined)
|
||||
{
|
||||
for (int compMtr = 0; compMtr < Common.Data.CompoundWMsCount; compMtr++)
|
||||
for (int compMtr = 0; compMtr < TBF.Data.CompoundWMsCount; compMtr++)
|
||||
{
|
||||
int end = Math.Min(2 * compMtr + 2, Math.Min(textBoxesCount, ProcessData.RegisterReaders.Length));
|
||||
|
||||
@@ -597,12 +597,12 @@ namespace TBF.UI.Process
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int compMtr = 0; compMtr < Common.Data.CompoundWMsCount; compMtr++)
|
||||
for (int compMtr = 0; compMtr < TBF.Data.CompoundWMsCount; compMtr++)
|
||||
{
|
||||
WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[compMtr];
|
||||
if (wm == null && !wm.Disabled) continue;
|
||||
|
||||
int end = Math.Min(textBoxesCount, Common.Data.WMsCount);
|
||||
int end = Math.Min(textBoxesCount, TBF.Data.WMsCount);
|
||||
|
||||
MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain);
|
||||
if ((mtrMain != null) && (2 * compMtr < end))
|
||||
|
||||
Reference in New Issue
Block a user