DataContainer components clean-up.

This commit is contained in:
Milan Hanajik
2021-04-02 20:25:31 +02:00
parent 1bc3e5d6eb
commit ce0b8af4a0
6 changed files with 42 additions and 38 deletions
@@ -19,19 +19,20 @@ namespace TBF.Rig.DataContainer.BackupAndSecurityOptions
public int MinPasswdLength { get { return myCfg.MinPasswdLength; } }
public int PasswdExpirationPeriodDays { get { return myCfg.PasswdExpirationPeriodDays; } }
public Component()
{
}
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
{
myCfg = cfg as ComponentCfg;
log.Warn(this.ToString());
}
public override void Initialize()
{
Users.GlobalData.MinPasswdLength = myCfg.MinPasswdLength;
Users.GlobalData.PasswdExpirationPeriodDays = myCfg.PasswdExpirationPeriodDays;
log.Warn(this.ToString());
}
}
}
+7 -5
View File
@@ -30,17 +30,19 @@ namespace TBF.Rig.DataContainer.BenchInfo
public string Address5 { get { return myCfg.Address5; } }
public RemoteDBUse RemoteDBUse { get { return myCfg.RemoteDBUse; } }
public Component()
{
}
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
{
myCfg = cfg as ComponentCfg;
Events.DB.SetBenchName(myCfg.TestBenchName);
log.Warn(this.ToString());
}
public override void Initialize()
{
Events.DB.SetBenchName(myCfg.TestBenchName);
}
}
}
+8 -7
View File
@@ -20,21 +20,22 @@ namespace TBF.Rig.DataContainer.Buoyancy
public double Buoyancy { get { return myCfg.Buoyancy; } }
public Component()
{
}
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
{
myCfg = cfg as ComponentCfg;
/// This is to use data in formulas
Config.Data.Buoyancy = Buoyancy;
log.Warn(this.ToString());
}
public override void Initialize()
{
Config.Data.Buoyancy = Buoyancy; /// This is to use Buoyancy from this component in formulas
}
public IList<Config.CalendarEvent.ICalendarEvent> GetCalendarEvents()
{
DateTime calibrationDue = myCfg.CalibValidDate;
+10 -8
View File
@@ -21,22 +21,24 @@ namespace TBF.Rig.DataContainer.Density
public double SampleDensity { get { return myCfg.SampleDensity; } }
public double SampleTemp { get { return myCfg.SampleTemp; } }
public Component()
{
}
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
{
myCfg = cfg as ComponentCfg;
/// This is to use data in formulas
Config.Data.SampleDensity = SampleDensity;
Config.Data.SampleTemp = SampleTemp;
log.Warn(this.ToString());
}
public override void Initialize()
{
/// This is to use sample density and temp. from this component in formulas
Config.Data.SampleDensity = SampleDensity;
Config.Data.SampleTemp = SampleTemp;
}
public IList<Config.CalendarEvent.ICalendarEvent> GetCalendarEvents()
{
DateTime calibrationDue = myCfg.CalibValidDate;
@@ -13,14 +13,10 @@ namespace TBF.Rig.DataContainer.Evaporation
public class Component : ComponentBase, IEvaporation, GenericDevices.IHasCalendarEvents
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString()
{
return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
}
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly EvaporationCfg myCfg;
/// <summary>
/// For a given temperature in [°C] returns an evaporation rate in [kg/s]
/// </summary>
@@ -30,9 +26,7 @@ namespace TBF.Rig.DataContainer.Evaporation
}
public Component()
{
}
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
@@ -41,6 +35,7 @@ namespace TBF.Rig.DataContainer.Evaporation
log.Warn(this.ToString());
}
public IList<Config.CalendarEvent.ICalendarEvent> GetCalendarEvents()
{
DateTime calibrationDue = myCfg.CalibValidDate;
@@ -18,7 +18,7 @@ namespace TBF.Rig.DataContainer.iPerlBenchInfo
public class Component : ComponentBase, GenericDevices.IBenchInfo, GenericDevices.IHasCalendarEvents
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("BenchInfo.iPerl({0})", Cfg.ToString(-1)); }
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly ComponentCfg myCfg;
@@ -33,18 +33,21 @@ namespace TBF.Rig.DataContainer.iPerlBenchInfo
public Side Side { get { return myCfg.Side; } }
public int MaxTestIndex { get { return myCfg.MaxTestIndex; } } /// (MaxPruefindex % 100) value when to reject water meters completely if they are NOK
public Component()
{
}
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
{
myCfg = cfg as ComponentCfg;
Events.DB.SetBenchName(myCfg.TestBenchName);
log.Warn(this.ToString());
}
public override void Initialize()
{
Events.DB.SetBenchName(myCfg.TestBenchName);
}
public IList<Config.CalendarEvent.ICalendarEvent> GetCalendarEvents()
{