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

Database cleanup, columns correctly renamed, DataContainer namespace, etc.

Browse Source
This commit is contained in:
Milan Hanajik 2021-02-24 17:42:50 +01:00
parent a9d6fa631c
commit b5f8d06e5b
91 changed files with 390 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Data.cs
View File

@ -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;
}
}

4
Config/Entities/BenchPath.cs
View File

@ -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;

68
Config/Entities/Component.cs
View File

@ -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<MeasurementCorrection> Corrections { get; set; }
public virtual IList<Uncertainty> 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;

16
Config/Entities/FeedingPath.cs
View File

@ -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;
}

30
Config/Entities/OutputPath.cs
View File

@ -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;

64
Config/Entities/Test.cs
View File

@ -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();
}

4
Config/Formulas.cs
View File

@ -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; }

9
Config/Mappings/BenchPathMap.cs
View File

@ -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)

6
Config/Mappings/ComponentMap.cs
View File

@ -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)");

3
Config/Mappings/FeedingPathMap.cs
View File

@ -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)");

9
Config/Mappings/OutputPathMap.cs
View File

@ -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)");

29
Config/Mappings/TestMap.cs
View File

@ -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<byte>();
.CustomType<byte>();
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();

6
Config/Mappings/UserMap.cs
View File

@ -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()

4
Results/BatchResults.cs
View File

@ -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

18
Results/Entities/Batch.cs
View File

@ -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();

2
Results/Entities/TestData.cs
View File

@ -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;

6
Results/Mappings/BatchMap.cs
View File

@ -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);

2
Results/Mappings/TestDataMap.cs
View File

@ -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);
}

34
Results/Mappings/TestRsltMap.cs
View File

@ -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);

2
Results/Output/SensusTestInfo.cs
View File

@ -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,

6
Results/WMeterRsltItemSpec.cs
View File

@ -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)));

6
TBF/BenchControl/ComponentCfgBase.cs
View File

@ -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;

2
TBF/BenchControl/DataContainers/BackupAndSecurityOptions/Component.cs → TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Component.cs
View File

@ -4,7 +4,7 @@
using System;
using log4net;
namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions
namespace TBF.BenchControl.DataContainer.BackupAndSecurityOptions
{
/// <summary>
/// Holds backup and security options.

6
TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs → TBF/BenchControl/DataContainer/BackupAndSecurityOptions/ComponentCfg.cs
View File

@ -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
{
/// <summary>
/// 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();
}

8
TBF/BenchControl/DataContainers/Density/ComponentFactory.cs → TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Factory.cs
View File

@ -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<IComponent> 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)
{

4
TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs → TBF/BenchControl/DataContainer/BenchInfo/Component.cs
View File

@ -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
{
/// <summary>
/// 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;

6
TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs → TBF/BenchControl/DataContainer/BenchInfo/ComponentCfg.cs
View File

@ -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
{
/// <summary>
/// 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();
}

8
TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentFactory.cs → TBF/BenchControl/DataContainer/BenchInfo/Factory.cs
View File

@ -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<IComponent> 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)
{

2
TBF/BenchControl/DataContainers/Buoyancy/Component.cs → TBF/BenchControl/DataContainer/Buoyancy/Component.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using log4net;
using TBF.Resources;
namespace TBF.BenchControl.DataContainers.Buoyancy
namespace TBF.BenchControl.DataContainer.Buoyancy
{
/// <summary>
/// Holds measured (true) buoyancy value.

2
TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs → TBF/BenchControl/DataContainer/Buoyancy/ComponentCfg.cs
View File

@ -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
{
/// <summary>
/// Holds backup and security options - serializable configuration.

8
TBF/BenchControl/DataContainers/Buoyancy/ComponentFactory.cs → TBF/BenchControl/DataContainer/Buoyancy/Factory.cs
View File

@ -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<IComponent> 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)
{

10
TBF/BenchControl/DataContainers/Density/Component.cs → TBF/BenchControl/DataContainer/Density/Component.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using log4net;
using TBF.Resources;
namespace TBF.BenchControl.DataContainers.Density
namespace TBF.BenchControl.DataContainer.Density
{
/// <summary>
/// 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());
}

28
TBF/BenchControl/DataContainers/Density/ComponentCfg.cs → TBF/BenchControl/DataContainer/Density/ComponentCfg.cs
View File

@ -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
{
/// <summary>
/// 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()

8
TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentFactory.cs → TBF/BenchControl/DataContainer/Density/Factory.cs
View File

@ -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<IComponent> 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)
{

2
TBF/BenchControl/DataContainers/Evaporation/Component.cs → TBF/BenchControl/DataContainer/Evaporation/Component.cs
View File

@ -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
{

2
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfg.cs
View File

@ -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
{
/// <summary>
/// Holds backup and security options - serializable configuration.

2
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.cs
View File

@ -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
{

2
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.designer.cs → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
namespace TBF.BenchControl.DataContainers.Evaporation
namespace TBF.BenchControl.DataContainer.Evaporation
{
partial class EvaporationCfgCtrl
{

0
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.resx → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.resx
View File

6
TBF/BenchControl/DataContainers/Evaporation/Factory.cs → TBF/BenchControl/DataContainer/Evaporation/Factory.cs
View File

@ -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<IComponent> 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)
{

2
TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs → TBF/BenchControl/DataContainer/iPerlBenchInfo/Component.cs
View File

@ -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
{
/// <summary>
/// Holds information identifying the test bench.

2
TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs → TBF/BenchControl/DataContainer/iPerlBenchInfo/ComponentCfg.cs
View File

@ -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
{
/// <summary>
/// Holds information identifying the test bench - serializable configuration.

8
TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentFactory.cs → TBF/BenchControl/DataContainer/iPerlBenchInfo/Factory.cs
View File

@ -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<IComponent> 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)
{

4
TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
View File

@ -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))
{

2
TBF/BenchControl/FeedingPath.cs
View File

@ -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] : "---";

2
TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
View File

@ -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);
}

4
TBF/BenchControl/OutputPath.cs
View File

@ -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];

8
TBF/BenchControl/Sequences/MainSeq.cs
View File

@ -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));

4
TBF/BenchControl/Sequences/SequenceBase.cs
View File

@ -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

6
TBF/BenchControl/StateMachine.cs
View File

@ -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)

12
TBF/BenchControl/TbfComponents.cs
View File

@ -15,12 +15,12 @@ namespace TBF.BenchControl
{
Factories = new List<IComponentFactory>();
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());

2
TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();

6
TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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)

4
TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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))

8
TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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)

6
TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

6
TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

6
TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

6
TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

6
TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

6
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

6
TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

2
TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();

4
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

4
TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

4
TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

4
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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;

10
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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;

4
TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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

2
TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();

2
TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();

2
TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();

4
TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs
View File

@ -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<IOperation> readTempPressOps = new List<IOperation>();
@ -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();

4
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
View File

@ -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);

42
TBF/TBF.csproj
View File

@ -250,30 +250,30 @@
<Compile Include="BenchControl\ControlBoard\Uni\ScopeAnalyzerData.cs" />
<Compile Include="BenchControl\ControlBoard\Uni\SwitchCountersData.cs" />
<Compile Include="BenchControl\ControlBoard\Uni\ValveMoveMsg.cs" />
<Compile Include="BenchControl\DataContainers\BackupAndSecurityOptions\Component.cs" />
<Compile Include="BenchControl\DataContainers\BackupAndSecurityOptions\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\BackupAndSecurityOptions\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\Extended\Component.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\Extended\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\Extended\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\iPerl\Component.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\iPerl\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\iPerl\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\Buoyancy\Component.cs" />
<Compile Include="BenchControl\DataContainers\Buoyancy\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\Buoyancy\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\Density\Component.cs" />
<Compile Include="BenchControl\DataContainers\Density\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\Density\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\Evaporation\Component.cs" />
<Compile Include="BenchControl\DataContainers\Evaporation\EvaporationCfg.cs" />
<Compile Include="BenchControl\DataContainers\Evaporation\Factory.cs" />
<Compile Include="BenchControl\DataContainers\Evaporation\EvaporationCfgCtrl.cs">
<Compile Include="BenchControl\DataContainer\BackupAndSecurityOptions\Component.cs" />
<Compile Include="BenchControl\DataContainer\BackupAndSecurityOptions\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainer\BackupAndSecurityOptions\Factory.cs" />
<Compile Include="BenchControl\DataContainer\BenchInfo\Component.cs" />
<Compile Include="BenchControl\DataContainer\BenchInfo\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainer\BenchInfo\Factory.cs" />
<Compile Include="BenchControl\DataContainer\Buoyancy\Component.cs" />
<Compile Include="BenchControl\DataContainer\Buoyancy\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainer\Buoyancy\Factory.cs" />
<Compile Include="BenchControl\DataContainer\Density\Component.cs" />
<Compile Include="BenchControl\DataContainer\Density\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainer\Density\Factory.cs" />
<Compile Include="BenchControl\DataContainer\Evaporation\Component.cs" />
<Compile Include="BenchControl\DataContainer\Evaporation\EvaporationCfg.cs" />
<Compile Include="BenchControl\DataContainer\Evaporation\Factory.cs" />
<Compile Include="BenchControl\DataContainer\Evaporation\EvaporationCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\DataContainers\Evaporation\EvaporationCfgCtrl.designer.cs">
<Compile Include="BenchControl\DataContainer\Evaporation\EvaporationCfgCtrl.designer.cs">
<DependentUpon>EvaporationCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataContainer\iPerlBenchInfo\Component.cs" />
<Compile Include="BenchControl\DataContainer\iPerlBenchInfo\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainer\iPerlBenchInfo\Factory.cs" />
<Compile Include="BenchControl\DataEntry\Combined\TestStartEndForm.cs">
<SubType>Form</SubType>
</Compile>
@ -2698,7 +2698,7 @@
<EmbeddedResource Include="BenchControl\Danfoss\VLT2800\PumpCfgCtrl.resx">
<DependentUpon>PumpCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataContainers\Evaporation\EvaporationCfgCtrl.resx">
<EmbeddedResource Include="BenchControl\DataContainer\Evaporation\EvaporationCfgCtrl.resx">
<DependentUpon>EvaporationCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\Combined\CycleBeginningForm.resx">

20
TBF/UI/Bench/Components/ComponentsManagerDlg.cs
View File

@ -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();

22
TBF/UI/Bench/Metrology/MetrologyDlg.cs
View File

@ -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 + " ");

2
TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.cs
View File

@ -28,7 +28,7 @@ namespace TBF.UI.Bench.Metrology
/// <summary>
/// Buoyancy configuration
/// </summary>
public BenchControl.DataContainers.Buoyancy.ComponentCfg BuoyancyCfg;
public BenchControl.DataContainer.Buoyancy.ComponentCfg BuoyancyCfg;
/// <summary>
/// A list of 'measurement-correction' pairs to be deleted from the database on OK.

16
TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
View File

@ -28,7 +28,7 @@ namespace TBF.UI.Bench.Metrology
/// <summary>
/// Density configuration
/// </summary>
public BenchControl.DataContainers.Density.ComponentCfg DensityCfg;
public BenchControl.DataContainer.Density.ComponentCfg DensityCfg;
/// <summary>
/// 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;

4
TBF/UI/Bench/Paths/PathsFeedingCtrl.cs
View File

@ -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

4
TBF/UI/Bench/Paths/PathsOutputCtrl.cs
View File

@ -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;

24
TBF/UI/Bench/Transitions/TransitionsDlg.cs
View File

@ -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<Config.Entities.Test>()
.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<Config.Entities.Test>()
.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);
}

4
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
View File

@ -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);

2
TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs
View File

@ -31,7 +31,7 @@ namespace TBF.UI.Bench.Uncertainties
/// <summary>
/// Balance configuration (with buoyancy parameters)
/// </summary>
public BenchControl.DataContainers.Density.ComponentCfg DensityCfg;
public BenchControl.DataContainer.Density.ComponentCfg DensityCfg;
/// <summary>
/// A list of 'measurement-correction' pairs to be deleted from the database on OK.

26
TBF/UI/Procedures/ProcedureDlg.cs
View File

@ -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);

4
TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
View File

@ -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)

2
TBF/UI/Process/ProcessTabPageCtrl24.cs
View File

@ -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;

2
TBF/UI/Process/ProcessTabPageCtrl48.cs
View File

@ -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;

2
TBF/UI/Process/ProcessTabPageCtrl6.cs
View File

@ -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;

2
TBF/UI/Process/ProcessTabPageExCtrl.cs
View File

@ -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;

6
Users/Mappings/UserMap.cs
View File

@ -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()