diff --git a/TestBenchFramework/BenchControl/GenericDevices/IRoi.cs b/TestBenchFramework/BenchControl/GenericDevices/IRoi.cs index 48110bf87..c38760ba4 100644 --- a/TestBenchFramework/BenchControl/GenericDevices/IRoi.cs +++ b/TestBenchFramework/BenchControl/GenericDevices/IRoi.cs @@ -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(); diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs index 120a08abe..31c8c56e2 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs @@ -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; } } diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs index 26fb3b9ad..d0253fade 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs @@ -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; diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs index e171a88ab..1ab7f1add 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs @@ -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 /// /// CLP1611.Camera reference - 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; diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs index a994ffb14..fbfee4c1c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs @@ -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)); diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs index 8a1609313..5f41fe032 100644 --- a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs @@ -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(); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 057ad92e7..1ea683953 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -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")]