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

RoI --> Roi

Browse Source
This commit is contained in:
Milan Hanajik 2017-01-14 14:20:10 +01:00
parent 8e058cebbb
commit a7c8b90e9f
10 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DeviceTest/DeviceTestDlg.cs
View File

@ -211,7 +211,7 @@ namespace DeviceTest
{ {
if (className == "Keithley.TempMeter") radioButton1.Text = "ReadPressureOp"; if (className == "Keithley.TempMeter") radioButton1.Text = "ReadPressureOp";
else if (className == "Network.Camera.CLP1611") radioButton1.Text = "Livestream"; 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"; else radioButton1.Text = "spare";
} }
/// ///
@ -219,7 +219,7 @@ namespace DeviceTest
{ {
if (className == "Keithley.TempMeter") radioButton21.Text = "ReadPressureOp"; if (className == "Keithley.TempMeter") radioButton21.Text = "ReadPressureOp";
else if (className == "Network.Camera.CLP1611") radioButton21.Text = "Livestream"; 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"; else radioButton21.Text = "spare";
} }
@ -493,9 +493,9 @@ namespace DeviceTest
operation1 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(); operation1 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp();
operation2 = (tbfComponent4Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).HRLiveStreamOp(); 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(); operation21 = (tbfComponent24Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp();
operation22 = (tbfComponent24Op as TBF.BenchControl.Network.Camera.CLP1611.Camera).HRLiveStreamOp(); 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();
} }

12
TestBenchFramework/BenchControl/Network/Camera/RoI/Factory.cs → TestBenchFramework/BenchControl/Network/Camera/Roi/Factory.cs
View File

@ -4,23 +4,23 @@
using System.Collections.Generic; using System.Collections.Generic;
using TBF.BenchControl.Generic; using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Network.Camera.RoI namespace TBF.BenchControl.Network.Camera.Roi
{ {
public class Factory : IComponentFactory public class Factory : IComponentFactory
{ {
public string ClassName { get { return this.GetType().Namespace.Substring(17); } } 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<IComponent> components) { return new RoI(cfg, components); } public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> 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) public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{ {
return ComponentCfgBase.CreateFromDbEntity(typeof(RoICfg), component, this); return ComponentCfgBase.CreateFromDbEntity(typeof(RoiCfg), component, this);
} }
} }
} }

14
TestBenchFramework/BenchControl/Network/Camera/RoI/RoI.cs → TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
View File

@ -6,17 +6,17 @@ using System.Collections.Generic;
using log4net; using log4net;
using Config.Entities; 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() public override string ToString()
{ {
return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1)); 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 CLP1611.Camera camera;
readonly Telnet.TelnetClient telnet; readonly Telnet.TelnetClient telnet;
@ -28,14 +28,14 @@ namespace TBF.BenchControl.Network.Camera.RoI
Boxes.IntBox oroiHgh; Boxes.IntBox oroiHgh;
public RoI() public Roi()
{ {
} }
public RoI(Generic.IComponentCfg cfg, IList<Generic.IComponent> components) public Roi(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
: base(cfg) : base(cfg)
{ {
roiCfg = cfg as RoICfg; roiCfg = cfg as RoiCfg;
camera = TbfComponents.FindComponent(cfg.ParentName, components) as CLP1611.Camera; camera = TbfComponents.FindComponent(cfg.ParentName, components) as CLP1611.Camera;
if (camera != null) telnet = camera.Telnet; if (camera != null) telnet = camera.Telnet;

10
TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfg.cs → TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs
View File

@ -3,11 +3,11 @@
/// ///
using TBF.BenchControl.Generic; 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 /// Serialized parameters
@ -15,9 +15,9 @@ namespace TBF.BenchControl.Network.Camera.RoI
public string Args; public string Args;
/// Private parameterless constructor invoked by all other (public) constructors /// Private parameterless constructor invoked by all other (public) constructors
RoICfg() { } RoiCfg() { }
public RoICfg(string name, IComponentFactory factory) public RoiCfg(string name, IComponentFactory factory)
: this() : this()
{ {
Name = name; Name = name;

12
TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.cs → TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs
View File

@ -6,28 +6,28 @@ using System.Windows.Forms;
using log4net; using log4net;
using TBF.BenchControl.Generic; 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; ComponentParametersDlg parent;
public bool ShowMore { get { return false; } } public bool ShowMore { get { return false; } }
RoICfg config; RoiCfg config;
public IComponentCfg Config public IComponentCfg Config
{ {
get { return config as IComponentCfg; } get { return config as IComponentCfg; }
set set
{ {
config = value as RoICfg; config = value as RoiCfg;
Redraw(); Redraw();
} }
} }
public RoICfgCtrl() public RoiCfgCtrl()
{ {
InitializeComponent(); InitializeComponent();
} }

4
TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.designer.cs → TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs generated
View File

@ -1,9 +1,9 @@
/// ///
/// Copyright (c) 2017 Sensus Metering Systems /// Copyright (c) 2017 Sensus Metering Systems
/// ///
namespace TBF.BenchControl.Network.Camera.RoI namespace TBF.BenchControl.Network.Camera.Roi
{ {
partial class RoICfgCtrl partial class RoiCfgCtrl
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.

0
TestBenchFramework/BenchControl/Network/Camera/RoI/RoICfgCtrl.resx → TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx
View File

4
TestBenchFramework/BenchControl/Network/Camera/RoI/RoiDetectionOp.cs → TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs
View File

@ -1,6 +1,6 @@
using TBF.BenchControl.Network.Telnet; using TBF.BenchControl.Network.Telnet;
namespace TBF.BenchControl.Network.Camera.RoI namespace TBF.BenchControl.Network.Camera.Roi
{ {
public class RoiDetectionOp : IOperation public class RoiDetectionOp : IOperation
{ {
@ -25,7 +25,7 @@ namespace TBF.BenchControl.Network.Camera.RoI
/// Events: Event.None or Event.Error /// Events: Event.None or Event.Error
/// </summary> /// </summary>
/// <param name="camera">CLP1611.Camera reference</param> /// <param name="camera">CLP1611.Camera reference</param>
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 oroiX,
Boxes.IntBox oroiY, Boxes.IntBox oroiY,
Boxes.IntBox oroiWid, Boxes.IntBox oroiWid,

2
TestBenchFramework/BenchControl/TbfComponents.cs
View File

@ -73,7 +73,7 @@ namespace TBF.BenchControl
Factories.Add(new Modbus.PressureMeter.Meret.Factory()); /// Meret pressure meter connected via modbus Factories.Add(new Modbus.PressureMeter.Meret.Factory()); /// Meret pressure meter connected via modbus
Factories.Add(new Network.Adapter.Factory()); Factories.Add(new Network.Adapter.Factory());
Factories.Add(new Network.Camera.CLP1611.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.FactorySingle()); /// Output.FileWriters.Basic.Single
Factories.Add(new Output.FileWriters.Basic.FactoryCompound()); /// Output.FileWriters.Basic.Compound Factories.Add(new Output.FileWriters.Basic.FactoryCompound()); /// Output.FileWriters.Basic.Compound
Factories.Add(new Output.FileWriters.Basic.FactoryHeatMeters()); /// Output.FileWriters.Basic.FactoryHeatMeters Factories.Add(new Output.FileWriters.Basic.FactoryHeatMeters()); /// Output.FileWriters.Basic.FactoryHeatMeters

18
TestBenchFramework/TBF.csproj
View File

@ -520,16 +520,16 @@
<Compile Include="BenchControl\Network\Camera\CLP1611\TerminalDlg.Designer.cs"> <Compile Include="BenchControl\Network\Camera\CLP1611\TerminalDlg.Designer.cs">
<DependentUpon>TerminalDlg.cs</DependentUpon> <DependentUpon>TerminalDlg.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="BenchControl\Network\Camera\RoI\RoI.cs" /> <Compile Include="BenchControl\Network\Camera\Roi\Roi.cs" />
<Compile Include="BenchControl\Network\Camera\RoI\RoICfg.cs" /> <Compile Include="BenchControl\Network\Camera\Roi\RoiCfg.cs" />
<Compile Include="BenchControl\Network\Camera\RoI\RoICfgCtrl.cs"> <Compile Include="BenchControl\Network\Camera\Roi\RoiCfgCtrl.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="BenchControl\Network\Camera\RoI\RoICfgCtrl.designer.cs"> <Compile Include="BenchControl\Network\Camera\Roi\RoiCfgCtrl.designer.cs">
<DependentUpon>RoICfgCtrl.cs</DependentUpon> <DependentUpon>RoiCfgCtrl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="BenchControl\Network\Camera\RoI\Factory.cs" /> <Compile Include="BenchControl\Network\Camera\Roi\Factory.cs" />
<Compile Include="BenchControl\Network\Camera\RoI\RoiDetectionOp.cs" /> <Compile Include="BenchControl\Network\Camera\Roi\RoiDetectionOp.cs" />
<Compile Include="BenchControl\Network\Telnet\Command.cs" /> <Compile Include="BenchControl\Network\Telnet\Command.cs" />
<Compile Include="BenchControl\Network\Telnet\EventArgsClasses.cs" /> <Compile Include="BenchControl\Network\Telnet\EventArgsClasses.cs" />
<Compile Include="BenchControl\Network\Telnet\TelnetClient.cs" /> <Compile Include="BenchControl\Network\Telnet\TelnetClient.cs" />
@ -1842,8 +1842,8 @@
<EmbeddedResource Include="BenchControl\Network\Camera\CLP1611\TerminalDlg.resx"> <EmbeddedResource Include="BenchControl\Network\Camera\CLP1611\TerminalDlg.resx">
<DependentUpon>TerminalDlg.cs</DependentUpon> <DependentUpon>TerminalDlg.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="BenchControl\Network\Camera\RoI\RoICfgCtrl.resx"> <EmbeddedResource Include="BenchControl\Network\Camera\Roi\RoiCfgCtrl.resx">
<DependentUpon>RoICfgCtrl.cs</DependentUpon> <DependentUpon>RoiCfgCtrl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="BenchControl\Operations\AskYesNoForm.resx"> <EmbeddedResource Include="BenchControl\Operations\AskYesNoForm.resx">
<DependentUpon>AskYesNoForm.cs</DependentUpon> <DependentUpon>AskYesNoForm.cs</DependentUpon>