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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs
+2 -2
View File
@@ -44,9 +44,9 @@ namespace TBF.Rig.DataEntry.Combined
/// Default constructor - Default number of compound water meters
/// </summary>
public CycleBeginningForm()
: this (Config.Data.CompoundWMsCount, false)
: this (Common.Data.CompoundWMsCount, false)
{
this.WaterMetersCount = Config.Data.CompoundWMsCount;
this.WaterMetersCount = Common.Data.CompoundWMsCount;
}
/// <summary>
TBF/Rig/DataEntry/Combined/CycleEndForm.cs
+8 -8
View File
@@ -35,10 +35,10 @@ namespace TBF.Rig.DataEntry.Combined
InitializeComponent();
ControlBox = false;
MainStateText = new string[Config.Data.CompoundWMsCount];
AuxStateText = new string[Config.Data.CompoundWMsCount];
QRise = new float[Config.Data.CompoundWMsCount];
QFall = new float[Config.Data.CompoundWMsCount];
MainStateText = new string[Common.Data.CompoundWMsCount];
AuxStateText = new string[Common.Data.CompoundWMsCount];
QRise = new float[Common.Data.CompoundWMsCount];
QFall = new float[Common.Data.CompoundWMsCount];
completed = false;
StartForceCloseHandler();
@@ -77,7 +77,7 @@ namespace TBF.Rig.DataEntry.Combined
qRise1TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3);
qFall1TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3);
if (Config.Data.CompoundWMsCount >= 2)
if (Common.Data.CompoundWMsCount >= 2)
{
qRise2TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3);
qFall2TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3);
@@ -88,7 +88,7 @@ namespace TBF.Rig.DataEntry.Combined
Height = 305;
}
if (Config.Data.CompoundWMsCount >= 3)
if (Common.Data.CompoundWMsCount >= 3)
{
qRise3TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3);
qFall3TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3);
@@ -109,7 +109,7 @@ namespace TBF.Rig.DataEntry.Combined
if (Utils.TryParseUFloat(qRise1TextBox.Text, out ftmp)) { QRise[0] = ftmp; } else { allOK = false; }
if (Utils.TryParseUFloat(qFall1TextBox.Text, out ftmp)) { QFall[0] = ftmp; } else { allOK = false; }
if (Config.Data.CompoundWMsCount >= 2)
if (Common.Data.CompoundWMsCount >= 2)
{
MainStateText[1] = mainState2TextBox.Text;
AuxStateText[1] = auxState2TextBox.Text;
@@ -117,7 +117,7 @@ namespace TBF.Rig.DataEntry.Combined
if (Utils.TryParseUFloat(qFall2TextBox.Text, out ftmp)) { QFall[1] = ftmp; } else { allOK = false; }
}
if (Config.Data.CompoundWMsCount >= 3)
if (Common.Data.CompoundWMsCount >= 3)
{
MainStateText[2] = mainState3TextBox.Text;
AuxStateText[2] = auxState3TextBox.Text;
TBF/Rig/DataEntry/Combined/EntryForm.cs
+11 -11
View File
@@ -71,11 +71,11 @@ namespace TBF.Rig.DataEntry.Combined
public override void Initialize()
{
disabled = new bool[Config.Data.CompoundWMsCount];
wmStartState = new double[Config.Data.CompoundWMsCount * 2];
wmStartStateStr = new string[Config.Data.CompoundWMsCount * 2];
wmEndState = new double[Config.Data.CompoundWMsCount * 2];
wmCycleEndState = new string[Config.Data.CompoundWMsCount * 2];
disabled = new bool[Common.Data.CompoundWMsCount];
wmStartState = new double[Common.Data.CompoundWMsCount * 2];
wmStartStateStr = new string[Common.Data.CompoundWMsCount * 2];
wmEndState = new double[Common.Data.CompoundWMsCount * 2];
wmCycleEndState = new string[Common.Data.CompoundWMsCount * 2];
currentOp = CurrentOp.None;
}
@@ -126,7 +126,7 @@ namespace TBF.Rig.DataEntry.Combined
///
void OpenBeginningDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleBeginningForm(Config.Data.CompoundWMsCount, myRef.entryFormCfg.RemarkEnabled);
myRef.modelessDlg = new CycleBeginningForm(Common.Data.CompoundWMsCount, myRef.entryFormCfg.RemarkEnabled);
modelessDlg.Show();
}
///
@@ -139,20 +139,20 @@ namespace TBF.Rig.DataEntry.Combined
///
void OpenTestStartStatesDlg(EntryForm myRef)
{
myRef.modelessDlg = new TestStartEndForm(Config.Data.CompoundWMsCount, myRef.regReaders, myRef.disabled);
myRef.modelessDlg = new TestStartEndForm(Common.Data.CompoundWMsCount, myRef.regReaders, myRef.disabled);
modelessDlg.Show();
}
///
void OpenTestEndStatesDlg(EntryForm myRef)
{
string[] mainStartStateStr = new string[Config.Data.CompoundWMsCount];
string[] auxStartStateStr = new string[Config.Data.CompoundWMsCount];
for (int i = 0; i < Config.Data.CompoundWMsCount; i++)
string[] mainStartStateStr = new string[Common.Data.CompoundWMsCount];
string[] auxStartStateStr = new string[Common.Data.CompoundWMsCount];
for (int i = 0; i < Common.Data.CompoundWMsCount; i++)
{
mainStartStateStr[i] = wmStartStateStr[2 * i];
auxStartStateStr[i] = wmStartStateStr[2 * i + 1];
}
myRef.modelessDlg = new TestStartEndForm(Config.Data.CompoundWMsCount, myRef.regReaders, mainStartStateStr, auxStartStateStr, disabled, refVolume, errLimLo, errLimHi);
myRef.modelessDlg = new TestStartEndForm(Common.Data.CompoundWMsCount, myRef.regReaders, mainStartStateStr, auxStartStateStr, disabled, refVolume, errLimLo, errLimHi);
modelessDlg.Show();
}
TBF/Rig/DataEntry/Combined/EntryFormCfgCtrl.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;
TBF/Rig/DataEntry/Combined/TestStartEndForm.cs
+2 -2
View File
@@ -136,9 +136,9 @@ namespace TBF.Rig.DataEntry.Combined
/// </summary>
void ShuffleTextBoxes()
{
if (Config.Data.CompoundWMsCount < TextBoxesCount)
if (Common.Data.CompoundWMsCount < TextBoxesCount)
{
TextBoxesCount = Config.Data.CompoundWMsCount;
TextBoxesCount = Common.Data.CompoundWMsCount;
}
}