diff --git a/Config/Data.cs b/Config/Data.cs index 5bfcb9d74..1779a080e 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -111,8 +111,8 @@ namespace Config /// public static DatabaseSettings CurrentBench; - public static double RealDensity = 0; /// true water density [kg/m3] - public static double AtTemperature = 0; /// measured at temperature [°C] + public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3] + public static double SampleTemp = 0; /// sample temperature when density measured in an accredited labo [°C] public static double Buoyancy = 0; } } diff --git a/Config/Entities/BenchPath.cs b/Config/Entities/BenchPath.cs index 8572a10d9..dd359adfa 100644 --- a/Config/Entities/BenchPath.cs +++ b/Config/Entities/BenchPath.cs @@ -14,6 +14,7 @@ namespace Config.Entities public virtual string OriName { get; set; } /// Not mapped to database public virtual float Qfrom { get; set; } /// Water flow in [m3/h] public virtual float Qto { get; set; } /// Water flow in [m3/h] + public virtual string Selector { get; set; } public virtual string TempMtrUp { get; set; } public virtual string TempMtrDown { get; set; } public virtual string PressMtrUp { get; set; } @@ -46,7 +47,8 @@ namespace Config.Entities result.Qfrom = Qfrom; result.Qto = Qto; - result.TempMtrUp = TempMtrUp; + result.Selector = Selector; + result.TempMtrUp = TempMtrUp; result.TempMtrDown = TempMtrDown; result.PressMtrUp = PressMtrUp; result.PressMtrDown = PressMtrDown; diff --git a/Config/Entities/Component.cs b/Config/Entities/Component.cs index 165bd8acb..8088b9407 100644 --- a/Config/Entities/Component.cs +++ b/Config/Entities/Component.cs @@ -13,9 +13,9 @@ namespace Config.Entities public virtual int ItemNr { get; set; } public virtual string Name { get; set; } public virtual string ClassName { get; set; } - public virtual string ParentName { get; set; } - public virtual DebugMode Mode { get; set; } - public virtual LogLevel Logging { get; set; } + public virtual string Parent { get; set; } + public virtual DebugMode DebugMode { get; set; } + public virtual LogLevel LogLevel { get; set; } public virtual string Parameters { get; set; } public virtual IList Corrections { get; set; } public virtual IList Uncertainties { get; set; } @@ -37,9 +37,9 @@ namespace Config.Entities result.ItemNr = itemNr; result.Name = name; result.ClassName = className; - result.ParentName = parentName; - result.Mode = debugLevel; - result.Logging = logLevel; + result.Parent = parentName; + result.DebugMode = debugLevel; + result.LogLevel = logLevel; result.Parameters = parameters; return result; } @@ -51,9 +51,9 @@ namespace Config.Entities result.ItemNr = ItemNr; result.Name = Name; result.ClassName = ClassName; - result.ParentName = ParentName; - result.Mode = Mode; - result.Logging = Logging; + result.Parent = Parent; + result.DebugMode = DebugMode; + result.LogLevel = LogLevel; result.Parameters = Parameters; return result; } @@ -62,9 +62,9 @@ namespace Config.Entities { output.WriteLine(Name); output.WriteLine(ClassName); - output.WriteLine(ParentName); - output.WriteLine(Mode.ToString()); - output.WriteLine(Logging.ToString()); + output.WriteLine(Parent); + output.WriteLine(DebugMode.ToString()); + output.WriteLine(LogLevel.ToString()); output.Write(Parameters); output.Close(); @@ -76,28 +76,28 @@ namespace Config.Entities result.Name = input.ReadLine(); result.ClassName = input.ReadLine(); - result.ParentName = input.ReadLine(); + result.Parent = input.ReadLine(); string line = input.ReadLine(); - if (line.Equals(DebugMode.DetectedOff.ToString())) result.Mode = DebugMode.DetectedOff; - else if (line.Equals(DebugMode.DetectedOn.ToString())) result.Mode = DebugMode.DetectedOn; - else if (line.Equals(DebugMode.Normal.ToString())) result.Mode = DebugMode.Normal; - else if (line.Equals(DebugMode.AutoDetect.ToString())) result.Mode = DebugMode.AutoDetect; - else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation; - else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off; - else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record; - else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply; - else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate; - else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit; + if (line.Equals(DebugMode.DetectedOff.ToString())) result.DebugMode = DebugMode.DetectedOff; + else if (line.Equals(DebugMode.DetectedOn.ToString())) result.DebugMode = DebugMode.DetectedOn; + else if (line.Equals(DebugMode.Normal.ToString())) result.DebugMode = DebugMode.Normal; + else if (line.Equals(DebugMode.AutoDetect.ToString())) result.DebugMode = DebugMode.AutoDetect; + else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.DebugMode = DebugMode.FailureDuringOperation; + else if (line.Equals(DebugMode.Off.ToString())) result.DebugMode = DebugMode.Off; + else if (line.Equals(DebugMode.Record.ToString())) result.DebugMode = DebugMode.Record; + else if (line.Equals(DebugMode.Reply.ToString())) result.DebugMode = DebugMode.Reply; + else if (line.Equals(DebugMode.Simulate.ToString())) result.DebugMode = DebugMode.Simulate; + else if (line.Equals(DebugMode.Inherit.ToString())) result.DebugMode = DebugMode.Inherit; line = input.ReadLine(); - if (line.Equals(LogLevel.Off.ToString())) result.Logging = LogLevel.Off; - else if (line.Equals(LogLevel.Fatal.ToString())) result.Logging = LogLevel.Fatal; - else if (line.Equals(LogLevel.Error.ToString())) result.Logging = LogLevel.Error; - else if (line.Equals(LogLevel.Warn.ToString())) result.Logging = LogLevel.Warn; - else if (line.Equals(LogLevel.Info.ToString())) result.Logging = LogLevel.Info; - else if (line.Equals(LogLevel.Debug.ToString())) result.Logging = LogLevel.Debug; - else if (line.Equals(LogLevel.All.ToString())) result.Logging = LogLevel.All; + if (line.Equals(LogLevel.Off.ToString())) result.LogLevel = LogLevel.Off; + else if (line.Equals(LogLevel.Fatal.ToString())) result.LogLevel = LogLevel.Fatal; + else if (line.Equals(LogLevel.Error.ToString())) result.LogLevel = LogLevel.Error; + else if (line.Equals(LogLevel.Warn.ToString())) result.LogLevel = LogLevel.Warn; + else if (line.Equals(LogLevel.Info.ToString())) result.LogLevel = LogLevel.Info; + else if (line.Equals(LogLevel.Debug.ToString())) result.LogLevel = LogLevel.Debug; + else if (line.Equals(LogLevel.All.ToString())) result.LogLevel = LogLevel.All; result.Parameters = string.Empty; line = input.ReadLine(); @@ -118,12 +118,12 @@ namespace Config.Entities result += indent + "ItemNr = " + (ItemNr + 1).ToString() + Environment.NewLine; result += indent + "Name = " + Name + Environment.NewLine; result += indent + "ClassName = " + ClassName + Environment.NewLine; - if (ParentName != null) + if (Parent != null) { - result += indent + "ParentName = " + ParentName + Environment.NewLine; + result += indent + "ParentName = " + Parent + Environment.NewLine; } - result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine; - result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine; + result += indent + "DebugLevel = " + DebugMode.ToString() + Environment.NewLine; + result += indent + "LogLevel = " + LogLevel.ToString() + Environment.NewLine; result += indent + "Parameters = " + Parameters + Environment.NewLine; return result; diff --git a/Config/Entities/FeedingPath.cs b/Config/Entities/FeedingPath.cs index dac4a6d59..6d80b055c 100644 --- a/Config/Entities/FeedingPath.cs +++ b/Config/Entities/FeedingPath.cs @@ -14,8 +14,9 @@ namespace Config.Entities public virtual string OriName { get; set; } /// Not mapped to database public virtual float Qfrom { get; set; } /// Water flow in [m3/h] public virtual float Qto { get; set; } /// Water flow in [m3/h] + public virtual string Selector { get; set; } public virtual string Pump { get; set; } - public virtual string RegulValvesPct { get; set; } /// Positions of regulation valves in % separated by ';' + public virtual string RegVPositions { get; set; } /// Positions of regulation valves in % separated by ';' /// Valves public virtual string ValvesOpen { get; set; } @@ -40,12 +41,13 @@ namespace Config.Entities { FeedingPath result = new FeedingPath(name, itemNr); - result.Qfrom = Qfrom; - result.Qto = Qto; - result.Pump = Pump; - result.RegulValvesPct = RegulValvesPct; - result.ValvesOpen = ValvesOpen; - result.ValvesClose = ValvesClose; + result.Qfrom = Qfrom; + result.Qto = Qto; + result.Selector = Selector; + result.Pump = Pump; + result.RegVPositions = RegVPositions; + result.ValvesOpen = ValvesOpen; + result.ValvesClose = ValvesClose; return result; } diff --git a/Config/Entities/OutputPath.cs b/Config/Entities/OutputPath.cs index 8b375f3b5..58f12ef58 100644 --- a/Config/Entities/OutputPath.cs +++ b/Config/Entities/OutputPath.cs @@ -14,14 +14,14 @@ namespace Config.Entities public virtual string OriName { get; set; } /// Not mapped to database public virtual float Qfrom { get; set; } /// Water flow in [m3/h] public virtual float Qto { get; set; } /// Water flow in [m3/h] - public virtual string RegulValve { get; set; } + public virtual string Selector { get; set; } + public virtual string RegValve { get; set; } public virtual string FlowMeter { get; set; } public virtual float PidCoef { get; set; } /// PID coefficient for the regulation path public virtual string StartValve { get; set; } public virtual string Diverter { get; set; } - public virtual string TempDiv { get; set; } + public virtual string TempMtrDiv { get; set; } public virtual string Scale { get; set; } - public virtual string EmptyTankValve { get; set; } /// Not used anywhere /// Valves public virtual string ValvesOpen { get; set; } @@ -46,18 +46,18 @@ namespace Config.Entities { OutputPath result = new OutputPath(name, itemNr); - result.Name = Name; - result.Qfrom = Qfrom; - result.Qto = Qto; - result.RegulValve = RegulValve; - result.FlowMeter = FlowMeter; - result.PidCoef = PidCoef; - result.StartValve = StartValve; - result.Diverter = Diverter; - result.TempDiv = TempDiv; - result.Scale = Scale; - result.EmptyTankValve = EmptyTankValve; - result.ValvesOpen = ValvesOpen; + result.Name = Name; + result.Qfrom = Qfrom; + result.Qto = Qto; + result.Selector = Selector; + result.RegValve = RegValve; + result.FlowMeter = FlowMeter; + result.PidCoef = PidCoef; + result.StartValve = StartValve; + result.Diverter = Diverter; + result.TempMtrDiv = TempMtrDiv; + result.Scale = Scale; + result.ValvesOpen = ValvesOpen; result.ValvesClose = ValvesClose; return result; diff --git a/Config/Entities/Test.cs b/Config/Entities/Test.cs index 7112d5c7d..bc2dc9864 100644 --- a/Config/Entities/Test.cs +++ b/Config/Entities/Test.cs @@ -25,7 +25,7 @@ namespace Config.Entities public virtual float Qfrom { get; set; } /// Water flow low limit in [m3/h] public virtual float Qto { get; set; } /// Water flow high limit in [m3/h] public virtual float Volume { get; set; } /// Test volume (target) in [l] - public virtual float TstTime { get; set; } /// Test time (estimate) in [s] + public virtual float TestTime { get; set; } /// Test time (estimate) in [s] public virtual string Method { get; set; } public virtual float ErrLimLo { get; set; } /// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3 public virtual float ErrLimHi { get; set; } /// in [%] usually > 0, in case of heat meters: -Qn in m3/h @@ -44,8 +44,7 @@ namespace Config.Entities public virtual int TimeFlow2Mass { get; set; } /// Delay time from the flow stable to the 1st mass measurement in [s] public virtual int TimePump2StartV { get; set; } /// Delay time from the start of the pump to opening the start valve in [s] public virtual int TimeStop2Mass { get; set; } /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s] - public virtual double TolerRed { get; set; } /// = Filter - public virtual string RedType { get; set; } + public virtual int ShortPulses { get; set; } /// Short pulses public virtual string FeedingPath { get; set; } public virtual string BenchPath { get; set; } public virtual string OutputPath { get; set; } @@ -53,9 +52,9 @@ namespace Config.Entities #if HEAT_METERS public virtual string HeatMetersPath { get; set; } #endif - public virtual string RelTransBefore { get; set; } - public virtual string RelTransBetween { get; set; } - public virtual string TransitionAfter { get; set; } + public virtual string TransBefore { get; set; } + public virtual string TransBetween { get; set; } + public virtual string TransAfter { get; set; } public virtual bool IsOuterLoopStart { get; set; } /// Not mapped to database public virtual bool IsOuterLoopEnd { get; set; } /// Not mapped to database @@ -89,15 +88,15 @@ namespace Config.Entities PumpPower = 60.0f; /// [%] MassRepeats = 0; /// default MassSpread = 0; /// default - MassMethod = MassMethod.Scale; /// default + MassMethod = MassMethod.Scale; /// default TimeBeforeFlow = 10; /// [s] time before the start of flow control in [s] TimeFlow2Mass = 5; /// [s] time from the flow stable to the 1st mass measurement in [s] TimePump2StartV = 1; /// [s] time from the 1st mass measurement to the test start in [s] TimeStop2Mass = 5; /// [s] between the test end and the final mass measurement - TolerRed = 0; /// = Filter parameter - RelTransBefore = string.Empty; - RelTransBetween = string.Empty; - TransitionAfter = string.Empty; + ShortPulses = 0; /// Short pulses parameter (0 or 1) + TransBefore = string.Empty; + TransBetween = string.Empty; + TransAfter = string.Empty; } public Test(string name, int itemNr, Procedure procedure) @@ -137,7 +136,7 @@ namespace Config.Entities result.Qfrom = Qfrom; result.Qto = Qto; result.Volume = Volume; - result.TstTime = TstTime; + result.TestTime = TestTime; result.Method = Method; result.ErrLimLo = ErrLimLo; result.ErrLimHi = ErrLimHi; @@ -156,8 +155,7 @@ namespace Config.Entities result.TimeFlow2Mass = TimeFlow2Mass; result.TimePump2StartV = TimePump2StartV; result.TimeStop2Mass = TimeStop2Mass; - result.TolerRed = TolerRed; - result.RedType = RedType; + result.ShortPulses = ShortPulses; result.FeedingPath = FeedingPath; result.BenchPath = BenchPath; result.OutputPath = OutputPath; @@ -165,9 +163,9 @@ namespace Config.Entities #if HEAT_METERS result.HeatMetersPath = HeatMetersPath; #endif - result.RelTransBefore = RelTransBefore; - result.RelTransBetween = RelTransBetween; - result.TransitionAfter = TransitionAfter; + result.TransBefore = TransBefore; + result.TransBetween = TransBetween; + result.TransAfter = TransAfter; foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); } return result; @@ -185,7 +183,7 @@ namespace Config.Entities output.WriteLine(Qfrom.ToString(ci)); output.WriteLine(Qto.ToString(ci)); output.WriteLine(Volume.ToString(ci)); - output.WriteLine(TstTime.ToString(ci)); + output.WriteLine(TestTime.ToString(ci)); output.WriteLine(Method); output.WriteLine(ErrLimLo.ToString(ci)); output.WriteLine(ErrLimHi.ToString(ci)); @@ -204,14 +202,15 @@ namespace Config.Entities output.WriteLine(TimeFlow2Mass.ToString(ci)); output.WriteLine(TimePump2StartV.ToString(ci)); output.WriteLine(TimeStop2Mass.ToString(ci)); + output.WriteLine(ShortPulses.ToString(ci)); output.WriteLine(FeedingPath); output.WriteLine(BenchPath); output.WriteLine(OutputPath); output.WriteLine(MetersPath); - output.WriteLine(RelTransBefore); - output.WriteLine(RelTransBetween); + output.WriteLine(TransBefore); + output.WriteLine(TransBetween); output.WriteLine(Profile); - output.WriteLine(TransitionAfter); + output.WriteLine(TransAfter); foreach (var prms in MoreParams) { prms.Export(output); } output.WriteLine(); @@ -236,7 +235,7 @@ namespace Config.Entities tst.Qfrom = float.Parse(input.ReadLine(), ci); tst.Qto = float.Parse(input.ReadLine(), ci); tst.Volume = float.Parse(input.ReadLine(), ci); - tst.TstTime = float.Parse(input.ReadLine(), ci); + tst.TestTime = float.Parse(input.ReadLine(), ci); tst.Method = input.ReadLine(); tst.ErrLimLo = float.Parse(input.ReadLine(), ci); tst.ErrLimHi = float.Parse(input.ReadLine(), ci); @@ -255,17 +254,18 @@ namespace Config.Entities tst.TimeFlow2Mass = int.Parse(input.ReadLine(), ci); tst.TimePump2StartV = int.Parse(input.ReadLine(), ci); tst.TimeStop2Mass = int.Parse(input.ReadLine(), ci); + tst.ShortPulses = int.Parse(input.ReadLine(), ci); tst.FeedingPath = input.ReadLine(); tst.BenchPath = input.ReadLine(); tst.OutputPath = input.ReadLine(); tst.MetersPath = input.ReadLine(); - tst.RelTransBefore = input.ReadLine(); - tst.RelTransBetween = input.ReadLine(); + tst.TransBefore = input.ReadLine(); + tst.TransBetween = input.ReadLine(); string line = input.ReadLine(); tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined; /// UserDefined is the default - tst.TransitionAfter = input.ReadLine(); + tst.TransAfter = input.ReadLine(); while (true) { @@ -298,14 +298,14 @@ namespace Config.Entities ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci)) { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != Qto.ToString(ci)) { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != Volume.ToString(ci)) { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); }; - ln = inp.ReadLine(); if (ln != TstTime.ToString(ci)) { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); }; + ln = inp.ReadLine(); if (ln != TestTime.ToString(ci)) { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != Method) { diff.AppendFormat(fmt, "Method", Method, ln); }; ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci)) { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci)) { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci)) { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != Repeats.ToString(ci)) { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); }; - ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci)) { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); }; - ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci)) { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); }; + ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci)) { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); }; + ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci)) { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString()) { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci)) { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); }; ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci)) { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); }; @@ -321,10 +321,10 @@ namespace Config.Entities ln = inp.ReadLine(); if (ln != BenchPath) { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); }; ln = inp.ReadLine(); if (ln != OutputPath) { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); }; ln = inp.ReadLine(); if (ln != MetersPath) { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); }; - ln = inp.ReadLine(); if (ln != RelTransBefore) { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); }; - ln = inp.ReadLine(); if (ln != RelTransBetween) { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); }; - ln = inp.ReadLine(); if (ln != Profile.ToString()) { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); }; - ln = inp.ReadLine(); if (ln != TransitionAfter) { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); }; + ln = inp.ReadLine(); if (ln != TransBefore) { diff.AppendFormat(fmt, "TransBefore", TransBefore, ln); }; + ln = inp.ReadLine(); if (ln != TransBetween) { diff.AppendFormat(fmt, "TransBetween", TransBetween, ln); }; + ln = inp.ReadLine(); if (ln != Profile.ToString()) { diff.AppendFormat(fmt, "Profile", Profile, ln); }; + ln = inp.ReadLine(); if (ln != TransAfter) { diff.AppendFormat(fmt, "TransAfter", TransAfter, ln); }; return diff.ToString(); } diff --git a/Config/Formulas.cs b/Config/Formulas.cs index 212c03eb0..9205d7956 100644 --- a/Config/Formulas.cs +++ b/Config/Formulas.cs @@ -15,8 +15,8 @@ namespace Config /// /// Wrappers /// - public static double RealDensity() { return Data.RealDensity; } - public static double AtTemperature() { return Data.AtTemperature; } + public static double RealDensity() { return Data.SampleDensity; } + public static double AtTemperature() { return Data.SampleTemp; } public static double Buoyancy() { return Data.Buoyancy; } diff --git a/Config/Mappings/BenchPathMap.cs b/Config/Mappings/BenchPathMap.cs index 8865bdd63..b51b63e55 100644 --- a/Config/Mappings/BenchPathMap.cs +++ b/Config/Mappings/BenchPathMap.cs @@ -15,10 +15,11 @@ namespace Config.Mappings Map(x => x.Name); Map(x => x.Qfrom); Map(x => x.Qto); - Map(x => x.TempMtrUp).Column("TempIn"); - Map(x => x.TempMtrDown).Column("TempOut"); - Map(x => x.PressMtrUp).Column("PressIn"); - Map(x => x.PressMtrDown).Column("PressOut"); + Map(x => x.Selector); + Map(x => x.TempMtrUp); + Map(x => x.TempMtrDown); + Map(x => x.PressMtrUp); + Map(x => x.PressMtrDown); Map(x => x.PressMtrDelta); Map(x => x.StopBFValve); Map(x => x.ValvesOpen) diff --git a/Config/Mappings/ComponentMap.cs b/Config/Mappings/ComponentMap.cs index 263e42682..fd516bb8f 100644 --- a/Config/Mappings/ComponentMap.cs +++ b/Config/Mappings/ComponentMap.cs @@ -13,10 +13,10 @@ namespace Config.Mappings Id(x => x.Id); Map(x => x.Name); Map(x => x.ClassName); - Map(x => x.ParentName); + Map(x => x.Parent); Map(x => x.ItemNr); - Map(x => x.Mode); - Map(x => x.Logging); + Map(x => x.DebugMode); + Map(x => x.LogLevel); Map(x => x.Parameters) .CustomType("StringClob") .CustomSqlType("varchar(8000)"); diff --git a/Config/Mappings/FeedingPathMap.cs b/Config/Mappings/FeedingPathMap.cs index 41ed03e67..b70f21101 100644 --- a/Config/Mappings/FeedingPathMap.cs +++ b/Config/Mappings/FeedingPathMap.cs @@ -15,8 +15,9 @@ namespace Config.Mappings Map(x => x.Name); Map(x => x.Qfrom); Map(x => x.Qto); + Map(x => x.Selector); Map(x => x.Pump); - Map(x => x.RegulValvesPct); + Map(x => x.RegVPositions); Map(x => x.ValvesOpen) .CustomType("StringClob") .CustomSqlType("varchar(8000)"); diff --git a/Config/Mappings/OutputPathMap.cs b/Config/Mappings/OutputPathMap.cs index 1e7ebbe14..049825d11 100644 --- a/Config/Mappings/OutputPathMap.cs +++ b/Config/Mappings/OutputPathMap.cs @@ -15,15 +15,14 @@ namespace Config.Mappings Map(x => x.Name); Map(x => x.Qfrom); Map(x => x.Qto); - Map(x => x.RegulValve); + Map(x => x.Selector); + Map(x => x.RegValve); Map(x => x.FlowMeter); Map(x => x.PidCoef); Map(x => x.StartValve); Map(x => x.Diverter); - Map(x => x.TempDiv); - Map(x => x.Scale) - .Column("Balance"); - Map(x => x.EmptyTankValve); + Map(x => x.TempMtrDiv); + Map(x => x.Scale); Map(x => x.ValvesOpen) .CustomType("StringClob") .CustomSqlType("varchar(8000)"); diff --git a/Config/Mappings/TestMap.cs b/Config/Mappings/TestMap.cs index 78956e81f..ebba9a11b 100644 --- a/Config/Mappings/TestMap.cs +++ b/Config/Mappings/TestMap.cs @@ -16,18 +16,15 @@ namespace Config.Mappings Map(x => x.Part); Map(x => x.Profile); Map(x => x.Publish); - Map(x => x.DoEvaluate) - .Column("Evaluate"); + Map(x => x.DoEvaluate); Map(x => x.Qtg); Map(x => x.Qfrom); Map(x => x.Qto); Map(x => x.Volume); - Map(x => x.TstTime); + Map(x => x.TestTime); Map(x => x.Repeats); - Map(x => x.DoDraining) - .Column("Emptying"); - Map(x => x.DoDrainingAfter) - .Column("Zeroing"); + Map(x => x.DoDraining); + Map(x => x.DoDrainingAfter); Map(x => x.DoControlWaterTemp); Map(x => x.TempLimLo); Map(x => x.TempLimHi); @@ -35,19 +32,16 @@ namespace Config.Mappings Map(x => x.MassRepeats); Map(x => x.MassSpread); Map(x => x.MassMethod) - .CustomType(); + .CustomType(); Map(x => x.TimeBeforeFlow); Map(x => x.TimeFlow2Mass); - Map(x => x.TimePump2StartV) - .Column("TimeMass2Start"); + Map(x => x.TimePump2StartV); Map(x => x.TimeStop2Mass); Map(x => x.Method); Map(x => x.ErrLimLo); Map(x => x.ErrLimHi); Map(x => x.Uncertainty); - Map(x => x.TolerRed) - .Column("TolerRed"); /// ??? - Map(x => x.RedType); + Map(x => x.ShortPulses); Map(x => x.FeedingPath); Map(x => x.BenchPath); Map(x => x.OutputPath); @@ -55,12 +49,9 @@ namespace Config.Mappings #if HEAT_METERS Map(x => x.HeatMetersPath); #endif - Map(x => x.RelTransBefore) - .Column("RelTransBefore"); - Map(x => x.RelTransBetween) - .Column("RelTransBetween"); - Map(x => x.TransitionAfter) - .Column("TransitionAfter"); + Map(x => x.TransBefore); + Map(x => x.TransBetween); + Map(x => x.TransAfter); HasMany(x => x.MoreParams) .Cascade.All(); diff --git a/Config/Mappings/UserMap.cs b/Config/Mappings/UserMap.cs index dc0527a4f..3a5300b9e 100644 --- a/Config/Mappings/UserMap.cs +++ b/Config/Mappings/UserMap.cs @@ -10,14 +10,16 @@ namespace Config.Mappings public UserMap() { Id(x => x.Id); - Map(x => x.UserName).Column("Name"); + Map(x => x.UserName) + .Column("Name"); Map(x => x.Number); Map(x => x.Tag); Map(x => x.Password); Map(x => x.Password2); Map(x => x.Password3); Map(x => x.Password4); - Map(x => x.FullName).Column("Description"); + Map(x => x.FullName) + .Column("Description"); Map(x => x.LastPwChange); HasManyToMany(x => x.Groups) .Cascade.SaveUpdate() diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index 794c05987..bf76d0a9e 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -68,8 +68,8 @@ namespace Results ProcedureRevision = procedure.Revision, ProtocolTitle = string.Empty, StartTime = DateTime.Now, - RealDensity = realDensity, - AtTemperature = atTemperature, + SampleDensity = realDensity, + SampleTemp = atTemperature, Buoyancy = buoyancy, Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined), #if HEAT_METERS diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs index 0f56ae466..67dcebb88 100644 --- a/Results/Entities/Batch.cs +++ b/Results/Entities/Batch.cs @@ -28,8 +28,8 @@ namespace Results.Entities public virtual string WatermetersStr { get; set; } /// CEVAK, not mapped to DB public virtual string ProtocolTitle { get; set; } public virtual string Remark { get; set; } - public virtual double RealDensity { get; set; } /// Density correction in [kg/m3] - public virtual double AtTemperature { get; set; } + public virtual double SampleDensity { get; set; } /// Sample denisty in [kg/m3] + public virtual double SampleTemp { get; set; } /// Sample temperature when density measured [°C] public virtual double Buoyancy { get; set; } public virtual int Counter6 { get; set; } public virtual int Counter7 { get; set; } @@ -117,8 +117,8 @@ namespace Results.Entities ProtocolTitle = string.Empty; ProtocolTitle = string.Empty; Remark = string.Empty; - RealDensity = Config.Data.RealDensity; - AtTemperature = Config.Data.AtTemperature; + SampleDensity = Config.Data.SampleDensity; + SampleTemp = Config.Data.SampleTemp; Buoyancy = Config.Data.Buoyancy; } @@ -285,7 +285,7 @@ namespace Results.Entities return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} RealDensity={10} AtTemperature={11} Buoyancy={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}", BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber, ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision, - ProtocolTitle, Remark, RealDensity, AtTemperature, Buoyancy, + ProtocolTitle, Remark, SampleDensity, SampleTemp, Buoyancy, StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted); } @@ -310,8 +310,8 @@ namespace Results.Entities writer.Write((WatermetersStr != null) ? WatermetersStr : string.Empty); writer.Write((ProtocolTitle != null) ? ProtocolTitle : string.Empty); writer.Write((Remark != null) ? Remark : string.Empty); - writer.Write(RealDensity); - writer.Write(AtTemperature); + writer.Write(SampleDensity); + writer.Write(SampleTemp); writer.Write(Buoyancy); writer.Write(Counter6); writer.Write(Counter7); @@ -377,8 +377,8 @@ namespace Results.Entities WatermetersStr = reader.ReadString(); ProtocolTitle = reader.ReadString(); Remark = reader.ReadString(); - RealDensity = reader.ReadDouble(); - AtTemperature = reader.ReadDouble(); + SampleDensity = reader.ReadDouble(); + SampleTemp = reader.ReadDouble(); Buoyancy = reader.ReadDouble(); Counter6 = reader.ReadInt32(); Counter7 = reader.ReadInt32(); diff --git a/Results/Entities/TestData.cs b/Results/Entities/TestData.cs index 86cb48ce2..7c6955385 100644 --- a/Results/Entities/TestData.cs +++ b/Results/Entities/TestData.cs @@ -47,7 +47,7 @@ namespace Results.Entities Qfrom = (double)test.Qfrom; Qto = (double)test.Qto; TargetVolume = (double)test.Volume; - TargetTime = (double)test.TstTime; + TargetTime = (double)test.TestTime; Method = test.Method; ErrLimLo = (double)test.ErrLimLo; ErrLimHi = (double)test.ErrLimHi; diff --git a/Results/Mappings/BatchMap.cs b/Results/Mappings/BatchMap.cs index 385861e16..cd976f85f 100644 --- a/Results/Mappings/BatchMap.cs +++ b/Results/Mappings/BatchMap.cs @@ -23,9 +23,9 @@ namespace Results.Mappings .CustomType("StringClob") .CustomSqlType("varchar(2000)"); - Map(x => x.RealDensity).Column("Custom1"); - Map(x => x.AtTemperature).Column("Custom2"); - Map(x => x.Buoyancy).Column("Custom3"); + Map(x => x.SampleDensity); + Map(x => x.SampleTemp); + Map(x => x.Buoyancy); Map(x => x.Counter6); Map(x => x.Counter7); diff --git a/Results/Mappings/TestDataMap.cs b/Results/Mappings/TestDataMap.cs index c97d8ef6f..8995aeb7d 100644 --- a/Results/Mappings/TestDataMap.cs +++ b/Results/Mappings/TestDataMap.cs @@ -21,7 +21,7 @@ namespace Results.Mappings Map(x => x.Method); Map(x => x.ErrLimLo); Map(x => x.ErrLimHi); - Map(x => x.ErrLimMargin).Column("Uncertainty"); + Map(x => x.ErrLimMargin); Map(x => x.Publish); Map(x => x.Evaluate); } diff --git a/Results/Mappings/TestRsltMap.cs b/Results/Mappings/TestRsltMap.cs index d7cf3437b..7d0fd2141 100644 --- a/Results/Mappings/TestRsltMap.cs +++ b/Results/Mappings/TestRsltMap.cs @@ -37,7 +37,7 @@ namespace Results.Mappings Map(x => x.MassEndRaw); Map(x => x.MassEnd); Map(x => x.DensityIn); - Map(x => x.DensityLine).Column("DensityOut"); + Map(x => x.DensityLine); Map(x => x.DensityDiv); Map(x => x.Buoyancy); Map(x => x.FlowMass); @@ -52,27 +52,27 @@ namespace Results.Mappings #if HEAT_METERS Map(x => x.RefEnergy); #endif - Map(x => x.AmbTempMean).Column("AmbientTempAve"); + Map(x => x.AmbTempMean); Map(x => x.AmbTempStart); Map(x => x.AmbTempEnd); Map(x => x.AmbTempMin); Map(x => x.AmbTempMax); - Map(x => x.AmbPressMean).Column("AmbientPressAve"); + Map(x => x.AmbPressMean); Map(x => x.AmbPressStart); Map(x => x.AmbPressEnd); Map(x => x.AmbPressMin); Map(x => x.AmbPressMax); - Map(x => x.AmbHumiMean).Column("AmbientHumiAve"); + Map(x => x.AmbHumiMean); Map(x => x.AmbHumiStart); Map(x => x.AmbHumiEnd); Map(x => x.AmbHumiMin); Map(x => x.AmbHumiMax); - Map(x => x.PressUpMean).Column("PressUpAvrg"); + Map(x => x.PressUpMean); Map(x => x.PressUpStart); Map(x => x.PressUpEnd); Map(x => x.PressUpMin); Map(x => x.PressUpMax); - Map(x => x.PressDownMean).Column("PressDownAvrg"); + Map(x => x.PressDownMean); Map(x => x.PressDownStart); Map(x => x.PressDownEnd); Map(x => x.PressDownMin); @@ -82,17 +82,17 @@ namespace Results.Mappings Map(x => x.PressDeltaEnd); Map(x => x.PressDeltaMin); Map(x => x.PressDeltaMax); - Map(x => x.TempUpMean).Column("TempInAvrg"); - Map(x => x.TempUpStart).Column("TempInStart"); - Map(x => x.TempUpEnd).Column("TempInEnd"); - Map(x => x.TempUpMin).Column("TempInMin"); - Map(x => x.TempUpMax).Column("TempInMax"); - Map(x => x.TempDownMean).Column("TempOutAvrg"); - Map(x => x.TempDownStart).Column("TempOutStart"); - Map(x => x.TempDownEnd).Column("TempOutEnd"); - Map(x => x.TempDownMin).Column("TempOutMin"); - Map(x => x.TempDownMax).Column("TempOutMax"); - Map(x => x.TempDivMean).Column("TempDivAvrg"); + Map(x => x.TempUpMean); + Map(x => x.TempUpStart); + Map(x => x.TempUpEnd); + Map(x => x.TempUpMin); + Map(x => x.TempUpMax); + Map(x => x.TempDownMean); + Map(x => x.TempDownStart); + Map(x => x.TempDownEnd); + Map(x => x.TempDownMin); + Map(x => x.TempDownMax); + Map(x => x.TempDivMean); Map(x => x.TempDivStart); Map(x => x.TempDivEnd); Map(x => x.TempDivMin); diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs index a80bd6e58..3d7e7302c 100644 --- a/Results/Output/SensusTestInfo.cs +++ b/Results/Output/SensusTestInfo.cs @@ -512,7 +512,7 @@ namespace Results.Output QBezeichnungLog = fullTestNameWoPart, /// Flow name in Oracle database Range = range, Flow = (range == Range.R100_110) ? test.Qfrom : (range == Range.R90_100) ? test.Qto : (test.Qfrom + test.Qto) / 2, - TestTime = (int)Math.Round(test.TstTime), + TestTime = (int)Math.Round(test.TestTime), ErrLimLoFromDB = test.ErrLimLo, ErrLimHiFromDB = test.ErrLimHi, Uncertainty = test.Uncertainty, diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index 89d5a4bda..4d0649d77 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -175,8 +175,8 @@ namespace Results /// Density /// AllItems.Add(new WMeterRsltItemSpec(ItemID.Density, Strings.Density + " ()", Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).DensityLine))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()", Quantity.Density, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", Config.Formulas.DensityCorrection(w.Batch.RealDensity, w.Batch.AtTemperature)))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc, string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.Batch.RealDensity))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()", Quantity.Density, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", Config.Formulas.DensityCorrection(w.Batch.SampleDensity, w.Batch.SampleTemp)))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc, string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.Batch.SampleDensity))); AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? 0 : Config.Formulas.DistilledWaterDensityFromTemp((w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2)))); /// @@ -252,7 +252,7 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_avg, string.Format("{0} DI avg ()", Strings.VName_Temp), Strings.Tooltip_T_di_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempDivStart + w.GetTestRslt(t).TempDivEnd) / 2))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_min, string.Format("{0} DI min ()", Strings.VName_Temp), Strings.Tooltip_T_di_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMin))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_max, string.Format("{0} DI max ()", Strings.VName_Temp), Strings.Tooltip_T_di_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMax))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0, string.Format("{0} RO0", Strings.VName_Temp), Strings.Tooltip_T_rho_0, Quantity.Temperature, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Batch.AtTemperature))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0, string.Format("{0} RO0", Strings.VName_Temp), Strings.Tooltip_T_rho_0, Quantity.Temperature, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Batch.SampleTemp))); #if HEAT_METERS AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_mean, string.Format("{0} hi me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom1))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_start, string.Format("{0} hi st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom2))); diff --git a/TBF/BenchControl/ComponentCfgBase.cs b/TBF/BenchControl/ComponentCfgBase.cs index 2fe066284..5f5766c8e 100644 --- a/TBF/BenchControl/ComponentCfgBase.cs +++ b/TBF/BenchControl/ComponentCfgBase.cs @@ -128,10 +128,10 @@ namespace TBF.BenchControl if (config != null) { config.Name = cmpntEntity.Name; - config.ParentName = cmpntEntity.ParentName; + config.ParentName = cmpntEntity.Parent; config.ItemNr = cmpntEntity.ItemNr; - config.DebugLevel = cmpntEntity.Mode; - config.LogLevel = cmpntEntity.Logging; + config.DebugLevel = cmpntEntity.DebugMode; + config.LogLevel = cmpntEntity.LogLevel; config.Corrections = cmpntEntity.Corrections; config.Uncertainties = cmpntEntity.Uncertainties; config.Factory = factory; diff --git a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/Component.cs b/TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Component.cs similarity index 93% rename from TBF/BenchControl/DataContainers/BackupAndSecurityOptions/Component.cs rename to TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Component.cs index 5e8c00e23..824de0242 100644 --- a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/Component.cs +++ b/TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Component.cs @@ -4,7 +4,7 @@ using System; using log4net; -namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions +namespace TBF.BenchControl.DataContainer.BackupAndSecurityOptions { /// /// Holds backup and security options. diff --git a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs b/TBF/BenchControl/DataContainer/BackupAndSecurityOptions/ComponentCfg.cs similarity index 95% rename from TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs rename to TBF/BenchControl/DataContainer/BackupAndSecurityOptions/ComponentCfg.cs index 53777d178..aaba739a1 100644 --- a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainer/BackupAndSecurityOptions/ComponentCfg.cs @@ -7,7 +7,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions +namespace TBF.BenchControl.DataContainer.BackupAndSecurityOptions { /// /// Holds backup and security options - serializable configuration. @@ -28,11 +28,11 @@ namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions /// Private parameterless constructor invoked by all other (public) constructors ComponentCfg() {} - public ComponentCfg(IComponentFactory factory) + public ComponentCfg(string name, IComponentFactory factory) : this() { Factory = factory; - Name = "BackupAndSecurity"; + Name = name; ParentName = string.Empty; InitializeAll(); } diff --git a/TBF/BenchControl/DataContainers/Density/ComponentFactory.cs b/TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Factory.cs similarity index 75% rename from TBF/BenchControl/DataContainers/Density/ComponentFactory.cs rename to TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Factory.cs index 273341f2c..ecddd9684 100644 --- a/TBF/BenchControl/DataContainers/Density/ComponentFactory.cs +++ b/TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Factory.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Density +namespace TBF.BenchControl.DataContainer.BackupAndSecurityOptions { - public class ComponentFactory : IComponentFactory + public class Factory : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(17); } } + public string ClassName { get { return GetType().Namespace.Substring(17); } } public override string ToString() { return ClassName; } public void ResetStaticProperties() { Component.ResetStaticProperties(); } @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.Density public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Component(cfg); } - public IComponentCfg DefaultConfig() { return new ComponentCfg(this.GetType().Namespace.Substring(32), this); } + public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(31), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs b/TBF/BenchControl/DataContainer/BenchInfo/Component.cs similarity index 93% rename from TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs rename to TBF/BenchControl/DataContainer/BenchInfo/Component.cs index 70408bcd7..becb624ee 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs +++ b/TBF/BenchControl/DataContainer/BenchInfo/Component.cs @@ -9,7 +9,7 @@ using Config.Entities; using TBF.BenchControl; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.BenchInfo.Extended +namespace TBF.BenchControl.DataContainer.BenchInfo { /// /// Holds information identifying the test bench. @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.Extended public class Component : ComponentBase, GenericDevices.IBenchInfo { private static readonly ILog log = LogManager.GetLogger(typeof(Component)); - public override string ToString() { return string.Format("BenchInfoEx({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("BenchInfo({0})", Cfg.ToString(1)); } readonly ComponentCfg myCfg; diff --git a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs b/TBF/BenchControl/DataContainer/BenchInfo/ComponentCfg.cs similarity index 97% rename from TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs rename to TBF/BenchControl/DataContainer/BenchInfo/ComponentCfg.cs index 0f9ca42f5..9e61aaec0 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainer/BenchInfo/ComponentCfg.cs @@ -7,7 +7,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.BenchInfo.Extended +namespace TBF.BenchControl.DataContainer.BenchInfo { /// /// Holds information identifying the test bench - serializable configuration. @@ -37,11 +37,11 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.Extended /// Private parameterless constructor invoked by all other (public) constructors ComponentCfg() {} - public ComponentCfg(IComponentFactory factory) + public ComponentCfg(string name, IComponentFactory factory) : this() { + Name = name; Factory = factory; - Name = "BenchInfoEx"; ParentName = string.Empty; InitializeAll(); } diff --git a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentFactory.cs b/TBF/BenchControl/DataContainer/BenchInfo/Factory.cs similarity index 76% rename from TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentFactory.cs rename to TBF/BenchControl/DataContainer/BenchInfo/Factory.cs index bf56348cb..73e4725a1 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentFactory.cs +++ b/TBF/BenchControl/DataContainer/BenchInfo/Factory.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.BenchInfo.iPerl +namespace TBF.BenchControl.DataContainer.BenchInfo { - public class ComponentFactory : IComponentFactory + public class Factory : IComponentFactory { - public string ClassName { get { return "BenchInfo.iPerl"; } } + public string ClassName { get { return GetType().Namespace.Substring(17); } } public override string ToString() { return ClassName; } public void ResetStaticProperties() { Component.ResetStaticProperties(); } @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.iPerl public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Component(cfg); } - public IComponentCfg DefaultConfig() { return new ComponentCfg("BenchInfo.iPerl", this); } + public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(31), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/DataContainers/Buoyancy/Component.cs b/TBF/BenchControl/DataContainer/Buoyancy/Component.cs similarity index 98% rename from TBF/BenchControl/DataContainers/Buoyancy/Component.cs rename to TBF/BenchControl/DataContainer/Buoyancy/Component.cs index af159a5d0..003aa8f5c 100644 --- a/TBF/BenchControl/DataContainers/Buoyancy/Component.cs +++ b/TBF/BenchControl/DataContainer/Buoyancy/Component.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using log4net; using TBF.Resources; -namespace TBF.BenchControl.DataContainers.Buoyancy +namespace TBF.BenchControl.DataContainer.Buoyancy { /// /// Holds measured (true) buoyancy value. diff --git a/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs b/TBF/BenchControl/DataContainer/Buoyancy/ComponentCfg.cs similarity index 98% rename from TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs rename to TBF/BenchControl/DataContainer/Buoyancy/ComponentCfg.cs index 68b0b07c2..ed5abf85b 100644 --- a/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainer/Buoyancy/ComponentCfg.cs @@ -7,7 +7,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Buoyancy +namespace TBF.BenchControl.DataContainer.Buoyancy { /// /// Holds backup and security options - serializable configuration. diff --git a/TBF/BenchControl/DataContainers/Buoyancy/ComponentFactory.cs b/TBF/BenchControl/DataContainer/Buoyancy/Factory.cs similarity index 75% rename from TBF/BenchControl/DataContainers/Buoyancy/ComponentFactory.cs rename to TBF/BenchControl/DataContainer/Buoyancy/Factory.cs index c1d74a837..0d164e300 100644 --- a/TBF/BenchControl/DataContainers/Buoyancy/ComponentFactory.cs +++ b/TBF/BenchControl/DataContainer/Buoyancy/Factory.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Buoyancy +namespace TBF.BenchControl.DataContainer.Buoyancy { - public class ComponentFactory : IComponentFactory + public class Factory : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(17); } } + public string ClassName { get { return GetType().Namespace.Substring(17); } } public override string ToString() { return ClassName; } public void ResetStaticProperties() { Component.ResetStaticProperties(); } @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.Buoyancy public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Component(cfg); } - public IComponentCfg DefaultConfig() { return new ComponentCfg(this.GetType().Namespace.Substring(32), this); } + public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(31), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/DataContainers/Density/Component.cs b/TBF/BenchControl/DataContainer/Density/Component.cs similarity index 90% rename from TBF/BenchControl/DataContainers/Density/Component.cs rename to TBF/BenchControl/DataContainer/Density/Component.cs index b3721b78e..4eea363f5 100644 --- a/TBF/BenchControl/DataContainers/Density/Component.cs +++ b/TBF/BenchControl/DataContainer/Density/Component.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using log4net; using TBF.Resources; -namespace TBF.BenchControl.DataContainers.Density +namespace TBF.BenchControl.DataContainer.Density { /// /// Holds measured (true) density value. @@ -18,8 +18,8 @@ namespace TBF.BenchControl.DataContainers.Density readonly ComponentCfg myCfg; - public double RealDensity { get { return myCfg.RealDensity; } } - public double AtTemperature { get { return myCfg.AtTemperature; } } + public double SampleDensity { get { return myCfg.SampleDensity; } } + public double SampleTemp { get { return myCfg.SampleTemp; } } public Component() { @@ -31,8 +31,8 @@ namespace TBF.BenchControl.DataContainers.Density myCfg = cfg as ComponentCfg; /// This is to use data in formulas - Config.Data.RealDensity = RealDensity; - Config.Data.AtTemperature = AtTemperature; + Config.Data.SampleDensity = SampleDensity; + Config.Data.SampleTemp = SampleTemp; log.Warn(this.ToString()); } diff --git a/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs b/TBF/BenchControl/DataContainer/Density/ComponentCfg.cs similarity index 81% rename from TBF/BenchControl/DataContainers/Density/ComponentCfg.cs rename to TBF/BenchControl/DataContainer/Density/ComponentCfg.cs index 644335c98..21de2ccfe 100644 --- a/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainer/Density/ComponentCfg.cs @@ -7,7 +7,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Density +namespace TBF.BenchControl.DataContainer.Density { /// /// Holds backup and security options - serializable configuration. @@ -22,8 +22,8 @@ namespace TBF.BenchControl.DataContainers.Density /// /// Serialized parameters /// - public double RealDensity; - public double AtTemperature; + public double SampleDensity; + public double SampleTemp; /// Calibration info serialized parameters displayed in Metrology tab page public string CalibCertificateNr { get; set; } @@ -47,14 +47,14 @@ namespace TBF.BenchControl.DataContainers.Density public void InitializeAll() { - RealDensity = 998.2008; /// kg/m3 - AtTemperature = 20.0; /// °C + SampleDensity = 998.2008; /// kg/m3 + SampleTemp = 20.0; /// °C } string[] paramNames = new string[] { - "True density [kg/m3]", - "@temperature [°C]", + "Sample density [kg/m3]", + "Sample temperature [°C]", }; public string ParamName(int i) { return paramNames[i]; } public int ParamsCount() { return paramNames.Length; } @@ -68,13 +68,13 @@ namespace TBF.BenchControl.DataContainers.Density { if (i == -1) { - return string.Format("{0}: True density = {1} kg/m3 measured @temperature {2} °C", Name, RealDensity, AtTemperature); + return string.Format("{0}: Sample density = {1} kg/m3 measured at temperature {2} °C", Name, SampleDensity, SampleTemp); } switch (i) { - case 0: return RealDensity.ToString(); - case 1: return AtTemperature.ToString(); + case 0: return SampleDensity.ToString(); + case 1: return SampleTemp.ToString(); default: return string.Empty; } } @@ -83,8 +83,8 @@ namespace TBF.BenchControl.DataContainers.Density { switch (i) { - case 0: RealDensity = Utils.ParseUDouble(strValue); return CfgUpdateFlags.RestartRqrd; - case 1: AtTemperature = Utils.ParseUDouble(strValue); return CfgUpdateFlags.RestartRqrd; + case 0: SampleDensity = Utils.ParseUDouble(strValue); return CfgUpdateFlags.RestartRqrd; + case 1: SampleTemp = Utils.ParseUDouble(strValue); return CfgUpdateFlags.RestartRqrd; default: return CfgUpdateFlags.None; } } @@ -115,8 +115,8 @@ namespace TBF.BenchControl.DataContainers.Density void CopyContentTo(ComponentCfg prms) { - prms.RealDensity = this.RealDensity; - prms.AtTemperature = this.AtTemperature; + prms.SampleDensity = this.SampleDensity; + prms.SampleTemp = this.SampleTemp; } public Config.Entities.IParamsProvider Clone() diff --git a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentFactory.cs b/TBF/BenchControl/DataContainer/Density/Factory.cs similarity index 76% rename from TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentFactory.cs rename to TBF/BenchControl/DataContainer/Density/Factory.cs index 9989b6484..1c4241498 100644 --- a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentFactory.cs +++ b/TBF/BenchControl/DataContainer/Density/Factory.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions +namespace TBF.BenchControl.DataContainer.Density { - public class ComponentFactory : IComponentFactory + public class Factory : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(17); } } + public string ClassName { get { return GetType().Namespace.Substring(17); } } public override string ToString() { return ClassName; } public void ResetStaticProperties() { Component.ResetStaticProperties(); } @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Component(cfg); } - public IComponentCfg DefaultConfig() { return new ComponentCfg(this); } + public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(31), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/DataContainers/Evaporation/Component.cs b/TBF/BenchControl/DataContainer/Evaporation/Component.cs similarity index 98% rename from TBF/BenchControl/DataContainers/Evaporation/Component.cs rename to TBF/BenchControl/DataContainer/Evaporation/Component.cs index 151ac75d3..5595d6418 100644 --- a/TBF/BenchControl/DataContainers/Evaporation/Component.cs +++ b/TBF/BenchControl/DataContainer/Evaporation/Component.cs @@ -8,7 +8,7 @@ using Config.Entities; using TBF.BenchControl.GenericDevices; using TBF.Resources; -namespace TBF.BenchControl.DataContainers.Evaporation +namespace TBF.BenchControl.DataContainer.Evaporation { public class Component : ComponentBase, IEvaporation, GenericDevices.IHasCalendarEvents { diff --git a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfg.cs similarity index 96% rename from TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs rename to TBF/BenchControl/DataContainer/Evaporation/EvaporationCfg.cs index 7d627b3fe..a120180ea 100644 --- a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs +++ b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfg.cs @@ -7,7 +7,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Evaporation +namespace TBF.BenchControl.DataContainer.Evaporation { /// /// Holds backup and security options - serializable configuration. diff --git a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.cs similarity index 96% rename from TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs rename to TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.cs index cc0590472..c0fb03eb6 100644 --- a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs +++ b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Evaporation +namespace TBF.BenchControl.DataContainer.Evaporation { public partial class EvaporationCfgCtrl : UserControl, IComponentCfgCtrl { diff --git a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.designer.cs b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.designer.cs similarity index 97% rename from TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.designer.cs rename to TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.designer.cs index 1851a482b..6259d3025 100644 --- a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.designer.cs +++ b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2020 Sensus Slovensko a.s. /// -namespace TBF.BenchControl.DataContainers.Evaporation +namespace TBF.BenchControl.DataContainer.Evaporation { partial class EvaporationCfgCtrl { diff --git a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.resx b/TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.resx similarity index 100% rename from TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.resx rename to TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.resx diff --git a/TBF/BenchControl/DataContainers/Evaporation/Factory.cs b/TBF/BenchControl/DataContainer/Evaporation/Factory.cs similarity index 79% rename from TBF/BenchControl/DataContainers/Evaporation/Factory.cs rename to TBF/BenchControl/DataContainer/Evaporation/Factory.cs index eb9a974f6..6ee29d55e 100644 --- a/TBF/BenchControl/DataContainers/Evaporation/Factory.cs +++ b/TBF/BenchControl/DataContainer/Evaporation/Factory.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.Evaporation +namespace TBF.BenchControl.DataContainer.Evaporation { public class Factory : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(17); } } + public string ClassName { get { return GetType().Namespace.Substring(17); } } public override string ToString() { return ClassName; } public void ResetStaticProperties() { } @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.Evaporation public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Component(cfg); } - public IComponentCfg DefaultConfig() { return new EvaporationCfg(this.GetType().Namespace.Substring(32), this); } + public IComponentCfg DefaultConfig() { return new EvaporationCfg(GetType().Namespace.Substring(31), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs b/TBF/BenchControl/DataContainer/iPerlBenchInfo/Component.cs similarity index 98% rename from TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs rename to TBF/BenchControl/DataContainer/iPerlBenchInfo/Component.cs index dbc9c6e24..7c497e4d1 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs +++ b/TBF/BenchControl/DataContainer/iPerlBenchInfo/Component.cs @@ -10,7 +10,7 @@ using TBF.BenchControl; using TBF.BenchControl.Generic; using TBF.Resources; -namespace TBF.BenchControl.DataContainers.BenchInfo.iPerl +namespace TBF.BenchControl.DataContainer.iPerlBenchInfo { /// /// Holds information identifying the test bench. diff --git a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs b/TBF/BenchControl/DataContainer/iPerlBenchInfo/ComponentCfg.cs similarity index 99% rename from TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs rename to TBF/BenchControl/DataContainer/iPerlBenchInfo/ComponentCfg.cs index b6d9e56b0..7e6618f55 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainer/iPerlBenchInfo/ComponentCfg.cs @@ -8,7 +8,7 @@ using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; -namespace TBF.BenchControl.DataContainers.BenchInfo.iPerl +namespace TBF.BenchControl.DataContainer.iPerlBenchInfo { /// /// Holds information identifying the test bench - serializable configuration. diff --git a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentFactory.cs b/TBF/BenchControl/DataContainer/iPerlBenchInfo/Factory.cs similarity index 68% rename from TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentFactory.cs rename to TBF/BenchControl/DataContainer/iPerlBenchInfo/Factory.cs index af3d5175f..d245f1662 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentFactory.cs +++ b/TBF/BenchControl/DataContainer/iPerlBenchInfo/Factory.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.DataContainers.BenchInfo.Extended +namespace TBF.BenchControl.DataContainer.iPerlBenchInfo { - public class ComponentFactory : IComponentFactory + public class Factory : IComponentFactory { - public string ClassName { get { return "BenchInfoEx"; } } + public string ClassName { get { return GetType().Namespace.Substring(17); } } public override string ToString() { return ClassName; } public void ResetStaticProperties() { Component.ResetStaticProperties(); } @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.Extended public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Component(cfg); } - public IComponentCfg DefaultConfig() { return new ComponentCfg(this); } + public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(31), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs index 3617e61b1..63883a3ff 100644 --- a/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs @@ -63,8 +63,8 @@ namespace TBF.BenchControl.DataEntry.iPerl /// /// Draw an appropriate test bench picture /// - Config.Entities.Side side = (TBF.BenchControl.Sequences.ProcessData.BenchInfo is DataContainers.BenchInfo.iPerl.Component) - ? (TBF.BenchControl.Sequences.ProcessData.BenchInfo as DataContainers.BenchInfo.iPerl.Component).Side + Config.Entities.Side side = (TBF.BenchControl.Sequences.ProcessData.BenchInfo is DataContainer.iPerlBenchInfo.Component) + ? (TBF.BenchControl.Sequences.ProcessData.BenchInfo as DataContainer.iPerlBenchInfo.Component).Side : Config.Entities.Side.Left; if (reversedDirection && (side == Config.Entities.Side.Left)) { diff --git a/TBF/BenchControl/FeedingPath.cs b/TBF/BenchControl/FeedingPath.cs index c969f06b2..6fc7b756b 100644 --- a/TBF/BenchControl/FeedingPath.cs +++ b/TBF/BenchControl/FeedingPath.cs @@ -52,7 +52,7 @@ namespace TBF.BenchControl /// /// Feeding regulation valve precentages /// - string[] rvPosStr = (entity.RegulValvesPct != null) ? entity.RegulValvesPct.Split(new char[] { ';' }) : new string[0]; + string[] rvPosStr = (entity.RegVPositions != null) ? entity.RegVPositions.Split(new char[] { ';' }) : new string[0]; for (int i = 0; i < RegulValves.Count; i++) { string str = (i < rvPosStr.Length) ? rvPosStr[i] : "---"; diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs index e8411e0f0..497072743 100644 --- a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs +++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs @@ -114,7 +114,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard { drainValveComboBox.Items.Add(cmpnt.Name); } - else if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is DataContainers.Evaporation.Factory) + else if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is DataContainer.Evaporation.Factory) { evaporationComboBox.Items.Add(cmpnt.Name); } diff --git a/TBF/BenchControl/OutputPath.cs b/TBF/BenchControl/OutputPath.cs index 68d17b4ce..aa57d5d67 100644 --- a/TBF/BenchControl/OutputPath.cs +++ b/TBF/BenchControl/OutputPath.cs @@ -45,10 +45,10 @@ namespace TBF.BenchControl Qfrom = outputPathEntity.Qfrom; Qto = outputPathEntity.Qto; FlowMeter = (IFlowMeter)TbfComponents.FindComponent(outputPathEntity.FlowMeter, components); - RegulValve = (IRegulValve)TbfComponents.FindComponent(outputPathEntity.RegulValve, components); + RegulValve = (IRegulValve)TbfComponents.FindComponent(outputPathEntity.RegValve, components); PidCoef = outputPathEntity.PidCoef; Diverter = (IDiverter)TbfComponents.FindComponent(outputPathEntity.Diverter, components); - TempDiv = (ITempMeter)TbfComponents.FindComponent(outputPathEntity.TempDiv, components); + TempDiv = (ITempMeter)TbfComponents.FindComponent(outputPathEntity.TempMtrDiv, components); Scale = (IScaleOrTank)TbfComponents.FindComponent(outputPathEntity.Scale, components); string[] svs = outputPathEntity.StartValve != null ? outputPathEntity.StartValve.Split(new char[] { '~' }) : new string[0]; diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index a329317b6..ef11dc44f 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -738,7 +738,7 @@ namespace TBF.BenchControl.Sequences { Test test = StateMachine.TestInstances[i].Test; - TimeEstimateTotal += (test.TstTime + 10.0f); + TimeEstimateTotal += (test.TestTime + 10.0f); /// Try to fetch all test paths and transitions /// to detect configuration errors as early as possible. @@ -800,7 +800,7 @@ namespace TBF.BenchControl.Sequences nextQfrom = nextHydroTest.Qfrom; nextQto = nextHydroTest.Qto; nextPumpPower = nextHydroTest.PumpPower; - nextTolerRed = nextHydroTest.TolerRed; + nextShortPulses = nextHydroTest.ShortPulses; nextPidCoef = (nextOutPath != null) ? nextOutPath.PidCoef : 1.0F; } else @@ -879,7 +879,7 @@ namespace TBF.BenchControl.Sequences int timeEstTransBetween = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionBetween) : 1; int timeEstTransAfter = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionAfter) : 1; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(testInst.Test.TstTime) + 15, timeEstTransAfter, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(testInst.Test.TestTime) + 15, timeEstTransAfter, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(testInst.Test, testInst.Repetition, Config.Entities.Progress.JustStarted)); bool currentTestFinished = true; @@ -1088,7 +1088,7 @@ namespace TBF.BenchControl.Sequences int timeEstTransBetween = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionBetween) : 1; int timeEstTransAfter = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionAfter) : 1; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, timeEstTransAfter, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(test.TestTime) + 15, timeEstTransAfter, 0 }); /// start, transition, flow detection, flow setting, aborted, test, transition, end Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, Config.Entities.Progress.JustStarted)); diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs index 602f4d7b8..70d95f124 100644 --- a/TBF/BenchControl/Sequences/SequenceBase.cs +++ b/TBF/BenchControl/Sequences/SequenceBase.cs @@ -79,7 +79,7 @@ namespace TBF.BenchControl.Sequences protected static float nextQto; protected static float nextPumpPower; protected static float nextPidCoef; - protected static double nextTolerRed; + protected static int nextShortPulses; protected IOperation readRegistersOp; @@ -807,7 +807,7 @@ namespace TBF.BenchControl.Sequences if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard) { int[] filters = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 }; - (StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, nextPidCoef, (nextTolerRed == 0) ? 0 : 1); + (StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, nextPidCoef, (nextShortPulses == 0) ? 0 : 1); } /// Set pump power diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs index 6953756a0..eb4672a2f 100644 --- a/TBF/BenchControl/StateMachine.cs +++ b/TBF/BenchControl/StateMachine.cs @@ -685,9 +685,9 @@ namespace TBF.BenchControl foreach (var tr in TransitionSequences) { - if (tr.Name == test.RelTransBefore) transitionBefore = tr; - if (tr.Name == test.RelTransBetween) transitionBetween = tr; - if (tr.Name == test.TransitionAfter) transitionAfter = tr; + if (tr.Name == test.TransBefore) transitionBefore = tr; + if (tr.Name == test.TransBetween) transitionBetween = tr; + if (tr.Name == test.TransAfter) transitionAfter = tr; } if (isHydroTest && pout.Scale == null) diff --git a/TBF/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs index c7aa0079a..9919b8c4f 100644 --- a/TBF/BenchControl/TbfComponents.cs +++ b/TBF/BenchControl/TbfComponents.cs @@ -15,12 +15,12 @@ namespace TBF.BenchControl { Factories = new List(); - Factories.Add(new DataContainers.BackupAndSecurityOptions.ComponentFactory()); - Factories.Add(new DataContainers.BenchInfo.Extended.ComponentFactory()); - Factories.Add(new DataContainers.BenchInfo.iPerl.ComponentFactory()); - Factories.Add(new DataContainers.Buoyancy.ComponentFactory()); - Factories.Add(new DataContainers.Density.ComponentFactory()); - Factories.Add(new DataContainers.Evaporation.Factory()); + Factories.Add(new DataContainer.BackupAndSecurityOptions.Factory()); + Factories.Add(new DataContainer.BenchInfo.Factory()); + Factories.Add(new DataContainer.Buoyancy.Factory()); + Factories.Add(new DataContainer.Density.Factory()); + Factories.Add(new DataContainer.Evaporation.Factory()); + Factories.Add(new DataContainer.iPerlBenchInfo.Factory()); Factories.Add(new ControlBoard.Papouch.CBoardFactory()); Factories.Add(new ControlBoard.Uni.Factory()); Factories.Add(new DataEntry.Combined.EntryFormFactory()); diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 9c780c5ba..eb84f6a9d 100644 --- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -139,7 +139,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 2a96a9f84..a16c08fc7 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -133,7 +133,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -294,7 +294,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection .AddOperation(checkUiOp) .AddOperations(readTempPressOps) .AddOperations(measureOperations) - .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed)) + .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.ShortPulses)) .EnterState(); do { e = StateMachine.WaitRunDevsRunOps(); @@ -585,7 +585,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection queryEnd1 = cBrd.QueryMeasurementEndOp(); StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Read the diverter switch time if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard) diff --git a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs index 9f70bcbfb..367a0ce9d 100644 --- a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs +++ b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs @@ -131,7 +131,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -528,7 +528,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest /// Measurement loop - preparation readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); - int estimtdEndTime = StateMachine.Time + (int)(test.TstTime / testParams.DivRepetitions); + int estimtdEndTime = StateMachine.Time + (int)(test.TestTime / testParams.DivRepetitions); /// Measurement loop - begin State.Create(string.Format("{0}({1}) : Reading watermeters {2}", test.Method, test.Name, divRepetNr)) diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index ead679d14..4733321d8 100644 --- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -109,7 +109,7 @@ namespace TBF.BenchControl.TestMethods.Endurance } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -324,7 +324,7 @@ namespace TBF.BenchControl.TestMethods.Endurance readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); /// Measurement loop - begin @@ -545,7 +545,7 @@ namespace TBF.BenchControl.TestMethods.Endurance } while (!e.Contains(Event.PreviousStopped)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); @@ -600,7 +600,7 @@ namespace TBF.BenchControl.TestMethods.Endurance State.Create(string.Format("{0}({1}) : Executing the cycle", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(readTempPressOps) - .AddOperation(new Operations.TimerOp((int)test.TstTime, Event.TimerExpired)) + .AddOperation(new Operations.TimerOp((int)test.TestTime, Event.TimerExpired)) .AddOperation(eldeCB.ExecuteCommandOp(ControlBoard.Legacy.Command.EnduranceCycleStart, ControlBoard.Legacy.Command.EnduranceCycleStop, 0)) .AddOperation(processDataLoggingOp) .AddOperation(enduranceDataLoggingOp) diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs index ea5feb5c7..66b48a512 100644 --- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs @@ -107,7 +107,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -551,8 +551,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index b33f80f27..b5b80c026 100644 --- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -115,7 +115,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -428,8 +428,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs index 1cb8d4623..4ef290b01 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs @@ -125,7 +125,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -589,8 +589,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs index 4038f8ccc..989e4206b 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs @@ -125,7 +125,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -515,8 +515,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs index 281b30bd4..3f58f31b5 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs @@ -149,7 +149,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -700,8 +700,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 1ec5bd6a7..50b3f98cb 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -125,7 +125,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -677,8 +677,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs index 1cc6fb5c0..5479deb22 100644 --- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs @@ -130,7 +130,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -515,8 +515,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5)); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5)); + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; /// Measurement loop - begin do diff --git a/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs b/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs index cd1a7a763..28b070600 100644 --- a/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs @@ -114,7 +114,7 @@ namespace TBF.BenchControl.TestMethods.FlowAdjustment } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index dcdcb3121..160364ebb 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -116,7 +116,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -416,7 +416,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); /// Measurement loop - begin diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index 8373b1df0..5a5cb0b4f 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -146,7 +146,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -602,7 +602,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); queryEnd1 = cBrd.QueryMeasurementEndOp(); /// ??? - int estimtdEndTime = StateMachine.Time + (int)((repetitionNr == 1) ? test.TstTime : (test.TstTime * nextTestVolume / test.Volume)); + int estimtdEndTime = StateMachine.Time + (int)((repetitionNr == 1) ? test.TestTime : (test.TestTime * nextTestVolume / test.Volume)); StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); /// Measurement loop - begin diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index f9ff5476a..9c3ca485c 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -166,7 +166,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -709,7 +709,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative /// Measurement loop - preparation readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); /// Measurement loop - begin diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index fe2b69242..234b6d64d 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -143,7 +143,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -591,7 +591,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged /// /// Measurement loop - preparation /// - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); bool isMeasurementCompleted = false; diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 456a63830..3761b7821 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -142,7 +142,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -588,7 +588,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Measurement loop - preparation readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); /// Measurement loop - begin @@ -1200,10 +1200,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Simulate flow StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); - IntBox remainingTime = new IntBox((int)test.TstTime); + IntBox remainingTime = new IntBox((int)test.TestTime); State.Create(string.Format("{0}({1}) : Simulation", test.Method, test.Name)) .AddOperation(checkUiOp) - .AddOperation(new Operations.TimerOp((int)test.TstTime, remainingTime)) + .AddOperation(new Operations.TimerOp((int)test.TestTime, remainingTime)) .EnterState(); do { @@ -1222,7 +1222,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } //------------------------------------------------ - RefFlow.Val = (1.0 + 0.2 * Math.Sin(2 * Math.PI * (float)remainingTime.Val / test.TstTime)) * (test.Qfrom + test.Qto) / 2.0; + RefFlow.Val = (1.0 + 0.2 * Math.Sin(2 * Math.PI * (float)remainingTime.Val / test.TestTime)) * (test.Qfrom + test.Qto) / 2.0; PressUp.Val = 2.7f; PressDown.Val = 2.2f; diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs index 324d221e5..46f6f5db6 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs @@ -149,7 +149,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -408,7 +408,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection /// Measurement loop - preparation readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); - int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + int estimtdEndTime = StateMachine.Time + (int)test.TestTime; StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); /// Measurement loop - begin diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs index f542b1ff3..5a69c1978 100644 --- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs @@ -101,7 +101,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs index d727c6253..447e712a5 100644 --- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs @@ -102,7 +102,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); diff --git a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs index 7abcb71fa..2da760347 100644 --- a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs @@ -42,7 +42,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs index cbc5d73e4..827991760 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -81,7 +81,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest } } - (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1); + (cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses); } IList readTempPressOps = new List(); @@ -210,7 +210,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest .AddOperation(checkUiOp) .AddOperations(readTempPressOps) .AddOperations(measureOperations) - .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed)) + .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.ShortPulses)) .EnterState(); do { e = StateMachine.WaitRunDevsRunOps(); diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 4885bea33..086b0c455 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -152,8 +152,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication string[] args = testParams.Activity.Substring(IperlCheckCmd.Length).Split(new char[] { ' ' }); - int maxTestIndex = (ProcessData.BenchInfo is DataContainers.BenchInfo.iPerl.Component) - ? (ProcessData.BenchInfo as DataContainers.BenchInfo.iPerl.Component).MaxTestIndex + int maxTestIndex = (ProcessData.BenchInfo is DataContainer.iPerlBenchInfo.Component) + ? (ProcessData.BenchInfo as DataContainer.iPerlBenchInfo.Component).MaxTestIndex : int.MaxValue; Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(test.Name, 0); diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 3f8219e33..77873c9a2 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -250,30 +250,30 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + UserControl - + EvaporationCfgCtrl.cs + + + Form @@ -2698,7 +2698,7 @@ PumpCfgCtrl.cs - + EvaporationCfgCtrl.cs diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs index 5d780aaf7..1c5d2cb2f 100644 --- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs @@ -162,7 +162,7 @@ namespace TBF.UI.Bench.Components { if (value.Equals(mode.ToDescription())) { - cmpnt.Mode = mode; + cmpnt.DebugMode = mode; item.SubItems[columnNr].Text = value; flags |= CfgUpdateFlags.RestartRqrd; break; @@ -175,7 +175,7 @@ namespace TBF.UI.Bench.Components { if (value.Equals(level.ToDescription())) { - cmpnt.Logging = level; + cmpnt.LogLevel = level; item.SubItems[columnNr].Text = value; flags |= CfgUpdateFlags.RestartRqrd; break; @@ -202,12 +202,12 @@ namespace TBF.UI.Bench.Components { if (debugCB.Text.Equals(level.ToDescription())) { - cmpnt.Mode = level; + cmpnt.DebugMode = level; flags |= CfgUpdateFlags.RestartRqrd; return; } } - e.DisplayText = cmpnt.Mode.ToString(); + e.DisplayText = cmpnt.DebugMode.ToString(); } else if (e.SubItem == (int)Column.Logging) { @@ -215,12 +215,12 @@ namespace TBF.UI.Bench.Components { if (logCB.Text.Equals(level.ToDescription())) { - cmpnt.Logging = level; + cmpnt.LogLevel = level; flags |= CfgUpdateFlags.RestartRqrd; return; } } - e.DisplayText = cmpnt.Logging.ToString(); + e.DisplayText = cmpnt.LogLevel.ToString(); } } @@ -249,7 +249,7 @@ namespace TBF.UI.Bench.Components lvi.Tag = cmpnt; lvi.SubItems.Add(cmpnt.Name); lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName); - lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName); + lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.Parent) ? string.Empty : cmpnt.Parent); IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt); if (cmpCfg != null) @@ -513,9 +513,9 @@ namespace TBF.UI.Bench.Components original.Name = modified.Name; original.ClassName = modified.ClassName; - original.ParentName = modified.ParentName; - original.Mode = modified.Mode; - original.Logging = modified.Logging; + original.Parent = modified.Parent; + original.DebugMode = modified.DebugMode; + original.LogLevel = modified.LogLevel; original.Parameters = modified.Parameters; RedrawAll(); diff --git a/TBF/UI/Bench/Metrology/MetrologyDlg.cs b/TBF/UI/Bench/Metrology/MetrologyDlg.cs index 5bbc51276..e1412a002 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlg.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlg.cs @@ -61,13 +61,13 @@ namespace TBF.UI.Bench.Metrology BenchControl.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName); /// Tab-page density - if (factory is BenchControl.DataContainers.Density.ComponentFactory) + if (factory is BenchControl.DataContainer.Density.Factory) { fixedCount++; TabPage tabPage = new TabPage(" " + Strings.Density + " "); MetrologyDlgDensityTab uiControl = new MetrologyDlgDensityTab(); uiControl.MeterEntity = cmpnt; - uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainers.Density.ComponentCfg; + uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainer.Density.ComponentCfg; uiControl.Dock = DockStyle.Fill; tabPage.Tag = uiControl; tabPage.Controls.Add(uiControl); @@ -75,13 +75,13 @@ namespace TBF.UI.Bench.Metrology } /// Tab-page buoyancy - if (factory is BenchControl.DataContainers.Buoyancy.ComponentFactory) + if (factory is BenchControl.DataContainer.Buoyancy.Factory) { fixedCount++; TabPage tabPage = new TabPage(" Buoyancy "); MetrologyDlgBuoyancyTab uiControl = new MetrologyDlgBuoyancyTab(); uiControl.MeterEntity = cmpnt; - uiControl.BuoyancyCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainers.Buoyancy.ComponentCfg; + uiControl.BuoyancyCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainer.Buoyancy.ComponentCfg; uiControl.Dock = DockStyle.Fill; tabPage.Tag = uiControl; tabPage.Controls.Add(uiControl); @@ -106,7 +106,7 @@ namespace TBF.UI.Bench.Metrology } /// Tab-pages for flowmeters - if (factory is BenchControl.Elde.FlowMeter.FlowMeterFactory) + if (factory is BenchControl.Uni.FlowMeter.Factory) { BenchControl.Elde.FlowMeter.FlowMeterCfg flowMeterCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.Elde.FlowMeter.FlowMeterCfg; @@ -139,9 +139,7 @@ namespace TBF.UI.Bench.Metrology } /// Tab-pages for pressure meters - if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory || - factory is BenchControl.Elde.PressureMeterInternal.PressureMeterFactory || - factory is BenchControl.Modbus.PressureMeter.Meret.Factory) + if (factory is BenchControl.Modbus.PressureMeter.Meret.Factory) { pressMetersCount++; TabPage tabPage = new TabPage(" " + cmpnt.Name + " "); @@ -155,9 +153,7 @@ namespace TBF.UI.Bench.Metrology } /// Tab-pages for temperature meters - if (factory is BenchControl.Elde.TempMeter.TempMeterFactory || - factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory || - factory is BenchControl.Keithley.TempMeter.Factory || + if (factory is BenchControl.Keithley.TempMeter.Factory || factory is BenchControl.Modbus.TempMeter.Groch.Factory || factory is BenchControl.Modbus.TempMeter.Meret.Factory) { @@ -187,7 +183,7 @@ namespace TBF.UI.Bench.Metrology } /// Tab-pages for diverters - if (factory is BenchControl.Elde.Diverter.DiverterFactory) + if (factory is BenchControl.Uni.Diverter.Factory) { divertersCount++; TabPage tabPage = new TabPage(" " + cmpnt.Name + " "); @@ -215,7 +211,7 @@ namespace TBF.UI.Bench.Metrology } /// Tab-pages for water tank evaporation rates - if (factory is BenchControl.DataContainers.Evaporation.Factory) + if (factory is BenchControl.DataContainer.Evaporation.Factory) { evaporationsCount++; TabPage tabPage = new TabPage(" " + cmpnt.Name + " "); diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs index 841d57306..ee3f6f889 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs @@ -28,7 +28,7 @@ namespace TBF.UI.Bench.Metrology /// /// Buoyancy configuration /// - public BenchControl.DataContainers.Buoyancy.ComponentCfg BuoyancyCfg; + public BenchControl.DataContainer.Buoyancy.ComponentCfg BuoyancyCfg; /// /// A list of 'measurement-correction' pairs to be deleted from the database on OK. diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs index e5818faed..8259ec37b 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs @@ -28,7 +28,7 @@ namespace TBF.UI.Bench.Metrology /// /// Density configuration /// - public BenchControl.DataContainers.Density.ComponentCfg DensityCfg; + public BenchControl.DataContainer.Density.ComponentCfg DensityCfg; /// /// A list of 'measurement-correction' pairs to be deleted from the database on OK. @@ -84,9 +84,9 @@ namespace TBF.UI.Bench.Metrology { if (DensityCfg != null) { - densityTextBox.Text = Config.Data.RealDensity.ToString("F4"); - temperatureTextBox.Text = Config.Data.AtTemperature.ToString("F2"); - densityCorrTextBox.Text = Config.Formulas.DensityCorrection(Config.Data.RealDensity, Config.Data.AtTemperature).ToString("F5"); + densityTextBox.Text = Config.Data.SampleDensity.ToString("F4"); + temperatureTextBox.Text = Config.Data.SampleTemp.ToString("F2"); + densityCorrTextBox.Text = Config.Formulas.DensityCorrection(Config.Data.SampleDensity, Config.Data.SampleTemp).ToString("F5"); calibCertificateNrTextBox.Text = DensityCfg.CalibCertificateNr; calibDateTimePicker.Value = (DensityCfg.CalibDate < Constants.MinDate) ? Constants.MinDate : DensityCfg.CalibDate; calibExpirationDateTimePicker.Value = (DensityCfg.CalibValidDate < Constants.MinDate) ? Constants.MinDate : DensityCfg.CalibValidDate; @@ -110,11 +110,11 @@ namespace TBF.UI.Bench.Metrology { try { - double realDensity = Utils.ParseUDouble(densityTextBox.Text); - double atTemperature = Utils.ParseUDouble(temperatureTextBox.Text); + double sampleDensity = Utils.ParseUDouble(densityTextBox.Text); + double sampleTemp = Utils.ParseUDouble(temperatureTextBox.Text); - Config.Data.RealDensity = DensityCfg.RealDensity = realDensity; - Config.Data.AtTemperature = DensityCfg.AtTemperature = atTemperature; + Config.Data.SampleDensity = DensityCfg.SampleDensity = sampleDensity; + Config.Data.SampleTemp = DensityCfg.SampleTemp = sampleTemp; DensityCfg.CalibCertificateNr = calibCertificateNrTextBox.Text; DensityCfg.CalibDate = calibDateTimePicker.Value.Date; diff --git a/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs b/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs index ac6fa4be4..d19fc463b 100644 --- a/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs @@ -188,7 +188,7 @@ namespace TBF.UI.Bench.Paths lvi.SubItems.Add(path.Qto.ToString()); lvi.SubItems.Add(path.Pump != null ? path.Pump.Cfg.Name : "---"); - string[] rvPosStr = (entity.RegulValvesPct != null) ? entity.RegulValvesPct.Split(new char[] {';'}) + string[] rvPosStr = (entity.RegVPositions != null) ? entity.RegVPositions.Split(new char[] {';'}) : new string[0]; for (int i = 0; i < regvCount; i++) { @@ -256,7 +256,7 @@ namespace TBF.UI.Bench.Paths regulValvesPct += lvi.SubItems[i].Text; } } - entity.RegulValvesPct = regulValvesPct; + entity.RegVPositions = regulValvesPct; /// /// Valves diff --git a/TBF/UI/Bench/Paths/PathsOutputCtrl.cs b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs index 8e1e8e3b7..ca487f43d 100644 --- a/TBF/UI/Bench/Paths/PathsOutputCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs @@ -296,14 +296,14 @@ namespace TBF.UI.Bench.Paths entity.Qto = Qto; entity.FlowMeter = lvi.SubItems[(int)Column.RefFlowmtr].Text.Equals("---") ? null : lvi.SubItems[(int)Column.RefFlowmtr].Text; - entity.RegulValve = lvi.SubItems[(int)Column.RegulValve].Text.Equals("---") ? null : lvi.SubItems[(int)Column.RegulValve].Text; + entity.RegValve = lvi.SubItems[(int)Column.RegulValve].Text.Equals("---") ? null : lvi.SubItems[(int)Column.RegulValve].Text; float pid; allOk &= Utils.TryParseSFloat(lvi.SubItems[(int)Column.PidCoef].Text, out pid); entity.PidCoef = pid; entity.Diverter = lvi.SubItems[(int)Column.Div].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Div].Text; - entity.TempDiv = lvi.SubItems[(int)Column.Tdiv].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Tdiv].Text; + entity.TempMtrDiv = lvi.SubItems[(int)Column.Tdiv].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Tdiv].Text; entity.Scale = lvi.SubItems[(int)Column.Scale].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Scale].Text; string sv1 = lvi.SubItems[(int)Column.StartValve1].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)Column.StartValve1].Text; diff --git a/TBF/UI/Bench/Transitions/TransitionsDlg.cs b/TBF/UI/Bench/Transitions/TransitionsDlg.cs index d5fd6e65f..a83ce8ea1 100644 --- a/TBF/UI/Bench/Transitions/TransitionsDlg.cs +++ b/TBF/UI/Bench/Transitions/TransitionsDlg.cs @@ -310,8 +310,8 @@ namespace TBF.UI.Bench.Transitions int occurances = 0; foreach (var test in tests) { - if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++; - if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++; } foreach (var proc in procedures) { @@ -332,8 +332,8 @@ namespace TBF.UI.Bench.Transitions int occurances = 0; foreach (var test in tests) { - if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++; - if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++; } foreach (var proc in procedures) { @@ -355,8 +355,8 @@ namespace TBF.UI.Bench.Transitions int occurances = 0; foreach (var test in tests) { - if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++; - if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++; } foreach (var proc in procedures) { @@ -377,8 +377,8 @@ namespace TBF.UI.Bench.Transitions int occurances = 0; foreach (var test in tests) { - if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++; - if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++; + if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++; } foreach (var proc in procedures) { @@ -430,20 +430,20 @@ namespace TBF.UI.Bench.Transitions foreach (var ri in renameInfo) { var tests = Session.QueryOver() - .Where(x => (x.RelTransBefore == ri.Key)) + .Where(x => (x.TransBefore == ri.Key)) .List(); foreach (var t in tests) { - t.RelTransBefore = ri.Value; + t.TransBefore = ri.Value; Session.Update(t); } tests = Session.QueryOver() - .Where(x => (x.TransitionAfter == ri.Key)) + .Where(x => (x.TransAfter == ri.Key)) .List(); foreach (var t in tests) { - t.TransitionAfter = ri.Value; + t.TransAfter = ri.Value; Session.Update(t); } diff --git a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs index 5a94b7bb5..9e79a873d 100644 --- a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs +++ b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs @@ -64,13 +64,13 @@ namespace TBF.UI.Bench.Uncertainties BenchControl.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName); /// Tab-page density - if (factory is BenchControl.DataContainers.Density.ComponentFactory) + if (factory is BenchControl.DataContainer.Density.Factory) { fixedCount++; TabPage tabPage = new TabPage(" " + Strings.Density + " "); UncertntDlgDensityTab uiControl = new UncertntDlgDensityTab(); uiControl.MeterEntity = cmpnt; - uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainers.Density.ComponentCfg; + uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainer.Density.ComponentCfg; uiControl.Dock = DockStyle.Fill; tabPage.Tag = uiControl; tabPage.Controls.Add(uiControl); diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs index f48a3f343..1e5028f42 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs @@ -31,7 +31,7 @@ namespace TBF.UI.Bench.Uncertainties /// /// Balance configuration (with buoyancy parameters) /// - public BenchControl.DataContainers.Density.ComponentCfg DensityCfg; + public BenchControl.DataContainer.Density.ComponentCfg DensityCfg; /// /// A list of 'measurement-correction' pairs to be deleted from the database on OK. diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index 90da63c8e..cb79f595b 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -827,7 +827,7 @@ namespace TBF.UI.Procedures lvi.SubItems.Add(test.Qfrom.ToString()); /// Q_from lvi.SubItems.Add(test.Qto.ToString()); /// Q_to lvi.SubItems.Add(test.Volume.ToString()); /// VOlume - lvi.SubItems.Add(test.TstTime.ToString()); + lvi.SubItems.Add(test.TestTime.ToString()); lvi.SubItems.Add(test.ErrLimLo.ToString()); lvi.SubItems.Add(test.ErrLimHi.ToString()); lvi.SubItems.Add(test.TempLimLo.ToString()); @@ -864,7 +864,7 @@ namespace TBF.UI.Procedures if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Qfrom].Text, out tmp)) entity.Qfrom = tmp; if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Qto].Text, out tmp)) entity.Qto = tmp; if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Volume].Text, out tmp)) entity.Volume = tmp; - if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text,out tmp)) entity.TstTime = tmp; + if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text,out tmp)) entity.TestTime = tmp; if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimLo].Text, out tmp)) entity.ErrLimLo = tmp; if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimHi].Text, out tmp)) entity.ErrLimHi = tmp; @@ -1104,7 +1104,7 @@ namespace TBF.UI.Procedures lvi.SubItems.Add(test.Uncertainty.ToString()); lvi.SubItems.Add(test.Repeats.ToString()); lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no); - lvi.SubItems.Add(test.TolerRed.ToString()); + lvi.SubItems.Add(test.ShortPulses.ToString()); lvi.SubItems.Add(((Config.Entities.Publish)test.Publish).ToDescription()); lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no); @@ -1125,7 +1125,7 @@ namespace TBF.UI.Procedures entity.Uncertainty = Utils.ParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Uncertainty].Text); entity.Repeats = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.Repeats].Text); entity.DoControlWaterTemp = lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes); - entity.TolerRed = (double)Utils.ParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text); + entity.ShortPulses = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text); entity.DoEvaluate = lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes); for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) @@ -1218,8 +1218,8 @@ namespace TBF.UI.Procedures return; } - float fdummy; - if ((e.SubItem == (int)Mtrlgy2Clmn.ShortPulses) && !Utils.TryParseUFloat(e.DisplayText, out fdummy)) + int idummy; + if ((e.SubItem == (int)Mtrlgy2Clmn.ShortPulses) && (!int.TryParse(e.DisplayText, out idummy) || idummy < 0 || idummy > 1)) { e.DisplayText = e.Item.SubItems[e.SubItem].Text; e.Cancel = true; @@ -1381,9 +1381,9 @@ namespace TBF.UI.Procedures lvi.SubItems.Add(test.HeatMetersPath); #endif lvi.SubItems.Add(test.MetersPath); - lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBefore) ? "---" : test.RelTransBefore); - lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBetween) ? "---" : test.RelTransBetween); - lvi.SubItems.Add(string.IsNullOrEmpty(test.TransitionAfter) ? "---" : test.TransitionAfter); + lvi.SubItems.Add(string.IsNullOrEmpty(test.TransBefore) ? "---" : test.TransBefore); + lvi.SubItems.Add(string.IsNullOrEmpty(test.TransBetween) ? "---" : test.TransBetween); + lvi.SubItems.Add(string.IsNullOrEmpty(test.TransAfter) ? "---" : test.TransAfter); } processListViewEx.Items.Add(lvi); @@ -1445,21 +1445,21 @@ namespace TBF.UI.Procedures subItemText = lvi.SubItems[column].Text; if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText)) { - test.RelTransBefore = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText; + test.TransBefore = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText; } column = (int)ProcessClmn.TrnBetween; subItemText = lvi.SubItems[column].Text; if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText)) { - test.RelTransBetween = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText; + test.TransBetween = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText; } column = (int)ProcessClmn.TrnStop; subItemText = lvi.SubItems[column].Text; if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText)) { - test.TransitionAfter = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText; + test.TransAfter = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText; } } @@ -2779,7 +2779,7 @@ namespace TBF.UI.Procedures test.Qfrom = (float)qfrom; test.Qto = (float)qto; - test.TstTime = (float)ti.TestTime; + test.TestTime = (float)ti.TestTime; test.Volume = (float)volume; test.ErrLimLo = (float)(ti.ErrLimLoFromDB - ti.Uncertainty); test.ErrLimHi = (float)(ti.ErrLimHiFromDB + ti.Uncertainty); diff --git a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs index 6310b1ecb..7882a5288 100644 --- a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs +++ b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs @@ -54,7 +54,7 @@ namespace TBF.UI.Procedures.TestWizard if (test == null) return; volumeTextBox.Text = test.Volume.ToString(); - durationTextBox.Text = test.TstTime.ToString(); + durationTextBox.Text = test.TestTime.ToString(); errLoPctTextBox.Text = test.ErrLimLo.ToString(); errHiPctTextBox.Text = test.ErrLimHi.ToString(); uncertaintyTextBox.Text = test.Uncertainty.ToString(); @@ -92,7 +92,7 @@ namespace TBF.UI.Procedures.TestWizard void UpdateTest() { test.Volume = Utils.ParseUFloat(volumeTextBox.Text); - test.TstTime = Utils.ParseUFloat(durationTextBox.Text); + test.TestTime = Utils.ParseUFloat(durationTextBox.Text); test.Uncertainty = Utils.ParseUFloat(uncertaintyTextBox.Text); switch (tabId) diff --git a/TBF/UI/Process/ProcessTabPageCtrl24.cs b/TBF/UI/Process/ProcessTabPageCtrl24.cs index 6b5785d60..2d3002950 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl24.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl24.cs @@ -387,7 +387,7 @@ namespace TBF.UI.Process targetFlowHighLabel.Text = args.Test.Qto.ToString("F3"); targetVolumeLabel.Text = args.Test.Volume.ToString("F1"); //targetRefCountLabel.Text = args.TotalPulses.ToString(); - estmtdTimeLabel.Text = args.Test.TstTime.ToString("F1"); + estmtdTimeLabel.Text = args.Test.TestTime.ToString("F1"); /// Names of virtual bench components if (args.BenchPath.PressMtrUp != null) prInCmpntLabel.Text = args.BenchPath.PressMtrUp.Name; diff --git a/TBF/UI/Process/ProcessTabPageCtrl48.cs b/TBF/UI/Process/ProcessTabPageCtrl48.cs index c03d0e8f8..1b82a21be 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl48.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl48.cs @@ -416,7 +416,7 @@ namespace TBF.UI.Process targetFlowHighLabel.Text = args.Test.Qto.ToString("F3"); targetVolumeLabel.Text = args.Test.Volume.ToString("F1"); //targetRefCountLabel.Text = args.TotalPulses.ToString(); - estmtdTimeLabel.Text = args.Test.TstTime.ToString("F1"); + estmtdTimeLabel.Text = args.Test.TestTime.ToString("F1"); /// Names of virtual bench components if (args.BenchPath.PressMtrUp != null) prInCmpntLabel.Text = args.BenchPath.PressMtrUp.Name; diff --git a/TBF/UI/Process/ProcessTabPageCtrl6.cs b/TBF/UI/Process/ProcessTabPageCtrl6.cs index 28408b5ac..ea7d68ca4 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl6.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl6.cs @@ -403,7 +403,7 @@ namespace TBF.UI.Process targetFlowHighLabel.Text = args.Test.Qto.ToString("F3"); targetVolumeLabel.Text = args.Test.Volume.ToString("F1"); //targetRefCountLabel.Text = args.TotalPulses.ToString(); - estmtdTimeLabel.Text = args.Test.TstTime.ToString("F1"); + estmtdTimeLabel.Text = args.Test.TestTime.ToString("F1"); /// Names of virtual bench components if (args.BenchPath.PressMtrUp != null) prInCmpntLabel.Text = args.BenchPath.PressMtrUp.Name; diff --git a/TBF/UI/Process/ProcessTabPageExCtrl.cs b/TBF/UI/Process/ProcessTabPageExCtrl.cs index d3eace188..a52396edc 100644 --- a/TBF/UI/Process/ProcessTabPageExCtrl.cs +++ b/TBF/UI/Process/ProcessTabPageExCtrl.cs @@ -370,7 +370,7 @@ namespace TBF.UI.Process targetFlowHighLabel.Text = args.Test.Qto.ToString("F3"); targetVolumeLabel.Text = args.Test.Volume.ToString("F1"); //targetRefCountLabel.Text = args.TotalPulses.ToString(); - estmtdTimeLabel.Text = args.Test.TstTime.ToString("F1"); + estmtdTimeLabel.Text = args.Test.TestTime.ToString("F1"); /// Names of virtual bench components if (args.OutputPath.FlowMeter != null) refFlowCmpntLabel.Text = args.OutputPath.FlowMeter.Name; diff --git a/Users/Mappings/UserMap.cs b/Users/Mappings/UserMap.cs index 475506e4d..93147bf96 100644 --- a/Users/Mappings/UserMap.cs +++ b/Users/Mappings/UserMap.cs @@ -10,14 +10,16 @@ namespace Users.Mappings public UserMap() { Id(x => x.Id); - Map(x => x.UserName).Column("Name"); + Map(x => x.UserName) + .Column("Name"); Map(x => x.Number); Map(x => x.Tag); Map(x => x.Password); Map(x => x.Password2); Map(x => x.Password3); Map(x => x.Password4); - Map(x => x.FullName).Column("Description"); + Map(x => x.FullName) + .Column("Description"); Map(x => x.LastPwChange); HasManyToMany(x => x.Groups) .Cascade.SaveUpdate()