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

Common.Data --> TBF.Data and TBF.DB

Browse Source
This commit is contained in:
Milan Hanajik
2021-09-19 14:44:55 +02:00
parent 709636e82b
commit a0aea713b0
86 changed files with 473 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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[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];
disabled = new bool[TBF.Data.CompoundWMsCount];
wmStartState = new double[TBF.Data.CompoundWMsCount * 2];
wmStartStateStr = new string[TBF.Data.CompoundWMsCount * 2];
wmEndState = new double[TBF.Data.CompoundWMsCount * 2];
wmCycleEndState = new string[TBF.Data.CompoundWMsCount * 2];
currentOp = CurrentOp.None;
}
@@ -126,7 +126,7 @@ namespace TBF.Rig.DataEntry.Combined
///
void OpenBeginningDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleBeginningForm(Common.Data.CompoundWMsCount, myRef.entryFormCfg.RemarkEnabled);
myRef.modelessDlg = new CycleBeginningForm(TBF.Data.CompoundWMsCount, myRef.entryFormCfg.RemarkEnabled);
modelessDlg.Show();
}
///
@@ -139,20 +139,20 @@ namespace TBF.Rig.DataEntry.Combined
///
void OpenTestStartStatesDlg(EntryForm myRef)
{
myRef.modelessDlg = new TestStartEndForm(Common.Data.CompoundWMsCount, myRef.regReaders, myRef.disabled);
myRef.modelessDlg = new TestStartEndForm(TBF.Data.CompoundWMsCount, myRef.regReaders, myRef.disabled);
modelessDlg.Show();
}
///
void OpenTestEndStatesDlg(EntryForm myRef)
{
string[] mainStartStateStr = new string[Common.Data.CompoundWMsCount];
string[] auxStartStateStr = new string[Common.Data.CompoundWMsCount];
for (int i = 0; i < Common.Data.CompoundWMsCount; i++)
string[] mainStartStateStr = new string[TBF.Data.CompoundWMsCount];
string[] auxStartStateStr = new string[TBF.Data.CompoundWMsCount];
for (int i = 0; i < TBF.Data.CompoundWMsCount; i++)
{
mainStartStateStr[i] = wmStartStateStr[2 * i];
auxStartStateStr[i] = wmStartStateStr[2 * i + 1];
}
myRef.modelessDlg = new TestStartEndForm(Common.Data.CompoundWMsCount, myRef.regReaders, mainStartStateStr, auxStartStateStr, disabled, refVolume, errLimLo, errLimHi);
myRef.modelessDlg = new TestStartEndForm(TBF.Data.CompoundWMsCount, myRef.regReaders, mainStartStateStr, auxStartStateStr, disabled, refVolume, errLimLo, errLimHi);
modelessDlg.Show();
}