Interfaces between Camera and Roi and sequences finalized, TODO: network communication, ver. 2.12.446

Sequences more robust for debugging, T and Pr-meters checked for null
This commit is contained in:
Milan Hanajik
2017-01-25 17:28:57 +01:00
parent 02ce6bf7c0
commit 38c199f6f9
13 changed files with 160 additions and 132 deletions
@@ -39,11 +39,11 @@ namespace TBF.BenchControl.Network.Camera.Roi
public int WMRefPulses { get { return wmRefPulses; } }
public double WMVolume { get { return LtrsPerPulse * (double)wmPulses; } }
int wmPulses;
int wmRefPulses;
///
/// Roi specific
///
@@ -146,21 +146,25 @@ namespace TBF.BenchControl.Network.Camera.Roi
}
public IOperation MeasurementOp()
/// <summary>
/// Updates wmPulses, caled from 'Start' and 'Run' functions of 'ReadRegisterOp'
/// </summary>
void UdatePulses()
{
return null; /// TODO: To be implemented in a Camera
if (detected && roiHandle != 0)
{
wmPulses = NetCamera.GetResult(roiHandle);
}
}
///
/// Note: Measurement operations of cameras should preceeede ReadRegister operations of ROI-s
///
public IOperation ReadRegisterOp()
{
return this;
}
void UdatePulses()
{
}
/// <summary>Start this operation</summary>
public void Start()
{