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/Standard48/CycleBeginningForm.cs
+1 -1
View File
@@ -81,7 +81,7 @@ namespace TBF.Rig.DataEntry.Standard48
SNText = new string[WaterMetersCount];
Disabled = new bool[WaterMetersCount];
ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize);
ShuffleTextBoxes(Common.Data.WMsCount, Common.Data.LineSize);
//Height = 147 + WaterMetersCount * 90;
}
TBF/Rig/DataEntry/Standard48/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/Standard48/EntryFormNoStartEnd.cs
+9 -9
View File
@@ -71,11 +71,11 @@ namespace TBF.Rig.DataEntry.Standard48
public override void Initialize()
{
disabled = new bool[Config.Data.WMsCount];
wmStartState = new double[Config.Data.WMsCount];
wmStartStateStr = new string[Config.Data.WMsCount];
wmEndState = new double[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
disabled = new bool[Common.Data.WMsCount];
wmStartState = new double[Common.Data.WMsCount];
wmStartStateStr = new string[Common.Data.WMsCount];
wmEndState = new double[Common.Data.WMsCount];
wmCycleEndState = new string[Common.Data.WMsCount];
currentOp = CurrentOp.None;
}
@@ -126,25 +126,25 @@ namespace TBF.Rig.DataEntry.Standard48
///
void OpenBeginningDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new CycleBeginningForm(Config.Data.WMsCount);
myRef.modelessDlg = new CycleBeginningForm(Common.Data.WMsCount);
modelessDlg.Show();
}
///
void OpenEndDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new CycleEndForm(Config.Data.WMsCount);
myRef.modelessDlg = new CycleEndForm(Common.Data.WMsCount);
modelessDlg.Show();
}
///
void OpenTestStartStatesDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new TestStartEndForm(Config.Data.WMsCount, myRef.regReaders, disabled);
myRef.modelessDlg = new TestStartEndForm(Common.Data.WMsCount, myRef.regReaders, disabled);
modelessDlg.Show();
}
///
void OpenTestEndStatesDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new TestStartEndForm(Config.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
myRef.modelessDlg = new TestStartEndForm(Common.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
modelessDlg.Show();
}
TBF/Rig/DataEntry/Standard48/TestStartEndForm.cs
+6 -6
View File
@@ -160,18 +160,18 @@ namespace TBF.Rig.DataEntry.Standard48
{
if (TextBoxesCount > WaterMetersCount)
{
int nrLines = WaterMetersCount / Config.Data.LineSize;
int nrLines = WaterMetersCount / Common.Data.LineSize;
int gap = (TextBoxesCount - WaterMetersCount) / nrLines;
int dest = 0;
for (int l = 0; l < nrLines; l++)
{
for (int i = 0; i < Config.Data.LineSize; i++)
for (int i = 0; i < Common.Data.LineSize; i++)
{
labels[dest] = labels[l * Config.Data.LineSize + l * gap + i];
startTextBoxes[dest] = startTextBoxes[l * Config.Data.LineSize + l * gap + i];
endTextBoxes[dest] = endTextBoxes[l * Config.Data.LineSize + l * gap + i];
exclamations[dest] = exclamations[l * Config.Data.LineSize + l * gap + i];
labels[dest] = labels[l * Common.Data.LineSize + l * gap + i];
startTextBoxes[dest] = startTextBoxes[l * Common.Data.LineSize + l * gap + i];
endTextBoxes[dest] = endTextBoxes[l * Common.Data.LineSize + l * gap + i];
exclamations[dest] = exclamations[l * Common.Data.LineSize + l * gap + i];
dest++;
}
}