Camera time read with each sample, calculation : VolumeStart, VolumeEnd, TimestampStart, TimestampEnd used, ver. 2.12.530

This commit is contained in:
Milan Hanajik
2017-04-07 11:29:35 +02:00
parent fc26b95bdb
commit d372a38e7d
8 changed files with 92 additions and 35 deletions
@@ -91,6 +91,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
/// ROI related parameters
///
IList<string> roiParams;
long cameraTimeMs;
int[] result;
///
public void ClearRoiParams() { roiParams.Clear(); }
@@ -102,8 +103,10 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
return newHandle;
}
///
public int GetResult(int roiHandle)
public int GetResult(int roiHandle, out long timeMs)
{
timeMs = cameraTimeMs;
if (roiHandle > 0 && roiHandle <= roiParams.Count)
{
return result[roiHandle - 1];
@@ -478,12 +481,18 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
{
string[] pulsesArr = msrmtData.MeasuredData.Split(new char[] { ';' });
if (result != null && result.Length + 1 == pulsesArr.Length)
uint uiVal;
if (result != null && result.Length + 1 == pulsesArr.Length && uint.TryParse(pulsesArr[0], out uiVal))
{
cameraTimeMs = (long)uiVal;
for (int i = 0; i < result.Length; i++)
{
int val;
if (int.TryParse(pulsesArr[i + 1], out val)) result[i] = Math.Abs(val);
if (int.TryParse(pulsesArr[i + 1], out val))
{
result[i] = Math.Abs(val);
}
}
}
}
@@ -35,17 +35,35 @@ namespace TBF.BenchControl.Network.Camera.Roi
public double PulsesPerLtr { get { return (double)RoiCfg.ProcParams.PulsesPerLtr; } }
public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); ; } }
int wmPulses;
public int WMPulses { get { return wmPulses; } }
int cameraPulses;
int pulsesDelta; /// = (WMPulses - cameraPulses) ... WMPulses = cameraPulses + pulsesDelta, Clear() calculates pulsesDelta
public int WMPulses { get { return cameraPulses + pulsesDelta; } }
long cameraTime;
long timeDelta; /// = (WMTestTime - cameraTime) ... WMTestTime = cameraTime + timeDelta, Clear() calculates timeDelta
public double WMTestTime { get { return (cameraTime + timeDelta) / 1000.0; } }
int wmRefPulses;
public int WMRefPulses { get { return wmRefPulses; } }
public double WMVolume { get { return LtrsPerPulse * (double)wmPulses; } }
public double WMVolume { get { return LtrsPerPulse * (double)WMPulses; } }
public double BeginWMState { get { return 0; } } /// Always 0
public double EndWMState { get { return WMVolume; } } /// Derived from WMVolume
public double BeginWMState { get { return 0; } } /// Always 0
public double EndWMState { get { return WMVolume; } } /// Derived from WMVolume
double volumeStart;
public double VolumeStart { get { return volumeStart; } } /// in l
double volumeEnd;
public double VolumeEnd { get { return volumeEnd; } } /// in l
double timestampStart;
public double TimestampStart { get { return timestampStart; } } /// in s
double timestampEnd;
public double TimestampEnd { get { return timestampEnd; } } /// in s
///
/// Roi specific
///
@@ -143,7 +161,8 @@ namespace TBF.BenchControl.Network.Camera.Roi
public void Clear()
{
wmPulses = 0;
pulsesDelta = -cameraPulses;
timeDelta = -cameraTime;
wmRefPulses = 0;
}
@@ -172,7 +191,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
{
if (detected && roiHandle != 0)
{
wmPulses = NetCamera.GetResult(roiHandle);
cameraPulses = NetCamera.GetResult(roiHandle, out cameraTime);
}
}
@@ -188,6 +207,9 @@ namespace TBF.BenchControl.Network.Camera.Roi
public void Start()
{
UdatePulses();
Clear();
volumeStart = WMVolume;
timestampStart = WMTestTime;
}
/// <summary>Run this operation</summary>
@@ -195,6 +217,8 @@ namespace TBF.BenchControl.Network.Camera.Roi
public Event Run()
{
UdatePulses();
volumeEnd = WMVolume;
timestampEnd = WMTestTime;
return Event.ReadRegisterDone;
}