From dab575dc4972ba1664e10549843348bfd91515a4 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 18 May 2022 10:25:02 +0200 Subject: [PATCH] Clean-up after comparing DataEntry.S620 and SensusOracle with 1837 (iperlNew on WR19), ver. 2.27.1917 --- TBF/Properties/AssemblyInfo.cs | 6 +++--- TBF/Rig/DataEntry/S620/EntryForm.cs | 7 ++++--- TBF/Rig/DataEntry/S620/Factory.cs | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 15c185c95..65d24ca09 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -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")] diff --git a/TBF/Rig/DataEntry/S620/EntryForm.cs b/TBF/Rig/DataEntry/S620/EntryForm.cs index bac491c97..203056f62 100644 --- a/TBF/Rig/DataEntry/S620/EntryForm.cs +++ b/TBF/Rig/DataEntry/S620/EntryForm.cs @@ -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; } diff --git a/TBF/Rig/DataEntry/S620/Factory.cs b/TBF/Rig/DataEntry/S620/Factory.cs index 7a9366ebd..7cd9b5196 100644 --- a/TBF/Rig/DataEntry/S620/Factory.cs +++ b/TBF/Rig/DataEntry/S620/Factory.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.DataEntry.S620 public IComponent GetComponent(IComponentCfg cfg, IList 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) {