Everything works OK after serious changes:
- all components, componentCfg-s and parameter providers use base classes - less boilerplate code, simpler access to test/procedure parameters from code - CreateTestParams(test), CreateProcedureParams(procedure) methods added - TestBenchSim class is made static, it is not inheritted by any device anymore
This commit is contained in:
@@ -6,21 +6,12 @@ using TBF.BenchControl.GenericDevices;
|
||||
|
||||
namespace TBF.BenchControl.DataEntry.Munich
|
||||
{
|
||||
public class EntryForm : Generic.IComponent, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasProtocolTitle
|
||||
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasProtocolTitle
|
||||
{
|
||||
private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Format("Name={0}", Name);
|
||||
}
|
||||
|
||||
public override string ToString() { return string.Format("DataEntry.Munich({0})", Cfg.ToString(1)); }
|
||||
|
||||
readonly EntryFormCfg entryFormCfg;
|
||||
public Generic.IComponentCfg Cfg { get { return entryFormCfg; } }
|
||||
|
||||
public static void ResetStaticProperties() { }
|
||||
|
||||
public string Name { get { return entryFormCfg.Name; } }
|
||||
|
||||
/// <summary>
|
||||
/// Properties set by the Begin and the End form
|
||||
@@ -34,18 +25,11 @@ namespace TBF.BenchControl.DataEntry.Munich
|
||||
public string ProtocolTitle { get { return protocolTitle; } }
|
||||
string protocolTitle;
|
||||
|
||||
/// <summary> Not supported in Munich </summary>
|
||||
public string SerialNr(int wmNr) { return string.Empty; }
|
||||
|
||||
/// <summary> Not supported in Munich </summary>
|
||||
public string SerialNr(int wmNr)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
/// <summary> Not supported in Munich </summary>
|
||||
public float WMState(int wmNr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
public float WMState(int wmNr) { return 0; }
|
||||
|
||||
|
||||
System.Windows.Forms.Form modelessDlg;
|
||||
@@ -63,12 +47,12 @@ namespace TBF.BenchControl.DataEntry.Munich
|
||||
|
||||
CurrentOp currentOp;
|
||||
|
||||
public EntryForm(EntryFormCfg cfg)
|
||||
{
|
||||
if (cfg == null) throw new ArgumentNullException("cfg");
|
||||
this.entryFormCfg = cfg;
|
||||
currentOp = CurrentOp.None;
|
||||
|
||||
public EntryForm(EntryFormCfg cfg)
|
||||
: base(cfg)
|
||||
{
|
||||
entryFormCfg = cfg;
|
||||
currentOp = CurrentOp.None;
|
||||
log.Debug(this.ToString());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user