添加温差表

Windows/CS/Framework4.0/Toprie/Toprie/README.md

@@ -165,15 +165,15 @@
 #### 配置状态说明
 1. 初始状态/就绪状态：
    - 显示btnDrawRegion和btnDrawTempDiff按钮
-   - 隐藏btnSelectColor、btnDeleteRegion按钮
+   - 隐藏btnSelectColor、btnDeleteRegion按钮、dataGridViewTempDiff
 2. 选中区域状态：
    - 显示btnDeleteRegion和btnSelectColor按钮
-   - 隐藏btnDrawRegion和btnDrawTempDiff按钮
+   - 隐藏btnDrawRegion和btnDrawTempDiff按钮、dataGridViewTempDiff
 3. 绘制状态：
    - 显示btnSelectColor按钮
    - 显示btnDrawRegion按钮
    - 隐藏btnDeleteRegion按钮
-   - 隐藏btnDrawTempDiff按钮
+   - 隐藏btnDrawTempDiff按钮、dataGridViewTempDiff
 4. 绘制温差图状态：
-   - 显示btnDrawTempDiff按钮
+   - 显示btnDrawTempDiff按钮，显示dataGridViewTempDiff
    - 隐藏btnSelectColor、btnDeleteRegion、btnDrawRegion按钮

Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs

@@ -32,6 +32,7 @@ namespace JoyD.Windows.CS
             this.groupBoxTempDisplay = new System.Windows.Forms.GroupBox();
             this.picBoxTemp = new System.Windows.Forms.PictureBox();
             this.toolStripContainer = new System.Windows.Forms.ToolStripContainer();
+            this.dataGridViewTempDiff = new System.Windows.Forms.DataGridView();
             this.toolStrip = new System.Windows.Forms.ToolStrip();
             this.btnDrawRegion = new System.Windows.Forms.ToolStripButton();
             this.btnSelectColor = new System.Windows.Forms.ToolStripButton();
@@ -43,8 +44,10 @@ namespace JoyD.Windows.CS
             this.splitContainer.SuspendLayout();
             this.groupBoxTempDisplay.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picBoxTemp)).BeginInit();
+            this.toolStripContainer.ContentPanel.SuspendLayout();
             this.toolStripContainer.TopToolStripPanel.SuspendLayout();
             this.toolStripContainer.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTempDiff)).BeginInit();
             this.toolStrip.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -61,8 +64,8 @@ namespace JoyD.Windows.CS
             // splitContainer.Panel2
             // 
             this.splitContainer.Panel2.Controls.Add(this.toolStripContainer);
-            this.splitContainer.Size = new System.Drawing.Size(649, 450);
+            this.splitContainer.Size = new System.Drawing.Size(793, 450);
-            this.splitContainer.SplitterDistance = 471;
+            this.splitContainer.SplitterDistance = 480;
             this.splitContainer.TabIndex = 1;
             // 
             // groupBoxTempDisplay
@@ -71,7 +74,7 @@ namespace JoyD.Windows.CS
             this.groupBoxTempDisplay.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxTempDisplay.Location = new System.Drawing.Point(0, 0);
             this.groupBoxTempDisplay.Name = "groupBoxTempDisplay";
-            this.groupBoxTempDisplay.Size = new System.Drawing.Size(471, 450);
+            this.groupBoxTempDisplay.Size = new System.Drawing.Size(480, 450);
             this.groupBoxTempDisplay.TabIndex = 1;
             this.groupBoxTempDisplay.TabStop = false;
             this.groupBoxTempDisplay.Text = "实时温度";
@@ -81,7 +84,7 @@ namespace JoyD.Windows.CS
             this.picBoxTemp.Dock = System.Windows.Forms.DockStyle.Fill;
             this.picBoxTemp.Location = new System.Drawing.Point(3, 21);
             this.picBoxTemp.Name = "picBoxTemp";
-            this.picBoxTemp.Size = new System.Drawing.Size(465, 426);
+            this.picBoxTemp.Size = new System.Drawing.Size(474, 426);
             this.picBoxTemp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picBoxTemp.TabIndex = 0;
             this.picBoxTemp.TabStop = false;
@@ -92,18 +95,6 @@ namespace JoyD.Windows.CS
             this.picBoxTemp.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseMove);
             this.picBoxTemp.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseUp);
             // 
-            // dataGridViewTempDiff
-            // 
-            this.dataGridViewTempDiff = new System.Windows.Forms.DataGridView();
-            this.dataGridViewTempDiff.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridViewTempDiff.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridViewTempDiff.Location = new System.Drawing.Point(0, 0);
-            this.dataGridViewTempDiff.Name = "dataGridViewTempDiff";
-            this.dataGridViewTempDiff.RowHeadersWidth = 51;
-            this.dataGridViewTempDiff.RowTemplate.Height = 27;
-            this.dataGridViewTempDiff.Size = new System.Drawing.Size(174, 400);
-            this.dataGridViewTempDiff.TabIndex = 0;
-            // 
             // toolStripContainer
             // 
             // 
@@ -111,11 +102,11 @@ namespace JoyD.Windows.CS
             // 
             this.toolStripContainer.ContentPanel.AutoScroll = true;
             this.toolStripContainer.ContentPanel.Controls.Add(this.dataGridViewTempDiff);
-            this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(174, 400);
+            this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(309, 425);
             this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.toolStripContainer.Location = new System.Drawing.Point(0, 0);
             this.toolStripContainer.Name = "toolStripContainer";
-            this.toolStripContainer.Size = new System.Drawing.Size(174, 450);
+            this.toolStripContainer.Size = new System.Drawing.Size(309, 450);
             this.toolStripContainer.TabIndex = 0;
             this.toolStripContainer.Text = "toolStripContainer";
             // 
@@ -123,6 +114,17 @@ namespace JoyD.Windows.CS
             // 
             this.toolStripContainer.TopToolStripPanel.Controls.Add(this.toolStrip);
             // 
+            // dataGridViewTempDiff
+            // 
+            this.dataGridViewTempDiff.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridViewTempDiff.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridViewTempDiff.Location = new System.Drawing.Point(0, 0);
+            this.dataGridViewTempDiff.Name = "dataGridViewTempDiff";
+            this.dataGridViewTempDiff.RowHeadersWidth = 51;
+            this.dataGridViewTempDiff.RowTemplate.Height = 27;
+            this.dataGridViewTempDiff.Size = new System.Drawing.Size(309, 425);
+            this.dataGridViewTempDiff.TabIndex = 0;
+            // 
             // toolStrip
             // 
             this.toolStrip.AllowDrop = true;
@@ -179,13 +181,12 @@ namespace JoyD.Windows.CS
             this.btnDrawTempDiff.Text = "绘制温差图";
             this.btnDrawTempDiff.ToolTipText = "绘制温差图";
             this.btnDrawTempDiff.Click += new System.EventHandler(this.BtnDrawTempDiff_Click);
-
             // 
             // Setting
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(649, 450);
+            this.ClientSize = new System.Drawing.Size(793, 450);
             this.Controls.Add(this.splitContainer);
             this.Name = "Setting";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
@@ -198,10 +199,12 @@ namespace JoyD.Windows.CS
             this.splitContainer.ResumeLayout(false);
             this.groupBoxTempDisplay.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.picBoxTemp)).EndInit();
+            this.toolStripContainer.ContentPanel.ResumeLayout(false);
             this.toolStripContainer.TopToolStripPanel.ResumeLayout(false);
             this.toolStripContainer.TopToolStripPanel.PerformLayout();
             this.toolStripContainer.ResumeLayout(false);
             this.toolStripContainer.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewTempDiff)).EndInit();
             this.toolStrip.ResumeLayout(false);
             this.toolStrip.PerformLayout();
             this.ResumeLayout(false);

Windows/CS/Framework4.0/Toprie/Toprie/Setting.resx

@@ -120,7 +120,4 @@
   <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>516, 17</value>
   </metadata>
-  <metadata name="tempDiffToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>327, 17</value>
-  </metadata>
 </root>