From 2ced1417ed7a17dc3236ba3857a0067e14ec8c2f Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 16 Jan 2017 21:29:59 +0100 Subject: [PATCH] Hot bug fixes, ver. 2.12.436 --- .../Network/Camera/CLP1611/Camera.cs | 4 +-- .../Network/Camera/Roi/RoiCfgCtrl.designer.cs | 27 ++++++++++++++++++- TestBenchFramework/MainWnd.cs | 6 +++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +-- .../Resources/Strings.Designer.cs | 12 ++++----- TestBenchFramework/Resources/Strings.de.resx | 4 +-- TestBenchFramework/Resources/Strings.resx | 8 +++--- 7 files changed, 46 insertions(+), 19 deletions(-) diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs index fe5af13e3..d2ea80e0b 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs @@ -113,8 +113,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 Telnet.Enqueue(new Telnet.Command(Network.Telnet.CmdAction.CONNECT, ipAddress.ToString(), 10, 30)); - measurementListener = new UdpClient(new IPEndPoint(NetAdapter.IPAddress, measurementUdpPortNr)); - new Thread(new ThreadStart(MeasurementUdpListener)).Start(); + //measurementListener = new UdpClient(new IPEndPoint(IPAddress.Any, measurementUdpPortNr)); + //new Thread(new ThreadStart(MeasurementUdpListener)).Start(); running = true; diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs index 52337b744..f14550d60 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs @@ -42,6 +42,8 @@ namespace TBF.BenchControl.Network.Camera.Roi this.textBox1 = new System.Windows.Forms.TextBox(); this.previousRoiComboBox = new System.Windows.Forms.ComboBox(); this.previousRoiLabel = new System.Windows.Forms.Label(); + this.helpLabel1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // argsTextBox @@ -49,7 +51,7 @@ namespace TBF.BenchControl.Network.Camera.Roi this.argsTextBox.Enabled = false; this.argsTextBox.Location = new System.Drawing.Point(104, 127); this.argsTextBox.Name = "argsTextBox"; - this.argsTextBox.Size = new System.Drawing.Size(372, 20); + this.argsTextBox.Size = new System.Drawing.Size(361, 20); this.argsTextBox.TabIndex = 7; // // argsLabel @@ -140,10 +142,31 @@ namespace TBF.BenchControl.Network.Camera.Roi this.previousRoiLabel.TabIndex = 4; this.previousRoiLabel.Text = "Previous RoI"; // + // helpLabel1 + // + this.helpLabel1.AutoSize = true; + this.helpLabel1.Location = new System.Drawing.Point(19, 154); + this.helpLabel1.Name = "helpLabel1"; + this.helpLabel1.Size = new System.Drawing.Size(396, 13); + this.helpLabel1.TabIndex = 8; + this.helpLabel1.Text = "[-l] [-s] [-m [-m ... [-m ...]]] cx cy roiWid roiHgh innerR outer" + + "R R3 ..."; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(18, 174); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(243, 13); + this.label2.TabIndex = 9; + this.label2.Text = "... ang1 ang2 teethCount 1(=cw)|-1(=ccw) bkgCorr"; + // // RoiCfgCtrl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label2); + this.Controls.Add(this.helpLabel1); this.Controls.Add(this.previousRoiComboBox); this.Controls.Add(this.previousRoiLabel); this.Controls.Add(this.parentNameComboBox); @@ -176,5 +199,7 @@ namespace TBF.BenchControl.Network.Camera.Roi private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.ComboBox previousRoiComboBox; private System.Windows.Forms.Label previousRoiLabel; + private System.Windows.Forms.Label helpLabel1; + private System.Windows.Forms.Label label2; } } diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index d805c6b11..640e8b525 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -113,8 +113,9 @@ namespace TBF { benchInitializationFailed = true; - string errMsg = string.Format(Strings.Failed_to_initialize_component_0_crlf_1, + string errMsg = string.Format(Strings.Failed_to_initialize_component_0_1_2, BenchControl.TbfComponents.CurrentlyLoadedComponentName, + Environment.NewLine, exc.Message); log.Fatal(errMsg); MessageBox.Show(errMsg, Strings.Error, @@ -207,8 +208,9 @@ namespace TBF catch (Exception exc) { benchInitializationFailed = true; - string errMsg = string.Format(Strings.Failed_to_initialize_device_0_crlf_1, + string errMsg = string.Format(Strings.Failed_to_initialize_device_0_1_2, BenchControl.StateMachine.CurrentlyInitializedDeviceName, + Environment.NewLine, exc.Message); log.Fatal(errMsg); MessageBox.Show(errMsg, Strings.Error, diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 841982976..58eebe5eb 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.435.1")] -[assembly: AssemblyFileVersion("2.12.435.1")] +[assembly: AssemblyVersion("2.12.436.1")] +[assembly: AssemblyFileVersion("2.12.436.1")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index bc92ee20f..717f078f6 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -1420,20 +1420,20 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Failed to initialize component {0}\r\n{1}. + /// Looks up a localized string similar to Failed to initialize component {0}{1}{2}. /// - internal static string Failed_to_initialize_component_0_crlf_1 { + internal static string Failed_to_initialize_component_0_1_2 { get { - return ResourceManager.GetString("Failed_to_initialize_component_0_crlf_1", resourceCulture); + return ResourceManager.GetString("Failed_to_initialize_component_0_1_2", resourceCulture); } } /// - /// Looks up a localized string similar to Failed to initialize device {0}\r\n{1}. + /// Looks up a localized string similar to Failed to initialize device {0}{1}{2}. /// - internal static string Failed_to_initialize_device_0_crlf_1 { + internal static string Failed_to_initialize_device_0_1_2 { get { - return ResourceManager.GetString("Failed_to_initialize_device_0_crlf_1", resourceCulture); + return ResourceManager.GetString("Failed_to_initialize_device_0_1_2", resourceCulture); } } diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index fde883d9d..b5775063d 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -1374,10 +1374,10 @@ Wollen sie die Änderungen speichern? - + Fehler beim Komponentestart {0}{1}{2} - + Fehler beim Gerätstart {0}{1}{2} diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index c66b41908..d3d1c3d19 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1624,11 +1624,11 @@ User code - - Failed to initialize device {0}\r\n{1} + + Failed to initialize device {0}{1}{2} - - Failed to initialize component {0}\r\n{1} + + Failed to initialize component {0}{1}{2} Do you want to retry RoI detection?