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,8 +6,8 @@ using TBF.Resources;
|
||||
|
||||
namespace TBF.UiControls
|
||||
{
|
||||
/// /---------------\
|
||||
/// / Path or other \
|
||||
/// ---------------
|
||||
/// / Path or other \
|
||||
/// |------------------------------
|
||||
/// | param1 param2 param3 ...
|
||||
/// Component1 |
|
||||
@@ -64,20 +64,10 @@ namespace TBF.UiControls
|
||||
|
||||
foreach (var cmpnt in selectedCmpnts)
|
||||
{
|
||||
if (cmpnt != null && cmpnt.Cfg.Factory.HasProcedureParams)
|
||||
if (cmpnt != null && (cmpnt.Cfg.GetProcedureParams() != null))
|
||||
{
|
||||
IParamsProvider procedureParams = BenchControl.TbfComponents.GetProcedureParams(cmpnt, parent.LoadedProcedure);
|
||||
if (procedureParams != null)
|
||||
{
|
||||
if (sampleToCreateHeader == null) sampleToCreateHeader = procedureParams;
|
||||
}
|
||||
else
|
||||
{
|
||||
Entities.ComponentProcedure entity = new Entities.ComponentProcedure();
|
||||
entity.CmpntName = cmpnt.Cfg.Name;
|
||||
entity.Procedure = parent.LoadedProcedure;
|
||||
procedureParams = cmpnt.Cfg.Factory.GetProcedureParams(entity);
|
||||
}
|
||||
IParamsProvider procedureParams = cmpnt.Cfg.CreateProcedureParams(parent.LoadedProcedure);
|
||||
if (sampleToCreateHeader == null) sampleToCreateHeader = procedureParams;
|
||||
cmpntsParams.Add(procedureParams);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user