Changes for Xylem Nanjing, ver. 3.1.1676

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
+7 -6
View File
@@ -5,6 +5,7 @@ using System;
using System.Drawing;
using System.Windows.Forms;
using System.Collections.Generic;
using Common;
namespace Results.Forms
{
@@ -92,7 +93,7 @@ namespace Results.Forms
/// Update background color
string message = string.Empty;
Update(wMtr.GetColorOfResults(false, out message));
UpdateBkColor(wMtr.GetColorOfResults(false, out message));
/// Update caption
#if ORACLE_DB
@@ -101,7 +102,7 @@ namespace Results.Forms
tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
#endif
Update(wMtr.WMPosition);
UpdateWMPos(wMtr.WMPosition);
/// Update test results
IList<string> testNames = wMtr.GetAllDecoratedTestNames();
@@ -109,8 +110,8 @@ namespace Results.Forms
lView.Items.Clear();
foreach (var mtr in wMtr.MeterTestRslts)
{
if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
&& mtr.Publish() != Config.Entities.Publish.Internal)
if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never
&& mtr.Publish() != Publish.Internal)
{
ListViewItem lvi = new ListViewItem(testNames[ix++]);
@@ -149,7 +150,7 @@ namespace Results.Forms
/// Private
///
void Update(int wmPosition)
void UpdateWMPos(int wmPosition)
{
this.wmPosition = wmPosition;
if (lView.Columns.Count > 0)
@@ -158,7 +159,7 @@ namespace Results.Forms
}
}
void Update(Color backColor)
void UpdateBkColor(Color backColor)
{
if (this.bkColor != backColor)
{