From a7c8b90e9f61b3a5be04689c6cadca73db0c2d4d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 14 Jan 2017 14:20:10 +0100 Subject: [PATCH] RoI --> Roi --- DeviceTest/DeviceTestDlg.cs | 12 ++++++------ .../Network/Camera/{RoI => Roi}/Factory.cs | 12 ++++++------ .../Network/Camera/{RoI/RoI.cs => Roi/Roi.cs} | 14 +++++++------- .../Camera/{RoI/RoICfg.cs => Roi/RoiCfg.cs} | 10 +++++----- .../{RoI/RoICfgCtrl.cs => Roi/RoiCfgCtrl.cs} | 12 ++++++------ .../RoiCfgCtrl.designer.cs} | 4 ++-- .../RoICfgCtrl.resx => Roi/RoiCfgCtrl.resx} | 0 .../Camera/{RoI => Roi}/RoiDetectionOp.cs | 4 ++-- .../BenchControl/TbfComponents.cs | 2 +- TestBenchFramework/TBF.csproj | 18 +++++++++--------- 10 files changed, 44 insertions(+), 44 deletions(-) rename TestBenchFramework/BenchControl/Network/Camera/{RoI => Roi}/Factory.cs (58%) rename TestBenchFramework/BenchControl/Network/Camera/{RoI/RoI.cs => Roi/Roi.cs} (83%) rename TestBenchFramework/BenchControl/Network/Camera/{RoI/RoICfg.cs => Roi/RoiCfg.cs} (67%) rename TestBenchFramework/BenchControl/Network/Camera/{RoI/RoICfgCtrl.cs => Roi/RoiCfgCtrl.cs} (89%) rename TestBenchFramework/BenchControl/Network/Camera/{RoI/RoICfgCtrl.designer.cs => Roi/RoiCfgCtrl.designer.cs} (98%) rename TestBenchFramework/BenchControl/Network/Camera/{RoI/RoICfgCtrl.resx => Roi/RoiCfgCtrl.resx} (100%) rename TestBenchFramework/BenchControl/Network/Camera/{RoI => Roi}/RoiDetectionOp.cs (96%) diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs index f5eba75a9..d7b7a3536 100644 --- a/DeviceTest/DeviceTestDlg.cs +++ b/DeviceTest/DeviceTestDlg.cs @@ -211,7 +211,7 @@ namespace DeviceTest { if (className == "Keithley.TempMeter") radioButton1.Text = "ReadPressureOp"; else if (className == "Network.Camera.CLP1611") radioButton1.Text = "Livestream"; - else if (className == "Network.Camera.RoI") radioButton1.Text = "RoiDetection"; + else if (className == "Network.Camera.Roi") radioButton1.Text = "RoiDetection"; else radioButton1.Text = "spare"; } /// @@ -219,7 +219,7 @@ namespace DeviceTest { if (className == "Keithley.TempMeter") radioButton21.Text = "ReadPressureOp"; else if (className == "Network.Camera.CLP1611") radioButton21.Text = "Livestream"; - else if (className == "Network.Camera.RoI") radioButton21.Text = "RoiDetection"; + else if (className == "Network.Camera.Roi") radioButton21.Text = "RoiDetection"; else radioButton21.Text = "spare"; } @@ -493,9 +493,9 @@ namespace DeviceTest operation1 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(); operation2 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).HRLiveStreamOp(); } - else if (tbfComponent4Op is TBF.BenchControl.Network.Camera.RoI.RoI) + else if (tbfComponent4Op is TBF.BenchControl.Network.Camera.Roi.Roi) { - operation1 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.RoI.RoI).RoiDetectionOp(); + operation1 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp(); } @@ -508,9 +508,9 @@ namespace DeviceTest operation21 = (tbfComponent24Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(); operation22 = (tbfComponent24Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).HRLiveStreamOp(); } - else if (tbfComponent24Op is TBF.BenchControl.Network.Camera.RoI.RoI) + else if (tbfComponent24Op is TBF.BenchControl.Network.Camera.Roi.Roi) { - operation21 = (tbfComponent24Op as TBF.BenchControl.Network.Camera.RoI.RoI).RoiDetectionOp(); + operation21 = (tbfComponent24Op as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp(); } diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/Factory.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/Factory.cs similarity index 58% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/Factory.cs rename to TestBenchFramework/BenchControl/Network/Camera/Roi/Factory.cs index 6fda195e8..23460bae7 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/RoI/Factory.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/Factory.cs @@ -4,23 +4,23 @@ using System.Collections.Generic; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.Network.Camera.RoI +namespace TBF.BenchControl.Network.Camera.Roi { public class Factory : IComponentFactory { public string ClassName { get { return this.GetType().Namespace.Substring(17); } } - public void ResetStaticProperties() { RoI.ResetStaticProperties(); } + public void ResetStaticProperties() { Roi.ResetStaticProperties(); } - public IComponent DummyComponent() { return new RoI(); } + public IComponent DummyComponent() { return new Roi(); } - public IComponent GetComponent(IComponentCfg cfg, IList components) { return new RoI(cfg, components); } + public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Roi(cfg, components); } - public IComponentCfg DefaultConfig() { return new RoICfg(this.GetType().Namespace.Substring(17), this); } + public IComponentCfg DefaultConfig() { return new RoiCfg(this.GetType().Namespace.Substring(17), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { - return ComponentCfgBase.CreateFromDbEntity(typeof(RoICfg), component, this); + return ComponentCfgBase.CreateFromDbEntity(typeof(RoiCfg), component, this); } } } diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoI.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs similarity index 83% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/RoI.cs rename to TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs index bdea1578d..75d4f0ace 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoI.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs @@ -6,17 +6,17 @@ using System.Collections.Generic; using log4net; using Config.Entities; -namespace TBF.BenchControl.Network.Camera.RoI +namespace TBF.BenchControl.Network.Camera.Roi { - public class RoI : ComponentBase + public class Roi : ComponentBase { - private static readonly ILog log = LogManager.GetLogger(typeof(RoI)); + private static readonly ILog log = LogManager.GetLogger(typeof(Roi)); public override string ToString() { return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1)); } - protected readonly RoICfg roiCfg; + protected readonly RoiCfg roiCfg; readonly CLP1611.Camera camera; readonly Telnet.TelnetClient telnet; @@ -28,14 +28,14 @@ namespace TBF.BenchControl.Network.Camera.RoI Boxes.IntBox oroiHgh; - public RoI() + public Roi() { } - public RoI(Generic.IComponentCfg cfg, IList components) + public Roi(Generic.IComponentCfg cfg, IList components) : base(cfg) { - roiCfg = cfg as RoICfg; + roiCfg = cfg as RoiCfg; camera = TbfComponents.FindComponent(cfg.ParentName, components) as CLP1611.Camera; if (camera != null) telnet = camera.Telnet; diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfg.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs similarity index 67% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfg.cs rename to TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs index 2f367e092..832090917 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfg.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs @@ -3,11 +3,11 @@ /// using TBF.BenchControl.Generic; -namespace TBF.BenchControl.Network.Camera.RoI +namespace TBF.BenchControl.Network.Camera.Roi { - public class RoICfg : ComponentCfgBase, IChildComponentCfg + public class RoiCfg : ComponentCfgBase, IChildComponentCfg { - public IComponentCfgCtrl GetControl() { return new RoICfgCtrl(); } + public IComponentCfgCtrl GetControl() { return new RoiCfgCtrl(); } /// /// Serialized parameters @@ -15,9 +15,9 @@ namespace TBF.BenchControl.Network.Camera.RoI public string Args; /// Private parameterless constructor invoked by all other (public) constructors - RoICfg() { } + RoiCfg() { } - public RoICfg(string name, IComponentFactory factory) + public RoiCfg(string name, IComponentFactory factory) : this() { Name = name; diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs similarity index 89% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.cs rename to TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs index 82f8dfa69..58f9ce5b4 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs @@ -6,28 +6,28 @@ using System.Windows.Forms; using log4net; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.Network.Camera.RoI +namespace TBF.BenchControl.Network.Camera.Roi { - public partial class RoICfgCtrl : UserControl, IComponentCfgCtrl + public partial class RoiCfgCtrl : UserControl, IComponentCfgCtrl { - static readonly ILog log = LogManager.GetLogger(typeof(RoICfgCtrl)); + static readonly ILog log = LogManager.GetLogger(typeof(RoiCfgCtrl)); ComponentParametersDlg parent; public bool ShowMore { get { return false; } } - RoICfg config; + RoiCfg config; public IComponentCfg Config { get { return config as IComponentCfg; } set { - config = value as RoICfg; + config = value as RoiCfg; Redraw(); } } - public RoICfgCtrl() + public RoiCfgCtrl() { InitializeComponent(); } diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.designer.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs similarity index 98% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.designer.cs rename to TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs index 6142122b7..379042d60 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.designer.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs @@ -1,9 +1,9 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// -namespace TBF.BenchControl.Network.Camera.RoI +namespace TBF.BenchControl.Network.Camera.Roi { - partial class RoICfgCtrl + partial class RoiCfgCtrl { /// /// Required designer variable. diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.resx b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.resx rename to TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoiDetectionOp.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs similarity index 96% rename from TestBenchFramework/BenchControl/Network/Camera/RoI/RoiDetectionOp.cs rename to TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs index 2283adf7a..f6f50b92b 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/RoI/RoiDetectionOp.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs @@ -1,6 +1,6 @@ using TBF.BenchControl.Network.Telnet; -namespace TBF.BenchControl.Network.Camera.RoI +namespace TBF.BenchControl.Network.Camera.Roi { public class RoiDetectionOp : IOperation { @@ -25,7 +25,7 @@ namespace TBF.BenchControl.Network.Camera.RoI /// Events: Event.None or Event.Error /// /// CLP1611.Camera reference - public RoiDetectionOp(RoI roi, CLP1611.Camera camera, Telnet.TelnetClient telnet, string command, + public RoiDetectionOp(Roi roi, CLP1611.Camera camera, Telnet.TelnetClient telnet, string command, Boxes.IntBox oroiX, Boxes.IntBox oroiY, Boxes.IntBox oroiWid, diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs index b3e3b7ded..9c6d82030 100644 --- a/TestBenchFramework/BenchControl/TbfComponents.cs +++ b/TestBenchFramework/BenchControl/TbfComponents.cs @@ -73,7 +73,7 @@ namespace TBF.BenchControl Factories.Add(new Modbus.PressureMeter.Meret.Factory()); /// Meret pressure meter connected via modbus Factories.Add(new Network.Adapter.Factory()); Factories.Add(new Network.Camera.CLP1611.Factory()); - Factories.Add(new Network.Camera.RoI.Factory()); + Factories.Add(new Network.Camera.Roi.Factory()); Factories.Add(new Output.FileWriters.Basic.FactorySingle()); /// Output.FileWriters.Basic.Single Factories.Add(new Output.FileWriters.Basic.FactoryCompound()); /// Output.FileWriters.Basic.Compound Factories.Add(new Output.FileWriters.Basic.FactoryHeatMeters()); /// Output.FileWriters.Basic.FactoryHeatMeters diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index 9b42ebf50..71811e0ea 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -520,16 +520,16 @@ TerminalDlg.cs - - - + + + UserControl - - RoICfgCtrl.cs + + RoiCfgCtrl.cs - - + + @@ -1842,8 +1842,8 @@ TerminalDlg.cs - - RoICfgCtrl.cs + + RoiCfgCtrl.cs AskYesNoForm.cs