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

(1) ParamsProvider-s added to C..Test/C..Procedure entities, (2) ComponentCfgBase fn-s returning IParamsProvider rewritten, (3) refactoring, ver. 2.18.891

Browse Source
This commit is contained in:
Milan Hanajik
2018-05-11 16:51:07 +02:00
parent 878c89591e
commit d6881bfdf3
77 changed files with 495 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/WaterMeters/Munich/ProcParams.cs
+2 -2
View File
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.WaterMeters.Munich
public class ProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcParams) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
public override XmlSerializer GetSerializer() { return Serializer; }
public string ProductName; /// Znak fabryczny (PL)
public string Producer; /// Producent (PL), Hersteller (D)
@@ -164,7 +164,7 @@ namespace TBF.BenchControl.WaterMeters.Munich
return pars;
}
public override void UpdateProcedureParams(ComponentProcedure dbEntity)
public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
{
if (dbEntity == null) return;
try
TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs
+5 -10
View File
@@ -14,28 +14,23 @@ namespace TBF.BenchControl.WaterMeters.Munich
public class WaterMeterCfg : ComponentCfgBase, Generic.IComponentCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WaterMeterCfg) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
protected override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new WaterMeterCfgCtrl(); }
/// <summary> Procedure parameters </summary>
[XmlIgnore]
public ProcParams ProcParams;
public override IParamsProvider GetProcedureParams() { return ProcParams; }
public override IParamsProvider CreateProcedureParams(Procedure procedure)
{
ProcParams procParams = new ProcParams(true);
procParams.UpdateProcedureParams(Name, procedure);
return procParams;
}
public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
public override IParamsProvider CreateProcParamsProvider() { return new ProcParams(true); }
/// Private parameterless constructor invoked by all other (public) constructors
WaterMeterCfg()
{
Name = "WM";
ParentName = string.Empty;
ProcParams = new ProcParams(true);
}
ProcParams = CreateProcParamsProvider() as ProcParams;
}
public WaterMeterCfg(IComponentFactory factory)
: this()
TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs
+2 -2
View File
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
public class ProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcParams) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
public override XmlSerializer GetSerializer() { return Serializer; }
public string ProductName; /// Znak fabryczny (PL)
@@ -305,7 +305,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
return pars;
}
public override void UpdateProcedureParams(ComponentProcedure dbEntity)
public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
{
if (dbEntity == null) return;
try
TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs
+4 -9
View File
@@ -18,21 +18,16 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
/// <summary> Procedure parameters </summary>
[XmlIgnore]
public ProcParams ProcParams;
public override IParamsProvider GetProcedureParams() { return ProcParams; }
public override IParamsProvider CreateProcedureParams(Procedure procedure)
{
ProcParams procParams = new ProcParams(true);
procParams.UpdateProcedureParams(Name, procedure);
return procParams;
}
public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
public override IParamsProvider CreateProcParamsProvider() { return new ProcParams(true); }
/// Private parameterless constructor invoked by all other (public) constructors
WaterMeterCfg()
{
Name = "WM";
ParentName = string.Empty;
ProcParams = new ProcParams(true);
}
ProcParams = CreateProcParamsProvider() as ProcParams;
}
public WaterMeterCfg(IComponentFactory factory)
: this()