diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs
index 31c8c56e2..c2b23a175 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs
@@ -76,9 +76,15 @@ namespace TBF.BenchControl.Network.Camera.Display
this.imageFileNames = imageFileNames;
this.imagesCount = (imageFileNames == null) ? 0 : imageFileNames.Length;
- groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6 };
- pictureBoxes = new PictureBox[] { pictureBox1, pictureBox2, pictureBox3, pictureBox4, pictureBox5, pictureBox6 };
- checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 };
+ groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6,
+ groupBox7, groupBox8, groupBox9, groupBox10, groupBox11, groupBox12 };
+
+ pictureBoxes = new PictureBox[] { pictureBox1, pictureBox2, pictureBox3, pictureBox4, pictureBox5, pictureBox6,
+ pictureBox7, pictureBox8, pictureBox9, pictureBox10, pictureBox11, pictureBox12 };
+
+ checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6,
+ checkBox7, checkBox8, checkBox9, checkBox10, checkBox11, checkBox12 };
+
boxesCount = pictureBoxes.Length;
Text = title;
@@ -102,7 +108,10 @@ namespace TBF.BenchControl.Network.Camera.Display
SelectedImages = new bool[imagesCount];
- if (lastVisibleGroupBoxIx < 3) Height = 338;
+ if (lastVisibleGroupBoxIx < 4)
+ Height = 321;
+ else if (lastVisibleGroupBoxIx < 8)
+ Height = 616;
Result = DialogResult.None;
completed = false;
diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.designer.cs b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.designer.cs
index 31b1304b7..06964f144 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.designer.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.designer.cs
@@ -31,230 +31,410 @@ namespace TBF.BenchControl.Network.Camera.Display
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayForm));
- this.okButton = new System.Windows.Forms.Button();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.checkBox1 = new System.Windows.Forms.CheckBox();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.checkBox2 = new System.Windows.Forms.CheckBox();
- this.pictureBox2 = new System.Windows.Forms.PictureBox();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.checkBox3 = new System.Windows.Forms.CheckBox();
- this.pictureBox3 = new System.Windows.Forms.PictureBox();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.checkBox4 = new System.Windows.Forms.CheckBox();
- this.pictureBox4 = new System.Windows.Forms.PictureBox();
- this.retryButton = new System.Windows.Forms.Button();
- this.abortButton = new System.Windows.Forms.Button();
- this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.checkBox5 = new System.Windows.Forms.CheckBox();
- this.pictureBox5 = new System.Windows.Forms.PictureBox();
- this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.checkBox6 = new System.Windows.Forms.CheckBox();
- this.pictureBox6 = new System.Windows.Forms.PictureBox();
- this.groupBox1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.groupBox2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
- this.groupBox3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
- this.groupBox4.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
- this.groupBox5.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
- this.groupBox6.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
- this.SuspendLayout();
- //
- // okButton
- //
- resources.ApplyResources(this.okButton, "okButton");
- this.okButton.ForeColor = System.Drawing.Color.Black;
- this.okButton.Name = "okButton";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.checkBox1);
- this.groupBox1.Controls.Add(this.pictureBox1);
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.ForeColor = System.Drawing.Color.Black;
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
- //
- // checkBox1
- //
- resources.ApplyResources(this.checkBox1, "checkBox1");
- this.checkBox1.Name = "checkBox1";
- this.checkBox1.UseVisualStyleBackColor = true;
- //
- // pictureBox1
- //
- resources.ApplyResources(this.pictureBox1, "pictureBox1");
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.TabStop = false;
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.checkBox2);
- this.groupBox2.Controls.Add(this.pictureBox2);
- resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.ForeColor = System.Drawing.Color.Black;
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.TabStop = false;
- //
- // checkBox2
- //
- resources.ApplyResources(this.checkBox2, "checkBox2");
- this.checkBox2.Name = "checkBox2";
- this.checkBox2.UseVisualStyleBackColor = true;
- //
- // pictureBox2
- //
- resources.ApplyResources(this.pictureBox2, "pictureBox2");
- this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.TabStop = false;
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.checkBox3);
- this.groupBox3.Controls.Add(this.pictureBox3);
- resources.ApplyResources(this.groupBox3, "groupBox3");
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.TabStop = false;
- //
- // checkBox3
- //
- resources.ApplyResources(this.checkBox3, "checkBox3");
- this.checkBox3.Name = "checkBox3";
- this.checkBox3.UseVisualStyleBackColor = true;
- //
- // pictureBox3
- //
- resources.ApplyResources(this.pictureBox3, "pictureBox3");
- this.pictureBox3.Name = "pictureBox3";
- this.pictureBox3.TabStop = false;
- //
- // groupBox4
- //
- this.groupBox4.Controls.Add(this.checkBox4);
- this.groupBox4.Controls.Add(this.pictureBox4);
- resources.ApplyResources(this.groupBox4, "groupBox4");
- this.groupBox4.ForeColor = System.Drawing.Color.Black;
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.TabStop = false;
- //
- // checkBox4
- //
- resources.ApplyResources(this.checkBox4, "checkBox4");
- this.checkBox4.Name = "checkBox4";
- this.checkBox4.UseVisualStyleBackColor = true;
- //
- // pictureBox4
- //
- resources.ApplyResources(this.pictureBox4, "pictureBox4");
- this.pictureBox4.Name = "pictureBox4";
- this.pictureBox4.TabStop = false;
- //
- // retryButton
- //
- resources.ApplyResources(this.retryButton, "retryButton");
- this.retryButton.ForeColor = System.Drawing.Color.Black;
- this.retryButton.Name = "retryButton";
- this.retryButton.UseVisualStyleBackColor = true;
- this.retryButton.Click += new System.EventHandler(this.retryButton_Click);
- //
- // abortButton
- //
- resources.ApplyResources(this.abortButton, "abortButton");
- this.abortButton.ForeColor = System.Drawing.Color.Black;
- this.abortButton.Name = "abortButton";
- this.abortButton.UseVisualStyleBackColor = true;
- this.abortButton.Click += new System.EventHandler(this.abortButton_Click);
- //
- // groupBox5
- //
- this.groupBox5.Controls.Add(this.checkBox5);
- this.groupBox5.Controls.Add(this.pictureBox5);
- resources.ApplyResources(this.groupBox5, "groupBox5");
- this.groupBox5.ForeColor = System.Drawing.Color.Black;
- this.groupBox5.Name = "groupBox5";
- this.groupBox5.TabStop = false;
- //
- // checkBox5
- //
- resources.ApplyResources(this.checkBox5, "checkBox5");
- this.checkBox5.Name = "checkBox5";
- this.checkBox5.UseVisualStyleBackColor = true;
- //
- // pictureBox5
- //
- resources.ApplyResources(this.pictureBox5, "pictureBox5");
- this.pictureBox5.Name = "pictureBox5";
- this.pictureBox5.TabStop = false;
- //
- // groupBox6
- //
- this.groupBox6.Controls.Add(this.checkBox6);
- this.groupBox6.Controls.Add(this.pictureBox6);
- resources.ApplyResources(this.groupBox6, "groupBox6");
- this.groupBox6.ForeColor = System.Drawing.Color.Black;
- this.groupBox6.Name = "groupBox6";
- this.groupBox6.TabStop = false;
- //
- // checkBox6
- //
- resources.ApplyResources(this.checkBox6, "checkBox6");
- this.checkBox6.Name = "checkBox6";
- this.checkBox6.UseVisualStyleBackColor = true;
- //
- // pictureBox6
- //
- resources.ApplyResources(this.pictureBox6, "pictureBox6");
- this.pictureBox6.Name = "pictureBox6";
- this.pictureBox6.TabStop = false;
- //
- // DisplayForm
- //
- resources.ApplyResources(this, "$this");
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.DarkGray;
- this.Controls.Add(this.groupBox6);
- this.Controls.Add(this.groupBox5);
- this.Controls.Add(this.abortButton);
- this.Controls.Add(this.retryButton);
- this.Controls.Add(this.groupBox4);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.okButton);
- this.ForeColor = System.Drawing.Color.Black;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Name = "DisplayForm";
- this.TopMost = true;
- this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
- this.groupBox4.ResumeLayout(false);
- this.groupBox4.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
- this.groupBox5.ResumeLayout(false);
- this.groupBox5.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
- this.groupBox6.ResumeLayout(false);
- this.groupBox6.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
- this.ResumeLayout(false);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayForm));
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.checkBox2 = new System.Windows.Forms.CheckBox();
+ this.pictureBox2 = new System.Windows.Forms.PictureBox();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.checkBox3 = new System.Windows.Forms.CheckBox();
+ this.pictureBox3 = new System.Windows.Forms.PictureBox();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.checkBox4 = new System.Windows.Forms.CheckBox();
+ this.pictureBox4 = new System.Windows.Forms.PictureBox();
+ this.retryButton = new System.Windows.Forms.Button();
+ this.abortButton = new System.Windows.Forms.Button();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.checkBox5 = new System.Windows.Forms.CheckBox();
+ this.pictureBox5 = new System.Windows.Forms.PictureBox();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.checkBox6 = new System.Windows.Forms.CheckBox();
+ this.pictureBox6 = new System.Windows.Forms.PictureBox();
+ this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.checkBox7 = new System.Windows.Forms.CheckBox();
+ this.pictureBox7 = new System.Windows.Forms.PictureBox();
+ this.groupBox8 = new System.Windows.Forms.GroupBox();
+ this.checkBox8 = new System.Windows.Forms.CheckBox();
+ this.pictureBox8 = new System.Windows.Forms.PictureBox();
+ this.groupBox9 = new System.Windows.Forms.GroupBox();
+ this.checkBox9 = new System.Windows.Forms.CheckBox();
+ this.pictureBox9 = new System.Windows.Forms.PictureBox();
+ this.groupBox10 = new System.Windows.Forms.GroupBox();
+ this.checkBox10 = new System.Windows.Forms.CheckBox();
+ this.pictureBox10 = new System.Windows.Forms.PictureBox();
+ this.groupBox11 = new System.Windows.Forms.GroupBox();
+ this.checkBox11 = new System.Windows.Forms.CheckBox();
+ this.pictureBox11 = new System.Windows.Forms.PictureBox();
+ this.groupBox12 = new System.Windows.Forms.GroupBox();
+ this.checkBox12 = new System.Windows.Forms.CheckBox();
+ this.pictureBox12 = new System.Windows.Forms.PictureBox();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.groupBox2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+ this.groupBox3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
+ this.groupBox4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
+ this.groupBox5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
+ this.groupBox6.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
+ this.groupBox7.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
+ this.groupBox8.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();
+ this.groupBox9.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit();
+ this.groupBox10.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit();
+ this.groupBox11.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit();
+ this.groupBox12.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).BeginInit();
+ this.SuspendLayout();
+ //
+ // okButton
+ //
+ resources.ApplyResources(this.okButton, "okButton");
+ this.okButton.ForeColor = System.Drawing.Color.Black;
+ this.okButton.Name = "okButton";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.checkBox1);
+ this.groupBox1.Controls.Add(this.pictureBox1);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.ForeColor = System.Drawing.Color.Black;
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // checkBox1
+ //
+ resources.ApplyResources(this.checkBox1, "checkBox1");
+ this.checkBox1.Name = "checkBox1";
+ this.checkBox1.UseVisualStyleBackColor = true;
+ //
+ // pictureBox1
+ //
+ resources.ApplyResources(this.pictureBox1, "pictureBox1");
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.TabStop = false;
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.checkBox2);
+ this.groupBox2.Controls.Add(this.pictureBox2);
+ resources.ApplyResources(this.groupBox2, "groupBox2");
+ this.groupBox2.ForeColor = System.Drawing.Color.Black;
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.TabStop = false;
+ //
+ // checkBox2
+ //
+ resources.ApplyResources(this.checkBox2, "checkBox2");
+ this.checkBox2.Name = "checkBox2";
+ this.checkBox2.UseVisualStyleBackColor = true;
+ //
+ // pictureBox2
+ //
+ resources.ApplyResources(this.pictureBox2, "pictureBox2");
+ this.pictureBox2.Name = "pictureBox2";
+ this.pictureBox2.TabStop = false;
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.checkBox3);
+ this.groupBox3.Controls.Add(this.pictureBox3);
+ resources.ApplyResources(this.groupBox3, "groupBox3");
+ this.groupBox3.ForeColor = System.Drawing.Color.Black;
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.TabStop = false;
+ //
+ // checkBox3
+ //
+ resources.ApplyResources(this.checkBox3, "checkBox3");
+ this.checkBox3.Name = "checkBox3";
+ this.checkBox3.UseVisualStyleBackColor = true;
+ //
+ // pictureBox3
+ //
+ resources.ApplyResources(this.pictureBox3, "pictureBox3");
+ this.pictureBox3.Name = "pictureBox3";
+ this.pictureBox3.TabStop = false;
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.checkBox4);
+ this.groupBox4.Controls.Add(this.pictureBox4);
+ resources.ApplyResources(this.groupBox4, "groupBox4");
+ this.groupBox4.ForeColor = System.Drawing.Color.Black;
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.TabStop = false;
+ //
+ // checkBox4
+ //
+ resources.ApplyResources(this.checkBox4, "checkBox4");
+ this.checkBox4.Name = "checkBox4";
+ this.checkBox4.UseVisualStyleBackColor = true;
+ //
+ // pictureBox4
+ //
+ resources.ApplyResources(this.pictureBox4, "pictureBox4");
+ this.pictureBox4.Name = "pictureBox4";
+ this.pictureBox4.TabStop = false;
+ //
+ // retryButton
+ //
+ resources.ApplyResources(this.retryButton, "retryButton");
+ this.retryButton.ForeColor = System.Drawing.Color.Black;
+ this.retryButton.Name = "retryButton";
+ this.retryButton.UseVisualStyleBackColor = true;
+ this.retryButton.Click += new System.EventHandler(this.retryButton_Click);
+ //
+ // abortButton
+ //
+ resources.ApplyResources(this.abortButton, "abortButton");
+ this.abortButton.ForeColor = System.Drawing.Color.Black;
+ this.abortButton.Name = "abortButton";
+ this.abortButton.UseVisualStyleBackColor = true;
+ this.abortButton.Click += new System.EventHandler(this.abortButton_Click);
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.checkBox5);
+ this.groupBox5.Controls.Add(this.pictureBox5);
+ resources.ApplyResources(this.groupBox5, "groupBox5");
+ this.groupBox5.ForeColor = System.Drawing.Color.Black;
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.TabStop = false;
+ //
+ // checkBox5
+ //
+ resources.ApplyResources(this.checkBox5, "checkBox5");
+ this.checkBox5.Name = "checkBox5";
+ this.checkBox5.UseVisualStyleBackColor = true;
+ //
+ // pictureBox5
+ //
+ resources.ApplyResources(this.pictureBox5, "pictureBox5");
+ this.pictureBox5.Name = "pictureBox5";
+ this.pictureBox5.TabStop = false;
+ //
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.checkBox6);
+ this.groupBox6.Controls.Add(this.pictureBox6);
+ resources.ApplyResources(this.groupBox6, "groupBox6");
+ this.groupBox6.ForeColor = System.Drawing.Color.Black;
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.TabStop = false;
+ //
+ // checkBox6
+ //
+ resources.ApplyResources(this.checkBox6, "checkBox6");
+ this.checkBox6.Name = "checkBox6";
+ this.checkBox6.UseVisualStyleBackColor = true;
+ //
+ // pictureBox6
+ //
+ resources.ApplyResources(this.pictureBox6, "pictureBox6");
+ this.pictureBox6.Name = "pictureBox6";
+ this.pictureBox6.TabStop = false;
+ //
+ // groupBox7
+ //
+ this.groupBox7.Controls.Add(this.checkBox7);
+ this.groupBox7.Controls.Add(this.pictureBox7);
+ resources.ApplyResources(this.groupBox7, "groupBox7");
+ this.groupBox7.ForeColor = System.Drawing.Color.Black;
+ this.groupBox7.Name = "groupBox7";
+ this.groupBox7.TabStop = false;
+ //
+ // checkBox7
+ //
+ resources.ApplyResources(this.checkBox7, "checkBox7");
+ this.checkBox7.Name = "checkBox7";
+ this.checkBox7.UseVisualStyleBackColor = true;
+ //
+ // pictureBox7
+ //
+ resources.ApplyResources(this.pictureBox7, "pictureBox7");
+ this.pictureBox7.Name = "pictureBox7";
+ this.pictureBox7.TabStop = false;
+ //
+ // groupBox8
+ //
+ this.groupBox8.Controls.Add(this.checkBox8);
+ this.groupBox8.Controls.Add(this.pictureBox8);
+ resources.ApplyResources(this.groupBox8, "groupBox8");
+ this.groupBox8.ForeColor = System.Drawing.Color.Black;
+ this.groupBox8.Name = "groupBox8";
+ this.groupBox8.TabStop = false;
+ //
+ // checkBox8
+ //
+ resources.ApplyResources(this.checkBox8, "checkBox8");
+ this.checkBox8.Name = "checkBox8";
+ this.checkBox8.UseVisualStyleBackColor = true;
+ //
+ // pictureBox8
+ //
+ resources.ApplyResources(this.pictureBox8, "pictureBox8");
+ this.pictureBox8.Name = "pictureBox8";
+ this.pictureBox8.TabStop = false;
+ //
+ // groupBox9
+ //
+ this.groupBox9.Controls.Add(this.checkBox9);
+ this.groupBox9.Controls.Add(this.pictureBox9);
+ resources.ApplyResources(this.groupBox9, "groupBox9");
+ this.groupBox9.ForeColor = System.Drawing.Color.Black;
+ this.groupBox9.Name = "groupBox9";
+ this.groupBox9.TabStop = false;
+ //
+ // checkBox9
+ //
+ resources.ApplyResources(this.checkBox9, "checkBox9");
+ this.checkBox9.Name = "checkBox9";
+ this.checkBox9.UseVisualStyleBackColor = true;
+ //
+ // pictureBox9
+ //
+ resources.ApplyResources(this.pictureBox9, "pictureBox9");
+ this.pictureBox9.Name = "pictureBox9";
+ this.pictureBox9.TabStop = false;
+ //
+ // groupBox10
+ //
+ this.groupBox10.Controls.Add(this.checkBox10);
+ this.groupBox10.Controls.Add(this.pictureBox10);
+ resources.ApplyResources(this.groupBox10, "groupBox10");
+ this.groupBox10.ForeColor = System.Drawing.Color.Black;
+ this.groupBox10.Name = "groupBox10";
+ this.groupBox10.TabStop = false;
+ //
+ // checkBox10
+ //
+ resources.ApplyResources(this.checkBox10, "checkBox10");
+ this.checkBox10.Name = "checkBox10";
+ this.checkBox10.UseVisualStyleBackColor = true;
+ //
+ // pictureBox10
+ //
+ resources.ApplyResources(this.pictureBox10, "pictureBox10");
+ this.pictureBox10.Name = "pictureBox10";
+ this.pictureBox10.TabStop = false;
+ //
+ // groupBox11
+ //
+ this.groupBox11.Controls.Add(this.checkBox11);
+ this.groupBox11.Controls.Add(this.pictureBox11);
+ resources.ApplyResources(this.groupBox11, "groupBox11");
+ this.groupBox11.ForeColor = System.Drawing.Color.Black;
+ this.groupBox11.Name = "groupBox11";
+ this.groupBox11.TabStop = false;
+ //
+ // checkBox11
+ //
+ resources.ApplyResources(this.checkBox11, "checkBox11");
+ this.checkBox11.Name = "checkBox11";
+ this.checkBox11.UseVisualStyleBackColor = true;
+ //
+ // pictureBox11
+ //
+ resources.ApplyResources(this.pictureBox11, "pictureBox11");
+ this.pictureBox11.Name = "pictureBox11";
+ this.pictureBox11.TabStop = false;
+ //
+ // groupBox12
+ //
+ this.groupBox12.Controls.Add(this.checkBox12);
+ this.groupBox12.Controls.Add(this.pictureBox12);
+ resources.ApplyResources(this.groupBox12, "groupBox12");
+ this.groupBox12.ForeColor = System.Drawing.Color.Black;
+ this.groupBox12.Name = "groupBox12";
+ this.groupBox12.TabStop = false;
+ //
+ // checkBox12
+ //
+ resources.ApplyResources(this.checkBox12, "checkBox12");
+ this.checkBox12.Name = "checkBox12";
+ this.checkBox12.UseVisualStyleBackColor = true;
+ //
+ // pictureBox12
+ //
+ resources.ApplyResources(this.pictureBox12, "pictureBox12");
+ this.pictureBox12.Name = "pictureBox12";
+ this.pictureBox12.TabStop = false;
+ //
+ // DisplayForm
+ //
+ resources.ApplyResources(this, "$this");
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.DarkGray;
+ this.Controls.Add(this.groupBox12);
+ this.Controls.Add(this.groupBox11);
+ this.Controls.Add(this.groupBox10);
+ this.Controls.Add(this.groupBox9);
+ this.Controls.Add(this.groupBox8);
+ this.Controls.Add(this.groupBox7);
+ this.Controls.Add(this.groupBox6);
+ this.Controls.Add(this.groupBox5);
+ this.Controls.Add(this.abortButton);
+ this.Controls.Add(this.retryButton);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.okButton);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "DisplayForm";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+ this.groupBox4.ResumeLayout(false);
+ this.groupBox4.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
+ this.groupBox5.ResumeLayout(false);
+ this.groupBox5.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
+ this.groupBox6.ResumeLayout(false);
+ this.groupBox6.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
+ this.groupBox7.ResumeLayout(false);
+ this.groupBox7.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
+ this.groupBox8.ResumeLayout(false);
+ this.groupBox8.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit();
+ this.groupBox9.ResumeLayout(false);
+ this.groupBox9.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit();
+ this.groupBox10.ResumeLayout(false);
+ this.groupBox10.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit();
+ this.groupBox11.ResumeLayout(false);
+ this.groupBox11.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit();
+ this.groupBox12.ResumeLayout(false);
+ this.groupBox12.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).EndInit();
+ this.ResumeLayout(false);
}
@@ -281,5 +461,23 @@ namespace TBF.BenchControl.Network.Camera.Display
private System.Windows.Forms.CheckBox checkBox4;
private System.Windows.Forms.CheckBox checkBox5;
private System.Windows.Forms.CheckBox checkBox6;
+ private System.Windows.Forms.GroupBox groupBox7;
+ private System.Windows.Forms.CheckBox checkBox7;
+ private System.Windows.Forms.PictureBox pictureBox7;
+ private System.Windows.Forms.GroupBox groupBox8;
+ private System.Windows.Forms.CheckBox checkBox8;
+ private System.Windows.Forms.PictureBox pictureBox8;
+ private System.Windows.Forms.GroupBox groupBox9;
+ private System.Windows.Forms.CheckBox checkBox9;
+ private System.Windows.Forms.PictureBox pictureBox9;
+ private System.Windows.Forms.GroupBox groupBox10;
+ private System.Windows.Forms.CheckBox checkBox10;
+ private System.Windows.Forms.PictureBox pictureBox10;
+ private System.Windows.Forms.GroupBox groupBox11;
+ private System.Windows.Forms.CheckBox checkBox11;
+ private System.Windows.Forms.PictureBox pictureBox11;
+ private System.Windows.Forms.GroupBox groupBox12;
+ private System.Windows.Forms.CheckBox checkBox12;
+ private System.Windows.Forms.PictureBox pictureBox12;
}
}
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx
index c4f62a392..ba2bd54bf 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx
+++ b/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx
@@ -126,10 +126,10 @@
Verdana, 14.25pt
- 1072, 19
+ 1371, 12
- 146, 58
+ 102, 58
@@ -148,7 +148,7 @@
$this
- 8
+ 14
Top, Right
@@ -217,7 +217,7 @@
Verdana, 14.25pt
- 15, 8
+ 3, 1
335, 293
@@ -238,7 +238,7 @@
$this
- 7
+ 13
Top, Right
@@ -313,7 +313,7 @@
Verdana, 14.25pt
- 365, 8
+ 344, 1
335, 293
@@ -334,7 +334,7 @@
$this
- 6
+ 12
Top, Right
@@ -409,7 +409,7 @@
Verdana, 14.25pt
- 717, 8
+ 685, 1
335, 293
@@ -430,7 +430,7 @@
$this
- 5
+ 11
Top, Right
@@ -505,7 +505,7 @@
Verdana, 14.25pt
- 15, 306
+ 1026, 1
335, 293
@@ -526,7 +526,7 @@
$this
- 4
+ 10
Top, Right
@@ -538,10 +538,10 @@
NoControl
- 1072, 96
+ 1371, 89
- 146, 58
+ 102, 58
8
@@ -559,7 +559,7 @@
$this
- 3
+ 9
Top, Right
@@ -571,10 +571,10 @@
NoControl
- 1072, 173
+ 1371, 166
- 146, 58
+ 102, 58
9
@@ -592,7 +592,7 @@
$this
- 2
+ 8
Top, Right
@@ -667,7 +667,7 @@
Verdana, 14.25pt
- 365, 306
+ 3, 296
335, 293
@@ -688,7 +688,7 @@
$this
- 1
+ 7
Top, Right
@@ -763,7 +763,7 @@
Verdana, 14.25pt
- 717, 306
+ 344, 296
335, 293
@@ -784,6 +784,582 @@
$this
+ 6
+
+
+ Top, Right
+
+
+ True
+
+
+ MiddleRight
+
+
+ Verdana, 12pt
+
+
+ NoControl
+
+
+ 257, 19
+
+
+ 70, 22
+
+
+ 3
+
+
+ Retry
+
+
+ MiddleRight
+
+
+ checkBox7
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox7
+
+
+ 0
+
+
+ NoControl
+
+
+ 7, 45
+
+
+ 320, 240
+
+
+ StretchImage
+
+
+ 1
+
+
+ pictureBox7
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox7
+
+
+ 1
+
+
+ Verdana, 14.25pt
+
+
+ 685, 297
+
+
+ 335, 293
+
+
+ 12
+
+
+ Watermeter 7
+
+
+ groupBox7
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 5
+
+
+ Top, Right
+
+
+ True
+
+
+ MiddleRight
+
+
+ Verdana, 12pt
+
+
+ NoControl
+
+
+ 257, 19
+
+
+ 70, 22
+
+
+ 3
+
+
+ Retry
+
+
+ MiddleRight
+
+
+ checkBox8
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox8
+
+
+ 0
+
+
+ NoControl
+
+
+ 7, 45
+
+
+ 320, 240
+
+
+ StretchImage
+
+
+ 1
+
+
+ pictureBox8
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox8
+
+
+ 1
+
+
+ Verdana, 14.25pt
+
+
+ 1026, 297
+
+
+ 335, 293
+
+
+ 13
+
+
+ Watermeter 8
+
+
+ groupBox8
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 4
+
+
+ Top, Right
+
+
+ True
+
+
+ MiddleRight
+
+
+ Verdana, 12pt
+
+
+ NoControl
+
+
+ 257, 19
+
+
+ 70, 22
+
+
+ 3
+
+
+ Retry
+
+
+ MiddleRight
+
+
+ checkBox9
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox9
+
+
+ 0
+
+
+ NoControl
+
+
+ 7, 45
+
+
+ 320, 240
+
+
+ StretchImage
+
+
+ 1
+
+
+ pictureBox9
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox9
+
+
+ 1
+
+
+ Verdana, 14.25pt
+
+
+ 3, 591
+
+
+ 335, 293
+
+
+ 14
+
+
+ Watermeter 9
+
+
+ groupBox9
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 3
+
+
+ Top, Right
+
+
+ True
+
+
+ MiddleRight
+
+
+ Verdana, 12pt
+
+
+ NoControl
+
+
+ 257, 19
+
+
+ 70, 22
+
+
+ 3
+
+
+ Retry
+
+
+ MiddleRight
+
+
+ checkBox10
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox10
+
+
+ 0
+
+
+ NoControl
+
+
+ 7, 45
+
+
+ 320, 240
+
+
+ StretchImage
+
+
+ 1
+
+
+ pictureBox10
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox10
+
+
+ 1
+
+
+ Verdana, 14.25pt
+
+
+ 344, 591
+
+
+ 335, 293
+
+
+ 15
+
+
+ Watermeter 10
+
+
+ groupBox10
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 2
+
+
+ Top, Right
+
+
+ True
+
+
+ MiddleRight
+
+
+ Verdana, 12pt
+
+
+ NoControl
+
+
+ 257, 19
+
+
+ 70, 22
+
+
+ 3
+
+
+ Retry
+
+
+ MiddleRight
+
+
+ checkBox11
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox11
+
+
+ 0
+
+
+ NoControl
+
+
+ 7, 45
+
+
+ 320, 240
+
+
+ StretchImage
+
+
+ 1
+
+
+ pictureBox11
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox11
+
+
+ 1
+
+
+ Verdana, 14.25pt
+
+
+ 685, 591
+
+
+ 335, 293
+
+
+ 16
+
+
+ Watermeter 11
+
+
+ groupBox11
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
+
+ Top, Right
+
+
+ True
+
+
+ MiddleRight
+
+
+ Verdana, 12pt
+
+
+ NoControl
+
+
+ 257, 19
+
+
+ 70, 22
+
+
+ 3
+
+
+ Retry
+
+
+ MiddleRight
+
+
+ checkBox12
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox12
+
+
+ 0
+
+
+ NoControl
+
+
+ 7, 45
+
+
+ 320, 240
+
+
+ StretchImage
+
+
+ 1
+
+
+ pictureBox12
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox12
+
+
+ 1
+
+
+ Verdana, 14.25pt
+
+
+ 1026, 591
+
+
+ 335, 293
+
+
+ 17
+
+
+ Watermeter 12
+
+
+ groupBox12
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
0
@@ -796,7 +1372,10 @@
True
- 1237, 613
+ 1483, 887
+
+
+ NoControl
DisplayForm