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

Network.Camera.Roi bug fix, comments updated.

Browse Source
This commit is contained in:
Milan Hanajik 2017-07-27 12:15:54 +03:00
parent 9ecfe1e10e
commit e133b68472
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs
View File

@ -53,6 +53,7 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader
{
registerReaderCfg = cfg as RegisterReaderCfg;
/// Control board is used to read reference flowmeter pulses
controlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components);
if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
@ -77,7 +78,7 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader
}
/// <summary>
/// Events: Event.ReadRegisterDone, Event.Error
/// Events: Event.ReadRegisterDone
/// </summary>
/// <returns>ReadWaterMeter instance reference casted to IOperaton</returns>
public IOperation ReadRegisterOp()

3
TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
View File

@ -33,7 +33,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
public GenericDevices.ICamera Camera { get { return NetCamera as GenericDevices.ICamera; } }
public double PulsesPerLtr { get { return (double)RoiCfg.ProcParams.PulsesPerLtr; } }
public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); ; } }
public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
int cameraPulses;
int pulsesDelta; /// = (WMPulses - cameraPulses) ... WMPulses = cameraPulses + pulsesDelta, Clear() calculates pulsesDelta
@ -103,7 +103,6 @@ namespace TBF.BenchControl.Network.Camera.Roi
public Roi()
{
Clear();
}
public Roi(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)