diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
index ae4f976b3..8162643f4 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
@@ -347,6 +347,11 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
wscpSession = new WinSCP.Session();
wscpSession.Open(wscpSessionOptions);
+ TransferOptions transferOptions = new TransferOptions();
+ transferOptions.TransferMode = TransferMode.Binary;
+
+ TransferOperationResult transferResult;
+
wscpOpened = wscpSession.Opened;
if (wscpOpened)
@@ -357,7 +362,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
{
case WscpCommand.Get:
wscpCommand = WscpCommand.None;
- wscpSession.GetFiles(wscpSrcFileName, wscpDstFileName);
+ transferResult = wscpSession.GetFiles(wscpSrcFileName, wscpDstFileName, false, transferOptions);
+ ///transferResult.Check();
break;
default:
break;
diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx
index 6a7e01167..9e84adddd 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx
+++ b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx
@@ -129,7 +129,7 @@
1123, 21
- 122, 58
+ 146, 58
@@ -360,36 +360,6 @@
1
-
- True
-
-
- Verdana, 27.75pt
-
-
- NoControl
-
-
- 391, -161
-
-
- 15, 14
-
-
- 2
-
-
- checkBox7
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox3
-
-
- 2
-
Verdana, 14.25pt
@@ -511,7 +481,7 @@
1123, 98
- 122, 58
+ 146, 58
8
@@ -544,7 +514,7 @@
1123, 175
- 122, 58
+ 146, 58
9
@@ -736,7 +706,7 @@
True
- 1263, 590
+ 1287, 590
Batch data
diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
index 0fcbb18a9..ca89edcc9 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
@@ -71,7 +71,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
}
///
public string DetectedImageName { get { return detectedImageName; } }
- readonly string detectedImageName;
+ string detectedImageName;
///
private int roiHandle;
///
@@ -101,8 +101,6 @@ namespace TBF.BenchControl.Network.Camera.Roi
RoiWid = new Boxes.IntBox();
RoiHgh = new Boxes.IntBox();
- detectedImageName = string.Format("c:\\TBF\\TftpRoot\\{0}-det.jpg", cfg.Name);
-
Clear();
log.Debug(this.ToString());
@@ -154,8 +152,9 @@ namespace TBF.BenchControl.Network.Camera.Roi
{
if (NetCamera != null && NetCamera.Telnet != null)
{
- Telnet = NetCamera.Telnet;
- return new RoiDetectionOp(this, RoiX, RoiY, RoiWid, RoiHgh);
+ Telnet = NetCamera.Telnet;
+ detectedImageName = string.Format("c:\\TBF\\TftpRoot\\{0}-det-{1}.jpg", RoiCfg.Name, StateMachine.Time);
+ return new RoiDetectionOp(this, RoiX, RoiY, RoiWid, RoiHgh);
}
else
{
diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs
index 6c1cffe96..77503fed2 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs
@@ -125,7 +125,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
/// ROI detection passed and image transfer is in progress
return Event.RoiDetectionPassed;
}
- else if (0 == camera.WscpTransferFile("detected.jpg", string.Format("c:\\TBF\\TftpRoot\\{0}-det.jpg", roi.Name)))
+ else if (0 == camera.WscpTransferFile("detected.jpg", roi.DetectedImageName))
{
/// Start the file transfer
transferringDetectedImage = true;
diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
index e21ba1952..311c4ca05 100644
--- a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
@@ -116,8 +116,6 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
if (roi != null)
{
roi.ClearRoi();
- imageNames[i] = roi.DetectedImageName;
- if (File.Exists(roi.DetectedImageName)) File.Delete(roi.DetectedImageName);
}
else
{
@@ -138,6 +136,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
if (roi != null && !roi.Detected)
{
detection.AddOperation(roi.RoiDetectionOp());
+ imageNames[i] = roi.DetectedImageName;
}
}
detection.EnterState();
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index c373d7f85..c60257d20 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.12.527.1")]
-[assembly: AssemblyFileVersion("2.12.527.1")]
+[assembly: AssemblyVersion("2.12.528.1")]
+[assembly: AssemblyFileVersion("2.12.528.1")]
diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx
index f34ccede9..694bdf901 100644
--- a/TestBenchFramework/Resources/Strings.cs.resx
+++ b/TestBenchFramework/Resources/Strings.cs.resx
@@ -832,10 +832,7 @@
Opakovat připojení k databázi
- ROI detekce probíhá
-
-
- Probíhá rozeznávání
+ Rozeznávání ROI probíhá
Screen
diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx
index 54b2e5c6a..9b7eb9e68 100644
--- a/TestBenchFramework/Resources/Strings.de.resx
+++ b/TestBenchFramework/Resources/Strings.de.resx
@@ -879,7 +879,7 @@
Alles entfernen
-
+
ROI-Erkennung läuft