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

Hot bug fixes, ver. 2.12.436

Browse Source
This commit is contained in:
Milan Hanajik
2017-01-16 21:42:59 +01:00
parent 6d45b2c878
commit 2ced1417ed
7 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
+2 -2
View File
@@ -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;
TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs
Generated
+26 -1
View File
@@ -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 <x> <y> <w> <h> [-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;
}
}
TestBenchFramework/MainWnd.cs
+4 -2
View File
@@ -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,
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
TestBenchFramework/Resources/Strings.Designer.cs
Generated
+6 -6
View File
@@ -1420,20 +1420,20 @@ namespace TBF.Resources {
}
/// <summary>
/// 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}.
/// </summary>
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);
}
}
/// <summary>
/// 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}.
/// </summary>
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);
}
}
TestBenchFramework/Resources/Strings.de.resx
+2 -2
View File
@@ -1374,10 +1374,10 @@
<data name="Do_you_want_to_save_changes" xml:space="preserve">
<value>Wollen sie die Änderungen speichern?</value>
</data>
<data name="Failed_to_initialize_component_0_crlf_1" xml:space="preserve">
<data name="Failed_to_initialize_component_0_1_2" xml:space="preserve">
<value>Fehler beim Komponentestart {0}{1}{2}</value>
</data>
<data name="Failed_to_initialize_device_0_crlf_1" xml:space="preserve">
<data name="Failed_to_initialize_device_0_1_2" xml:space="preserve">
<value>Fehler beim Gerätstart {0}{1}{2}</value>
</data>
<data name="Do_you_want_to_retry_RoI_detection" xml:space="preserve">
TestBenchFramework/Resources/Strings.resx
+4 -4
View File
@@ -1624,11 +1624,11 @@
<data name="User_code" xml:space="preserve">
<value>User code</value>
</data>
<data name="Failed_to_initialize_device_0_crlf_1" xml:space="preserve">
<value>Failed to initialize device {0}\r\n{1}</value>
<data name="Failed_to_initialize_device_0_1_2" xml:space="preserve">
<value>Failed to initialize device {0}{1}{2}</value>
</data>
<data name="Failed_to_initialize_component_0_crlf_1" xml:space="preserve">
<value>Failed to initialize component {0}\r\n{1}</value>
<data name="Failed_to_initialize_component_0_1_2" xml:space="preserve">
<value>Failed to initialize component {0}{1}{2}</value>
</data>
<data name="Do_you_want_to_retry_RoI_detection" xml:space="preserve">
<value>Do you want to retry RoI detection?</value>