diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs index 2376876..11e612f 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs @@ -37,6 +37,7 @@ namespace JoyD.Windows.CS this.btnDrawRegion = new System.Windows.Forms.ToolStripButton(); this.btnSelectColor = new System.Windows.Forms.ToolStripButton(); this.btnDeleteRegion = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -48,6 +49,16 @@ namespace JoyD.Windows.CS this.toolStrip.SuspendLayout(); this.SuspendLayout(); // + // btnDrawTempDiff + // + this.btnDrawTempDiff.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnDrawTempDiff.ImageTransparentColor = System.Drawing.Color.Transparent; + this.btnDrawTempDiff.Name = "btnDrawTempDiff"; + this.btnDrawTempDiff.Size = new System.Drawing.Size(23, 4); + this.btnDrawTempDiff.Text = "绘制温差图"; + this.btnDrawTempDiff.ToolTipText = "绘制温差图"; + this.btnDrawTempDiff.Click += new System.EventHandler(this.BtnDrawTempDiff_Click); + // // splitContainer // this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; @@ -85,7 +96,9 @@ namespace JoyD.Windows.CS this.picBoxTemp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picBoxTemp.TabIndex = 0; this.picBoxTemp.TabStop = false; + this.picBoxTemp.SizeChanged += new System.EventHandler(this.PicBoxTemp_SizeChanged); this.picBoxTemp.Paint += new System.Windows.Forms.PaintEventHandler(this.PicBoxTemp_Paint); + this.picBoxTemp.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseClick); this.picBoxTemp.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseDown); this.picBoxTemp.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseMove); this.picBoxTemp.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseUp); @@ -95,6 +108,7 @@ namespace JoyD.Windows.CS // // toolStripContainer.ContentPanel // + this.toolStripContainer.ContentPanel.Controls.Add(this.toolStrip1); this.toolStripContainer.ContentPanel.Controls.Add(this.toolStrip); this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(174, 425); this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill; @@ -114,11 +128,11 @@ namespace JoyD.Windows.CS this.btnDeleteRegion, this.btnDrawTempDiff}); this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.toolStrip.Location = new System.Drawing.Point(0, 0); + this.toolStrip.Location = new System.Drawing.Point(22, 96); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(47, 7); + this.toolStrip.Size = new System.Drawing.Size(93, 7); this.toolStrip.TabIndex = 1; - this.toolStrip.Text = "toolStrip"; + this.toolStrip.Text = "工具条"; // // btnDrawRegion // @@ -129,6 +143,7 @@ namespace JoyD.Windows.CS this.btnDrawRegion.Size = new System.Drawing.Size(23, 4); this.btnDrawRegion.Text = "画框"; this.btnDrawRegion.ToolTipText = "绘制温度检测区域(点击开启/关闭)"; + this.btnDrawRegion.Click += new System.EventHandler(this.BtnDrawRegion_Click); // // btnSelectColor // @@ -138,6 +153,7 @@ namespace JoyD.Windows.CS this.btnSelectColor.Size = new System.Drawing.Size(23, 4); this.btnSelectColor.Text = "选择颜色"; this.btnSelectColor.ToolTipText = "选择绘制区域的颜色(点击更换颜色)"; + this.btnSelectColor.Click += new System.EventHandler(this.BtnSelectColor_Click); // // btnDeleteRegion // @@ -149,33 +165,15 @@ namespace JoyD.Windows.CS this.btnDeleteRegion.ToolTipText = "删除选中的区域"; this.btnDeleteRegion.Click += new System.EventHandler(this.BtnDeleteRegion_Click); // - // btnDrawTempDiff + // toolStrip1 // - this.btnDrawTempDiff.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btnDrawTempDiff.ImageTransparentColor = System.Drawing.Color.Transparent; - this.btnDrawTempDiff.Name = "btnDrawTempDiff"; - this.btnDrawTempDiff.Size = new System.Drawing.Size(23, 4); - this.btnDrawTempDiff.Text = "绘制温差图"; - this.btnDrawTempDiff.ToolTipText = "绘制温差对比图"; - this.btnDrawTempDiff.Click += new System.EventHandler(this.BtnDrawTempDiff_Click); - // - // btnDrawRegion - // - this.btnDrawRegion.Click += new System.EventHandler(this.BtnDrawRegion_Click); - // - // btnSelectColor - // - this.btnSelectColor.Click += new System.EventHandler(this.BtnSelectColor_Click); - // - // picBoxTemp - // - this.picBoxTemp.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseClick); - this.picBoxTemp.SizeChanged += new System.EventHandler(this.PicBoxTemp_SizeChanged); - // - // Setting - // 设置窗体事件 - this.Shown += new System.EventHandler(this.Setting_Shown); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Setting_FormClosing); + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.toolStrip1.Location = new System.Drawing.Point(54, 140); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(51, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "温差图"; // // Setting // @@ -186,6 +184,8 @@ namespace JoyD.Windows.CS this.Name = "Setting"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "检测配置"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Setting_FormClosing); + this.Shown += new System.EventHandler(this.Setting_Shown); this.splitContainer.Panel1.ResumeLayout(false); this.splitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); @@ -213,5 +213,6 @@ namespace JoyD.Windows.CS private System.Windows.Forms.ToolStripButton btnSelectColor; private System.Windows.Forms.ToolStripButton btnDeleteRegion; private System.Windows.Forms.ToolStripButton btnDrawTempDiff; + private System.Windows.Forms.ToolStrip toolStrip1; } } \ No newline at end of file