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

(1) LiveStreamSeq with MessageBoxOP, (2) "-jpg" added to ROI-detection command, (3) IRoi: DetectedImageName -> ImageFileNamePrefix, ver. 2.16.658

Browse Source
This commit is contained in:
Milan Hanajik 2017-09-15 09:30:06 +02:00
parent f8e2d6c86b
commit 7846239be9
7 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TestBenchFramework/BenchControl/GenericDevices/IRoi.cs
View File

@ -8,7 +8,7 @@ namespace TBF.BenchControl.GenericDevices
public interface IRoi : IComponent, IRoiForFixedStart
{
bool Detected { get; }
string DetectedImageName { get; }
string ImageFileNamePrefix { get; } /// Either "detected.jpg" or string.Format("img{0}.jpg", nr) is appended
void ClearRoi();

8
TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs
View File

@ -131,12 +131,10 @@ namespace TBF.BenchControl.Network.Camera.Display
{
for (int i = 0; i < Math.Min(imagesCount, boxesCount); i++)
{
if (imageFileNames[i] != null &&
System.IO.File.Exists(imageFileNames[i]) &&
pictureBoxes[i] != null &&
pictureBoxes[i].Image == null)
if (imageFileNames[i] != null && System.IO.File.Exists(imageFileNames[i]) &&
pictureBoxes[i] != null && pictureBoxes[i].Image == null)
{
pictureBoxes[i].Image = Image.FromFile(imageFileNames[i]); ;
pictureBoxes[i].Image = Image.FromFile(imageFileNames[i]);
checkBoxes[i].Checked = false;
}
}

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

@ -90,8 +90,8 @@ namespace TBF.BenchControl.Network.Camera.Roi
detected = true;
}
///
public string DetectedImageName { get { return detectedImageName; } }
string detectedImageName;
public string ImageFileNamePrefix { get { return imgFileNamePrefix; } }
string imgFileNamePrefix;
///
private int roiHandle;
///
@ -171,8 +171,8 @@ namespace TBF.BenchControl.Network.Camera.Roi
{
if (NetCamera != null && NetCamera.Telnet != null)
{
detectedImageName = Path.Combine(Program.TempImagesDir, string.Format("{0}-det-{1}.jpg", RoiCfg.Name, StateMachine.Time));
return new RoiDetectionOp(this, NetCamera, detectedImageName, RoiX, RoiY, RoiWid, RoiHgh);
imgFileNamePrefix = Path.Combine(Program.TempImagesDir, string.Format("{0}-{1}-", RoiCfg.Name, StateMachine.Time));
return new RoiDetectionOp(this, NetCamera, imgFileNamePrefix, RoiX, RoiY, RoiWid, RoiHgh);
}
else
return null;

12
TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
readonly RoiCfg roiCfg;
readonly CLP1611.Camera camera;
readonly Telnet.TelnetClient telnet;
readonly string detectedImageName;
readonly string imgFileNamePrefix;
string command;
bool roiDetectionCommandSent;
@ -38,7 +38,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
/// Events: Event.None or Event.Error
/// </summary>
/// <param name="camera">CLP1611.Camera reference</param>
public RoiDetectionOp(Roi roi, CLP1611.Camera camera, string detectedImageName,
public RoiDetectionOp(Roi roi, CLP1611.Camera camera, string imgFileNamePrefix,
Boxes.IntBox roiX, Boxes.IntBox roiY,
Boxes.IntBox roiWid, Boxes.IntBox roiHgh)
{
@ -46,7 +46,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
this.roiCfg = roi.RoiCfg;
this.camera = camera;
this.telnet = camera.Telnet;
this.detectedImageName = detectedImageName;
this.imgFileNamePrefix = imgFileNamePrefix;
this.roiX = roiX;
this.roiY = roiY;
this.roiWid = roiWid;
@ -107,7 +107,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
command = string.Format("clp/RoiDetection{0}{1}{2}{3}{4} {5}",
masks,
string.Format(roiCfg.LoadImages ? " -l {0}" : " -n {0}", roiCfg.DetectionImagesCount),
roiCfg.SaveImages ? " -s" : "",
roiCfg.SaveImages ? " -s -jpg" : "",
string.Format(" -p1 {0}", roiCfg.DetectionPeriod1),
string.Format(" -p2 {0}", roiCfg.DetectionPeriod2),
roiCfg.RoiParams);
@ -128,7 +128,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
/// ROI detection passed and image transfer is in progress
return Event.RoiDetectionPassed;
}
else if (0 == camera.TransferFileViaScp("detected.jpg", detectedImageName))
else if (0 == camera.TransferFileViaScp("detected.jpg", imgFileNamePrefix + "detected.jpg"))
{
/// File transfer successfully started
transferringDetectedImage = true;
@ -179,7 +179,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
///
/// Start the file transfer
///
if (0 == camera.TransferFileViaScp("detected.jpg", detectedImageName))
if (0 == camera.TransferFileViaScp("detected.jpg", imgFileNamePrefix + "detected.jpg"))
{
/// File transfer successfully started
transferringDetectedImage = true;

14
TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs
View File

@ -45,6 +45,7 @@ namespace TBF.BenchControl.TestMethods.LiveStream
//------------------------------------------------
State.Create(string.Format("{0}({1}) : Live stream", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperation(new Operations.MessageBoxOp(TBF.Resources.Strings.Camera))
.AddOperations(liveStreamOps)
.EnterState();
do
@ -53,17 +54,10 @@ namespace TBF.BenchControl.TestMethods.LiveStream
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test));
if (e.Contains(Event.Error))
{
break;
}
if (TestAndLogUiCmdStop(test,e))
{
break;
}
if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
}
while (true);
while (!e.Contains(Event.OK));
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed));

2
TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
View File

@ -137,7 +137,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
if (roi != null && !roi.Detected)
{
detection.AddOperation(roi.RoiDetectionOp());
imageNames[i] = roi.DetectedImageName;
imageNames[i] = roi.ImageFileNamePrefix + "detected.jpg";
}
}
detection.EnterState();

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.16.657.1")]
[assembly: AssemblyFileVersion("2.16.657.1")]
[assembly: AssemblyVersion("2.16.658.1")]
[assembly: AssemblyFileVersion("2.16.658.1")]