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

Clean-up after comparing DataEntry.S620 and SensusOracle with 1837 (iperlNew on WR19), ver. 2.27.1917

Browse Source
This commit is contained in:
Milan Hanajik 2022-05-18 10:25:02 +02:00
parent 2c91ded0db
commit dab575dc49
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TBF/Properties/AssemblyInfo.cs
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sensus")]
[assembly: AssemblyProduct("TestBenchFramework")]
[assembly: AssemblyCopyright("Copyright © 2013 - 2021 Sensus Slovensko, a.s.")]
[assembly: AssemblyCopyright("Copyright © 2013 - 2022 Sensus Slovensko, a.s.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.27.1875.0")]
[assembly: AssemblyFileVersion("2.27.1875.0")]
[assembly: AssemblyVersion("2.27.1917.0")]
[assembly: AssemblyFileVersion("2.27.1917.0")]

7
TBF/Rig/DataEntry/S620/EntryForm.cs
View File

@ -7,6 +7,7 @@ using log4net;
using Config.Entities;
using TBF.Rig;
using TBF.Rig.GenericDevices;
using TBF.Rig.Sequences;
namespace TBF.Rig.DataEntry.S620
{
@ -69,7 +70,7 @@ namespace TBF.Rig.DataEntry.S620
{
entryFormCfg = cfg as EntryFormCfg;
tracing = (TBF.Rig.Output.DB.ProductionTracing.Tracing)TbfComponents.FindComponent(cfg.ParentName, components);
tracing = TbfComponents.FindComponent(cfg.ParentName, components) as TBF.Rig.Output.DB.ProductionTracing.Tracing;
if (tracing == null) throw new Exception("Cannot find " + Name + " parent");
}
@ -90,7 +91,7 @@ namespace TBF.Rig.DataEntry.S620
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.ShowFormAtCycleBeginning;
this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
return this;
}
@ -99,7 +100,7 @@ namespace TBF.Rig.DataEntry.S620
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.ShowFormAtCycleEnd;
this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
return this;
}

2
TBF/Rig/DataEntry/S620/Factory.cs
View File

@ -14,7 +14,7 @@ namespace TBF.Rig.DataEntry.S620
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg, components); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this.GetType().Namespace.Substring(8), this); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(GetType().Namespace.Substring(8), this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{