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
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/ComponentCfgBase.cs
+3 -3
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;
TBF/BenchControl/DataContainers/BackupAndSecurityOptions/Component.cs → TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Component.cs
+1 -1
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.
TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs → TBF/BenchControl/DataContainer/BackupAndSecurityOptions/ComponentCfg.cs
+3 -3
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();
}
TBF/BenchControl/DataContainers/Density/ComponentFactory.cs → TBF/BenchControl/DataContainer/BackupAndSecurityOptions/Factory.cs
+4 -4
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)
{
TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs → TBF/BenchControl/DataContainer/BenchInfo/Component.cs
+2 -2
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;
TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs → TBF/BenchControl/DataContainer/BenchInfo/ComponentCfg.cs
+3 -3
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();
}
TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentFactory.cs → TBF/BenchControl/DataContainer/BenchInfo/Factory.cs
+4 -4
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)
{
TBF/BenchControl/DataContainers/Buoyancy/Component.cs → TBF/BenchControl/DataContainer/Buoyancy/Component.cs
+1 -1
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.
TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs → TBF/BenchControl/DataContainer/Buoyancy/ComponentCfg.cs
+1 -1
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.
TBF/BenchControl/DataContainers/Buoyancy/ComponentFactory.cs → TBF/BenchControl/DataContainer/Buoyancy/Factory.cs
+4 -4
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)
{
TBF/BenchControl/DataContainers/Density/Component.cs → TBF/BenchControl/DataContainer/Density/Component.cs
+5 -5
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());
}
TBF/BenchControl/DataContainers/Density/ComponentCfg.cs → TBF/BenchControl/DataContainer/Density/ComponentCfg.cs
+14 -14
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()
TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentFactory.cs → TBF/BenchControl/DataContainer/Density/Factory.cs
+4 -4
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)
{
TBF/BenchControl/DataContainers/Evaporation/Component.cs → TBF/BenchControl/DataContainer/Evaporation/Component.cs
+1 -1
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
{
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfg.cs
+1 -1
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.
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.cs
+1 -1
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
{
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.designer.cs → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.designer.cs
Generated
+1 -1
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
{
TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.resx → TBF/BenchControl/DataContainer/Evaporation/EvaporationCfgCtrl.resx
View File
TBF/BenchControl/DataContainers/Evaporation/Factory.cs → TBF/BenchControl/DataContainer/Evaporation/Factory.cs
+3 -3
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)
{
TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs → TBF/BenchControl/DataContainer/iPerlBenchInfo/Component.cs
+1 -1
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.
TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs → TBF/BenchControl/DataContainer/iPerlBenchInfo/ComponentCfg.cs
+1 -1
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.
TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentFactory.cs → TBF/BenchControl/DataContainer/iPerlBenchInfo/Factory.cs
+4 -4
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)
{
TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
+2 -2
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))
{
TBF/BenchControl/FeedingPath.cs
+1 -1
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] : "---";
TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
+1 -1
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);
}
TBF/BenchControl/OutputPath.cs
+2 -2
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];
TBF/BenchControl/Sequences/MainSeq.cs
+4 -4
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));
TBF/BenchControl/Sequences/SequenceBase.cs
+2 -2
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
TBF/BenchControl/StateMachine.cs
+3 -3
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)
TBF/BenchControl/TbfComponents.cs
+6 -6
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());
TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+1 -1
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>();
TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+3 -3
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)
TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
+2 -2
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))
TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
+4 -4
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)
TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+3 -3
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
TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
+1 -1
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>();
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+2 -2
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
TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+2 -2
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
TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+2 -2
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
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+2 -2
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;
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+5 -5
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;
TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
+2 -2
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
TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
+1 -1
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>();
TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+1 -1
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>();
TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
+1 -1
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>();
TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs
+2 -2
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();
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
+2 -2
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);