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

WMPulses[], WMRefPulses[], WMTimes[] removed from SequenceBase, operations, etc., clean-up.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-13 17:39:38 +01:00
parent e94e16c9e6
commit 6a159f773e
18 changed files with 48 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoi.cs
+4 -25
View File
@@ -35,8 +35,8 @@ namespace TBF.BenchControl.Cameras.CameraRoi
public int WMRefPulses { get { return wmRefPulses; } }
public double WMVolume { get { return ltrsPerPulse * (double)wmPulses; } }
int wmPulses;
int wmRefPulses;
public int wmPulses;
public int wmRefPulses;
public CameraRoi()
@@ -77,30 +77,9 @@ namespace TBF.BenchControl.Cameras.CameraRoi
/// </summary>
/// <param name="pulses">Reference to a variable for the water meter pulses</param>
/// <returns>ReadWaterMeter instance reference casted to IOperaton</returns>
public IOperation ReadRegisterOp(ref IntBox pulses)
public IOperation ReadRegisterOp()
{
return new ReadRegisterOp(this, ref pulses);
}
/// <summary>
/// Events: Event.ReadRegisterDone, Event.Error
/// </summary>
/// <param name="pulses">Reference to a variable for the water meter pulses</param>
/// <param name="pulses">Reference to a variable for the related reference flow meter pulses</param>
/// <returns>ReadWaterMeter instance reference casted to IOperaton</returns>
public IOperation ReadRegisterOp(ref IntBox pulses, ref IntBox refPulses)
{
return new ReadRegisterOp(this, ref pulses, ref refPulses);
}
/// <summary>
/// Events: ReadReferenceDone, Error
/// </summary>
/// <param name="pulses">Reference to a variable for the water meter pulses</param>
/// <returns>ReadWaterMeter instance reference casted to IOperaton</returns>
public IOperation ReadReferenceForRegisterOp(ref IntBox pulses, ref IntBox refPulses)
{
return null; /// not implemented
return new ReadRegisterOp(this);
}
/// <summary>
TestBenchFramework/BenchControl/Cameras/CameraRoi/ReadRegisterOp.cs
+4 -23
View File
@@ -13,47 +13,28 @@ namespace TBF.BenchControl.Cameras.CameraRoi
public override string ToString() { return string.Format("ReadRegisterOp({0})", cameraRoi.Cfg.Name); }
/// Set by the constructor
readonly GenericDevices.ICameraRoi cameraRoi;
readonly CameraRoi cameraRoi;
readonly BenchControl.Cameras.IdcCamera.IdcCamera camera;
IntBox pulses;
IntBox refPulses;
/// <summary>
/// Events: Event.ReadRegisterDone or Event.Error
/// </summary>
/// <param name="reader">Register reader reference</param>
/// <param name="pulses">Reference to a field with the water meter pulses</param>
public ReadRegisterOp(GenericDevices.ICameraRoi cameraRoi, ref IntBox pulses)
public ReadRegisterOp(CameraRoi cameraRoi)
{
this.cameraRoi = cameraRoi;
if (cameraRoi == null) throw new ArgumentNullException("reader is null or it is not IdcCamera");
camera = cameraRoi.Camera as BenchControl.Cameras.IdcCamera.IdcCamera;
this.pulses = pulses;
log.Debug(this.ToString());
}
/// <summary>
/// Events: Event.ReadRegisterDone or Event.Error
/// </summary>
/// <param name="cameraRoi">Register reader reference</param>
/// <param name="pulses">Reference to a Box with the water meter pulses</param>
/// <param name="refPulses">Reference to a Box with the reference flow meter pulses synchronized with the water meter</param>
public ReadRegisterOp(GenericDevices.ICameraRoi cameraRoi, ref IntBox pulses, ref IntBox refPulses)
: this(cameraRoi, ref pulses)
{
this.refPulses = refPulses;
log.Debug(this.ToString());
}
private void ReadPulses()
{
pulses.Val = camera.Idc100.Pulses;
if (refPulses != null)
{
refPulses.Val = StateMachine.ControlBoard.EtPulses(0);
}
cameraRoi.wmPulses = camera.Idc100.Pulses;
cameraRoi.wmRefPulses = StateMachine.ControlBoard.EtPulses(0);
}
/// <summary>Start this operation</summary>