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

BatchResults.WaterMeters eliminated, Batch.WaterMeters are used instead ... many changes

Browse Source
This commit is contained in:
Milan Hanajik
2020-02-05 10:33:32 +01:00
parent 51523ea577
commit dc31e833ee
58 changed files with 574 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Process/ProcessTabPageCtrl24.cs
+4 -4
View File
@@ -546,10 +546,10 @@ namespace TBF.UI.Process
if (!tRes.Batch.Compound)
{
for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.BatchRslts.WaterMeters.Length); i++)
for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.BatchRslts.Batch.WaterMeters.Count); i++)
{
WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i];
MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null;
WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[i];
MeterTestRslt mtr = (wm != null && !wm.Disabled) ? wm.GetMeterTestRslt(args.TestName) : null;
if (mtr != null)
{
@@ -565,7 +565,7 @@ namespace TBF.UI.Process
{
for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++)
{
WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr];
WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[compMtr];
if (wm == null) continue;
int end = Math.Min(textBoxesCount, Config.Data.WMsCount);