From d5243e1d10c68c3ba9bcdb9f432df63e95c8bdc2 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 21 Feb 2020 11:35:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A6=E4=BE=A7=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4e23321613d5810896a861927de43e06edb2d7fd --- labs/CameraCardDemo/MainForm.Designer.cs | 138 +++++++++++++++-------- labs/CameraCardDemo/MainForm.cs | 4 + labs/CameraCardDemo/MainForm.resx | 3 - 3 files changed, 98 insertions(+), 47 deletions(-) diff --git a/labs/CameraCardDemo/MainForm.Designer.cs b/labs/CameraCardDemo/MainForm.Designer.cs index 75201bf9..fa7bae8d 100644 --- a/labs/CameraCardDemo/MainForm.Designer.cs +++ b/labs/CameraCardDemo/MainForm.Designer.cs @@ -72,9 +72,12 @@ this.numberValue = new System.Windows.Forms.TextBox(); this.numberLabel = new System.Windows.Forms.Label(); this.searchButton = new System.Windows.Forms.Button(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.pullDataMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.exitMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.pullDataButton = new System.Windows.Forms.Button(); + this.tabControl2 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.tabPage4 = new System.Windows.Forms.TabPage(); tab1 = new System.Windows.Forms.TabPage(); tab1.SuspendLayout(); this.idcGroupBox.SuspendLayout(); @@ -84,7 +87,8 @@ this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cameraRender)).BeginInit(); this.tabControl1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); + this.tab4.SuspendLayout(); + this.tabControl2.SuspendLayout(); this.SuspendLayout(); // // tab1 @@ -99,7 +103,7 @@ tab1.Location = new System.Drawing.Point(4, 22); tab1.Name = "tab1"; tab1.Padding = new System.Windows.Forms.Padding(3); - tab1.Size = new System.Drawing.Size(1000, 679); + tab1.Size = new System.Drawing.Size(1000, 703); tab1.TabIndex = 0; tab1.Text = "图像采集"; tab1.UseVisualStyleBackColor = true; @@ -386,7 +390,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.log.Location = new System.Drawing.Point(173, 516); this.log.Name = "log"; - this.log.Size = new System.Drawing.Size(819, 142); + this.log.Size = new System.Drawing.Size(819, 166); this.log.TabIndex = 3; this.log.Text = ""; // @@ -394,6 +398,7 @@ // this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.panel1.Controls.Add(this.pullDataButton); this.panel1.Controls.Add(this.searchButton); this.panel1.Controls.Add(this.numberValue); this.panel1.Controls.Add(this.numberLabel); @@ -403,12 +408,12 @@ this.panel1.Controls.Add(this.classLabel); this.panel1.Location = new System.Drawing.Point(7, 6); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(160, 652); + this.panel1.Size = new System.Drawing.Size(160, 676); this.panel1.TabIndex = 2; // // nameValue // - this.nameValue.Location = new System.Drawing.Point(55, 44); + this.nameValue.Location = new System.Drawing.Point(55, 77); this.nameValue.Name = "nameValue"; this.nameValue.Size = new System.Drawing.Size(100, 21); this.nameValue.TabIndex = 3; @@ -416,7 +421,7 @@ // nameLabel // this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(8, 49); + this.nameLabel.Location = new System.Drawing.Point(8, 82); this.nameLabel.Name = "nameLabel"; this.nameLabel.Size = new System.Drawing.Size(41, 12); this.nameLabel.TabIndex = 2; @@ -425,7 +430,7 @@ // classSecletor // this.classSecletor.FormattingEnabled = true; - this.classSecletor.Location = new System.Drawing.Point(55, 11); + this.classSecletor.Location = new System.Drawing.Point(55, 44); this.classSecletor.Name = "classSecletor"; this.classSecletor.Size = new System.Drawing.Size(100, 20); this.classSecletor.TabIndex = 1; @@ -433,7 +438,7 @@ // classLabel // this.classLabel.AutoSize = true; - this.classLabel.Location = new System.Drawing.Point(7, 16); + this.classLabel.Location = new System.Drawing.Point(7, 49); this.classLabel.Name = "classLabel"; this.classLabel.Size = new System.Drawing.Size(41, 12); this.classLabel.TabIndex = 0; @@ -467,10 +472,11 @@ this.tabControl1.Controls.Add(this.tab2); this.tabControl1.Controls.Add(this.tab3); this.tabControl1.Controls.Add(this.tab4); - this.tabControl1.Location = new System.Drawing.Point(0, 24); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1008, 705); + this.tabControl1.Size = new System.Drawing.Size(1008, 729); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 2; // @@ -496,6 +502,7 @@ // // tab4 // + this.tab4.Controls.Add(this.tabControl2); this.tab4.Location = new System.Drawing.Point(4, 22); this.tab4.Name = "tab4"; this.tab4.Padding = new System.Windows.Forms.Padding(3); @@ -514,7 +521,7 @@ // // numberValue // - this.numberValue.Location = new System.Drawing.Point(55, 80); + this.numberValue.Location = new System.Drawing.Point(55, 113); this.numberValue.Name = "numberValue"; this.numberValue.Size = new System.Drawing.Size(100, 21); this.numberValue.TabIndex = 5; @@ -522,7 +529,7 @@ // numberLabel // this.numberLabel.AutoSize = true; - this.numberLabel.Location = new System.Drawing.Point(8, 85); + this.numberLabel.Location = new System.Drawing.Point(8, 118); this.numberLabel.Name = "numberLabel"; this.numberLabel.Size = new System.Drawing.Size(53, 12); this.numberLabel.TabIndex = 4; @@ -530,35 +537,76 @@ // // searchButton // - this.searchButton.Location = new System.Drawing.Point(9, 118); + this.searchButton.Location = new System.Drawing.Point(9, 151); this.searchButton.Name = "searchButton"; this.searchButton.Size = new System.Drawing.Size(146, 30); this.searchButton.TabIndex = 6; this.searchButton.Text = "检索"; this.searchButton.UseVisualStyleBackColor = true; // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.pullDataMenu, - this.exitMenu}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1008, 25); - this.menuStrip1.TabIndex = 4; - this.menuStrip1.Text = "menuStrip1"; - // - // pullDataMenu - // - this.pullDataMenu.Name = "pullDataMenu"; - this.pullDataMenu.Size = new System.Drawing.Size(68, 21); - this.pullDataMenu.Text = "更新数据"; - // - // exitMenu - // - this.exitMenu.Name = "exitMenu"; - this.exitMenu.Size = new System.Drawing.Size(44, 21); - this.exitMenu.Text = "退出"; + // pullDataButton + // + this.pullDataButton.Location = new System.Drawing.Point(9, 3); + this.pullDataButton.Name = "pullDataButton"; + this.pullDataButton.Size = new System.Drawing.Size(146, 30); + this.pullDataButton.TabIndex = 7; + this.pullDataButton.Text = "更新数据"; + this.pullDataButton.UseVisualStyleBackColor = true; + // + // tabControl2 + // + this.tabControl2.Alignment = System.Windows.Forms.TabAlignment.Left; + this.tabControl2.Controls.Add(this.tabPage1); + this.tabControl2.Controls.Add(this.tabPage2); + this.tabControl2.Controls.Add(this.tabPage3); + this.tabControl2.Controls.Add(this.tabPage4); + this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl2.ItemSize = new System.Drawing.Size(100, 40); + this.tabControl2.Location = new System.Drawing.Point(3, 3); + this.tabControl2.Multiline = true; + this.tabControl2.Name = "tabControl2"; + this.tabControl2.SelectedIndex = 0; + this.tabControl2.Size = new System.Drawing.Size(994, 697); + this.tabControl2.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.tabControl2.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Location = new System.Drawing.Point(44, 4); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(946, 689); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "账号"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Location = new System.Drawing.Point(104, 4); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(886, 689); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "常规"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Location = new System.Drawing.Point(104, 4); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(886, 689); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "存储设置"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // tabPage4 + // + this.tabPage4.Location = new System.Drawing.Point(104, 4); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Size = new System.Drawing.Size(886, 689); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "关于应用"; + this.tabPage4.UseVisualStyleBackColor = true; // // MainForm // @@ -566,7 +614,6 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1008, 729); this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.menuStrip1); this.Controls.Add(this.tabControl1); this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -583,8 +630,8 @@ this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.cameraRender)).EndInit(); this.tabControl1.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); + this.tab4.ResumeLayout(false); + this.tabControl2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -635,8 +682,11 @@ private System.Windows.Forms.Button searchButton; private System.Windows.Forms.TextBox numberValue; private System.Windows.Forms.Label numberLabel; - private System.Windows.Forms.MenuStrip menuStrip1; - private System.Windows.Forms.ToolStripMenuItem pullDataMenu; - private System.Windows.Forms.ToolStripMenuItem exitMenu; + private System.Windows.Forms.Button pullDataButton; + private System.Windows.Forms.TabControl tabControl2; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.TabPage tabPage4; } } \ No newline at end of file diff --git a/labs/CameraCardDemo/MainForm.cs b/labs/CameraCardDemo/MainForm.cs index 03fcd68f..4c728b54 100644 --- a/labs/CameraCardDemo/MainForm.cs +++ b/labs/CameraCardDemo/MainForm.cs @@ -383,5 +383,9 @@ namespace CameraCardDemo this._pen.Dispose(); CVRSDK.CVR_CloseComm(); } + + private void tabControl2_DrawItem(object sender, DrawItemEventArgs e) + { + } } } \ No newline at end of file diff --git a/labs/CameraCardDemo/MainForm.resx b/labs/CameraCardDemo/MainForm.resx index 0d95232e..5be4ca86 100644 --- a/labs/CameraCardDemo/MainForm.resx +++ b/labs/CameraCardDemo/MainForm.resx @@ -123,9 +123,6 @@ 17, 17 - - 138, 17 - 40