Clean-up after comparing 2.27 and 3.1 branches, ver. 3.1.1861

This commit is contained in:
Milan Hanajik
2022-01-28 14:43:42 +01:00
parent 2a97a8f584
commit ecc92176f3
25 changed files with 467 additions and 350 deletions
+1 -1
View File
@@ -51,12 +51,12 @@ namespace TBF.Rig.DataContainer.BenchInfo
: base(cfg)
{
myCfg = cfg as ComponentCfg;
log.Warn(this.ToString());
}
public override void Initialize()
{
SharedDatabase.EventsDB.SetBenchName(myCfg.TestBenchName);
log.FatalFormat("{0} initialized: {1}", Name, this);
}
}
}
@@ -51,24 +51,9 @@ namespace TBF.Rig.DataContainer.iPerlBenchInfo
public ProcedureSelection Source4; /// 24
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
@@ -112,6 +97,10 @@ namespace TBF.Rig.DataContainer.iPerlBenchInfo
Source2 = ProcedureSelection.FromLocalDB;
Source3 = ProcedureSelection.None;
Source4 = ProcedureSelection.None;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}
string[] paramNames = new string[]