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/ResultsMI/PreviousResultsDlg.cs
+1 -1
View File
@@ -249,7 +249,7 @@ namespace TBF.UI.ResultsMI
IList<WMeterRsltItemSpec> items = null;
foreach (var wm in b.WaterMeters)
{
if (wm != null)
if (!wm.Disabled && wm.WaterMeterData != null)
{
if (wm.WaterMeterData.Compound)
{
TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
+17 -17
View File
@@ -327,11 +327,11 @@ namespace TBF.UI.ResultsMI
///
void OnDoubleClick(object sender, WaterMeterEventArgs args)
{
int waterMetersCount = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters.Length;
int waterMetersCount = TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count;
WaterMeter wm;
if ((args.WMPosition <= 0) || (args.WMPosition > waterMetersCount) ||
((wm = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters[args.WMPosition - 1]) == null))
((wm = TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters[args.WMPosition - 1]) == null))
{
MessageBox.Show(Strings.No_water_meter);
return;
@@ -384,7 +384,7 @@ namespace TBF.UI.ResultsMI
bool IsLayoutChangedDueToData(BatchResults results)
{
if (results == null || results.WaterMeters == null || results.WaterMeters.Length == 0)
if (results == null || results.Batch == null || results.Batch.WaterMeters == null || results.Batch.WaterMeters.Count == 0)
{
/// 'results' contain no water meters, wmRsltsCtrl.Lenght == 0 expected
return (wmRsltsCtrl.Length != 0); /// true when there are currently water meters on screen
@@ -394,11 +394,11 @@ namespace TBF.UI.ResultsMI
/// Determine water meter positions count
///
int displayedWatermetersCount = 0;
for (int i = 0; i < results.WaterMeters.Length; i++)
for (int i = 0; i < results.Batch.WaterMeters.Count; i++)
{
if (results.WaterMeters[i] != null)
if (results.Batch.WaterMeters[i] != null)
{
if (ShowDisabledPositions || !results.WaterMeters[i].Disabled)
if (ShowDisabledPositions || !results.Batch.WaterMeters[i].Disabled)
{
displayedWatermetersCount++;
}
@@ -428,11 +428,11 @@ namespace TBF.UI.ResultsMI
/// Determine water meter positions count
///
int displayedControlsCount = 0;
for (int i = 0; i < results.WaterMeters.Length; i++)
for (int i = 0; i < results.Batch.WaterMeters.Count; i++)
{
if (results.WaterMeters[i] != null)
if (results.Batch.WaterMeters[i] != null)
{
if (ShowDisabledPositions || !results.WaterMeters[i].Disabled)
if (ShowDisabledPositions || !results.Batch.WaterMeters[i].Disabled)
{
displayedControlsCount++;
}
@@ -473,11 +473,11 @@ namespace TBF.UI.ResultsMI
wmRsltsCtrl = new IOneWMResultsCtrl[displayedControlsCount];
int ix = 0;
firstEnabledControl = null;
for (int i = 0; i < results.WaterMeters.Length; i++)
for (int i = 0; i < results.Batch.WaterMeters.Count; i++)
{
if (results.WaterMeters[i] != null)
if (results.Batch.WaterMeters[i] != null)
{
if (!results.WaterMeters[i].Disabled || ShowDisabledPositions)
if (!results.Batch.WaterMeters[i].Disabled || ShowDisabledPositions)
{
/// Create one water meter position / control
wmRsltsCtrl[ix] = (TestsArrangement == TestsArrangement.Rows)
@@ -489,7 +489,7 @@ namespace TBF.UI.ResultsMI
wmRsltsCtrl[ix].WMResultsClickedHandler += HandleDoubleClick;
flowLayoutPanel.Controls.Add(wmRsltsCtrl[ix] as UserControl);
if ((firstEnabledControl == null) && !results.WaterMeters[i].Disabled) firstEnabledControl = wmRsltsCtrl[ix];
if ((firstEnabledControl == null) && !results.Batch.WaterMeters[i].Disabled) firstEnabledControl = wmRsltsCtrl[ix];
ix++;
}
}
@@ -530,14 +530,14 @@ namespace TBF.UI.ResultsMI
void UpdateResults(BatchResults batchResults)
{
if ((batchResults != null) && (batchResults.WaterMeters != null))
if (batchResults != null && batchResults.Batch != null && batchResults.Batch.WaterMeters != null)
{
int ctrlIx = 0;
for (int i = 0; i < batchResults.WaterMeters.Length; i++)
for (int i = 0; i < batchResults.Batch.WaterMeters.Count; i++)
{
if (!batchResults.WaterMeters[i].Disabled || ShowDisabledPositions)
if (!batchResults.Batch.WaterMeters[i].Disabled || ShowDisabledPositions)
{
if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(batchResults.WaterMeters[i]);
if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(batchResults.Batch.WaterMeters[i]);
}
}
}