Changes for Xylem Nanjing, ver. 3.1.1676
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user