From 685d57db8b3cf7ab6f433f841634b42aea3cac1a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 10 Oct 2022 08:12:49 +0200 Subject: [PATCH] Clean-up --- .../Printers/Enhanced/FactoryCompound.cs | 7 ++--- .../Printers/Enhanced/FactoryHeatMeters.cs | 6 +++-- .../Output/Printers/Enhanced/FactorySingle.cs | 7 ++--- .../Output/Printers/Enhanced/PrinterCfg.cs | 27 ++++++++++++------- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/TBF/Rig/Output/Printers/Enhanced/FactoryCompound.cs b/TBF/Rig/Output/Printers/Enhanced/FactoryCompound.cs index 19fab9860..7075b4649 100644 --- a/TBF/Rig/Output/Printers/Enhanced/FactoryCompound.cs +++ b/TBF/Rig/Output/Printers/Enhanced/FactoryCompound.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017-2021 Sensus Slovensko a.s. /// using System.Collections.Generic; using Common; @@ -9,13 +9,14 @@ namespace TBF.Rig.Output.Printers.Enhanced { public class FactoryCompound : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(8) + ".Compound"; } } + public string ClassName { get { return GetType().Namespace.Substring(8) + ".Compound"; } } + public override string ToString() { return ClassName; } public IComponent DummyComponent() { return new Printer(); } public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Printer(cfg); } - public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.Compound", this, MetersKind.Combined); } + public IComponentCfg DefaultConfig() { return new PrinterCfg(this, "Printer.Enhanced.Compound", MetersKind.Combined); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/Rig/Output/Printers/Enhanced/FactoryHeatMeters.cs b/TBF/Rig/Output/Printers/Enhanced/FactoryHeatMeters.cs index 4ba9628d3..b23818f0f 100644 --- a/TBF/Rig/Output/Printers/Enhanced/FactoryHeatMeters.cs +++ b/TBF/Rig/Output/Printers/Enhanced/FactoryHeatMeters.cs @@ -1,7 +1,8 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017-2021 Sensus Slovensko a.s. /// using System.Collections.Generic; +using Common; using TBF.Rig.Generic; namespace TBF.Rig.Output.Printers.Enhanced @@ -9,12 +10,13 @@ namespace TBF.Rig.Output.Printers.Enhanced public class FactoryHeatMeters : IComponentFactory { public string ClassName { get { return GetType().Namespace.Substring(8) + ".HeatMeters"; } } + public override string ToString() { return ClassName; } public IComponent DummyComponent() { return new Printer(); } public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Printer(cfg); } - public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.HeatMeters", this, Common.MetersKind.HeatMeter); } + public IComponentCfg DefaultConfig() { return new PrinterCfg(this, "Printer.Enhanced.HeatMeters", MetersKind.HeatMeter); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/Rig/Output/Printers/Enhanced/FactorySingle.cs b/TBF/Rig/Output/Printers/Enhanced/FactorySingle.cs index d191b49b7..263dedcd3 100644 --- a/TBF/Rig/Output/Printers/Enhanced/FactorySingle.cs +++ b/TBF/Rig/Output/Printers/Enhanced/FactorySingle.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017-2021 Sensus Slovensko a.s. /// using System.Collections.Generic; using Common; @@ -9,13 +9,14 @@ namespace TBF.Rig.Output.Printers.Enhanced { public class FactorySingle : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(8) + ".Single"; } } + public string ClassName { get { return GetType().Namespace.Substring(8) + ".Single"; } } + public override string ToString() { return ClassName; } public IComponent DummyComponent() { return new Printer(); } public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Printer(cfg); } - public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.Single", this, MetersKind.Single); } + public IComponentCfg DefaultConfig() { return new PrinterCfg(this, "Printer.Enhanced.Single", MetersKind.Single); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/Rig/Output/Printers/Enhanced/PrinterCfg.cs b/TBF/Rig/Output/Printers/Enhanced/PrinterCfg.cs index 04066fc40..a6b12d0f0 100644 --- a/TBF/Rig/Output/Printers/Enhanced/PrinterCfg.cs +++ b/TBF/Rig/Output/Printers/Enhanced/PrinterCfg.cs @@ -8,12 +8,15 @@ using TBF.Rig.Generic; namespace TBF.Rig.Output.Printers.Enhanced { - public class PrinterCfg : ComponentCfgBase, Generic.IComponentCfg + public class PrinterCfg : ComponentCfgBase, IComponentCfg { public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) + { + return new PrinterCfgCtrl(); + } /// /// Serialized parameters @@ -57,14 +60,21 @@ namespace TBF.Rig.Output.Printers.Enhanced { } - public PrinterCfg(string name, IComponentFactory factory, MetersKind metersKind) + public PrinterCfg(IComponentFactory factory, string name, MetersKind metersKind) : this() { - Name = name; - Factory = factory; - MetersKind = metersKind; - + Factory = factory; + Name = name; ParentName = string.Empty; + MetersKind = metersKind; + + InitializeAll(); + } + + public string ComponentName { get { return Name; } } + + public void InitializeAll() + { Template = string.Empty; PageOrientation = PageOrientation.Portrait; TopMargin = 100; @@ -98,8 +108,7 @@ namespace TBF.Rig.Output.Printers.Enhanced TopMargin, BottomMargin, LeftMargin, - SupressPrinting ? "yes" : "no" - ); + SupressPrinting ? "yes" : "no" ); } } }