Common.Data --> TBF.Data and TBF.DB
This commit is contained in:
@@ -83,14 +83,14 @@ namespace TBF.Rig.DataEntry.HeatMeters6
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
disabled = new bool[Common.Data.HeatMetersCount];
|
||||
wmStartState = new double[Common.Data.HeatMetersCount];
|
||||
wmStartStateStr = new string[Common.Data.HeatMetersCount];
|
||||
wmEndState = new double[Common.Data.HeatMetersCount];
|
||||
energyStartState = new double[Common.Data.HeatMetersCount];
|
||||
energyStartStateStr = new string[Common.Data.HeatMetersCount];
|
||||
energyEndState = new double[Common.Data.HeatMetersCount];
|
||||
wmCycleEndState = new string[Common.Data.HeatMetersCount];
|
||||
disabled = new bool[TBF.Data.HeatMetersCount];
|
||||
wmStartState = new double[TBF.Data.HeatMetersCount];
|
||||
wmStartStateStr = new string[TBF.Data.HeatMetersCount];
|
||||
wmEndState = new double[TBF.Data.HeatMetersCount];
|
||||
energyStartState = new double[TBF.Data.HeatMetersCount];
|
||||
energyStartStateStr = new string[TBF.Data.HeatMetersCount];
|
||||
energyEndState = new double[TBF.Data.HeatMetersCount];
|
||||
wmCycleEndState = new string[TBF.Data.HeatMetersCount];
|
||||
currentOp = CurrentOp.None;
|
||||
}
|
||||
|
||||
@@ -244,7 +244,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
|
||||
else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd)
|
||||
{
|
||||
CycleEndForm dlg = (modelessDlg as CycleEndForm);
|
||||
int count = Math.Min(waterMeters.Count, Common.Data.HeatMetersCount);
|
||||
int count = Math.Min(waterMeters.Count, TBF.Data.HeatMetersCount);
|
||||
if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
@@ -262,7 +262,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
|
||||
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
|
||||
if (dlg != null)
|
||||
{
|
||||
for (int i = 0; i < Math.Min(waterMeters.Count, Common.Data.HeatMetersCount); i++)
|
||||
for (int i = 0; i < Math.Min(waterMeters.Count, TBF.Data.HeatMetersCount); i++)
|
||||
{
|
||||
wmStartState[i] = dlg.WMStartState[i];
|
||||
wmStartStateStr[i] = dlg.WMStartStateStr[i];
|
||||
@@ -277,7 +277,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
|
||||
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
|
||||
if (dlg != null)
|
||||
{
|
||||
for (int i = 0; i < Math.Min(waterMeters.Count, Common.Data.HeatMetersCount); i++)
|
||||
for (int i = 0; i < Math.Min(waterMeters.Count, TBF.Data.HeatMetersCount); i++)
|
||||
{
|
||||
wmEndState[i] = dlg.WMEndState[i];
|
||||
energyEndState[i] = dlg.EnergyEndState[i];
|
||||
|
||||
Reference in New Issue
Block a user