调整溯源缩放bug

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.Designer.cs

@@ -511,7 +511,7 @@
             // 
             this.ToolStripMenuItemDelete_Particle.Name = "ToolStripMenuItemDelete_Particle";
             this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(210, 22);
-            this.ToolStripMenuItemDelete_Particle.Text = "Delete particles";
+            this.ToolStripMenuItemDelete_Particle.Text = "删除颗粒";
             this.ToolStripMenuItemDelete_Particle.Click += new System.EventHandler(this.ToolStripMenuItem_Delete_Particle_Click);
             // 
             // ImportSTDDb

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -1867,6 +1867,7 @@ namespace OTSIncAReportGrids
 
             if (sfd.ShowDialog() == DialogResult.OK)
             {
+                Cursor = Cursors.WaitCursor;
                 //IWorkbook workbook = new HSSFWorkbook();   //用于创建.xls  office2003开始以前的
                 IWorkbook workbook = new NPOI.XSSF.UserModel.XSSFWorkbook();        //用于创建.xlsx office2007开始以后的
                 ISheet sheet;
@@ -2059,6 +2060,7 @@ namespace OTSIncAReportGrids
                     //打开刚才导出的文件
                     System.Diagnostics.Process.Start(sfd.FileName);
                 }
+                Cursor = Cursors.Default ;
             }
         }
 

OTSInclusionsTraceability/OTSInclusionsTraceability.Designer.cs

@@ -53,8 +53,7 @@ namespace OTSInclusionsTraceability
             // 
             // panel1
             // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.Controls.Add(this.comboBox_SourceType);
             this.panel1.Controls.Add(this.label3);
@@ -65,14 +64,14 @@ namespace OTSInclusionsTraceability
             this.panel1.Controls.Add(this.label1);
             this.panel1.Location = new System.Drawing.Point(12, 12);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1591, 54);
+            this.panel1.Size = new System.Drawing.Size(1364, 54);
             this.panel1.TabIndex = 0;
             // 
             // comboBox_SourceType
             // 
             this.comboBox_SourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox_SourceType.FormattingEnabled = true;
-            this.comboBox_SourceType.Location = new System.Drawing.Point(1341, 15);
+            this.comboBox_SourceType.Location = new System.Drawing.Point(1082, 15);
             this.comboBox_SourceType.Name = "comboBox_SourceType";
             this.comboBox_SourceType.Size = new System.Drawing.Size(141, 20);
             this.comboBox_SourceType.TabIndex = 7;
@@ -81,7 +80,7 @@ namespace OTSInclusionsTraceability
             // 
             this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(1269, 18);
+            this.label3.Location = new System.Drawing.Point(1010, 18);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(65, 12);
             this.label3.TabIndex = 6;
@@ -90,7 +89,7 @@ namespace OTSInclusionsTraceability
             // bn_Find
             // 
             this.bn_Find.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.bn_Find.Location = new System.Drawing.Point(1504, 13);
+            this.bn_Find.Location = new System.Drawing.Point(1245, 13);
             this.bn_Find.Name = "bn_Find";
             this.bn_Find.Size = new System.Drawing.Size(75, 23);
             this.bn_Find.TabIndex = 5;
@@ -137,10 +136,13 @@ namespace OTSInclusionsTraceability
             // 
             // panel2
             // 
+            this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panel2.Controls.Add(this.dgV_Traceablilty);
             this.panel2.Location = new System.Drawing.Point(12, 80);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1594, 725);
+            this.panel2.Size = new System.Drawing.Size(1364, 604);
             this.panel2.TabIndex = 1;
             // 
             // dgV_Traceablilty
@@ -154,7 +156,7 @@ namespace OTSInclusionsTraceability
             this.dgV_Traceablilty.Location = new System.Drawing.Point(0, 0);
             this.dgV_Traceablilty.Name = "dgV_Traceablilty";
             this.dgV_Traceablilty.RowHeadersVisible = false;
-            this.dgV_Traceablilty.Size = new System.Drawing.Size(1591, 725);
+            this.dgV_Traceablilty.Size = new System.Drawing.Size(1361, 601);
             this.dgV_Traceablilty.TabIndex = 0;
             // 
             // contextMenuStrip1
@@ -199,7 +201,7 @@ namespace OTSInclusionsTraceability
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1615, 814);
+            this.ClientSize = new System.Drawing.Size(1380, 688);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.Name = "InclusionsTraceability";
@@ -207,7 +209,6 @@ namespace OTSInclusionsTraceability
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "InclusionsTraceability";
             this.Load += new System.EventHandler(this.InclusionsTraceability_Load);
-            this.Resize += new System.EventHandler(this.InclusionsTraceability_Resize);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.panel2.ResumeLayout(false);

OTSInclusionsTraceability/OTSInclusionsTraceability.cs

@@ -482,17 +482,7 @@ namespace OTSInclusionsTraceability
 
         private void InclusionsTraceability_Resize(object sender, EventArgs e)
         {
-            //控件随窗体全屏显示
-            float[] scale = (float[])Tag;
-            int i = 2;
 
-            foreach (Control ctrl in this.Controls)
-            {
-                ctrl.Left = (int)(Size.Width * scale[i++]);
-                ctrl.Top = (int)(Size.Height * scale[i++]);
-                ctrl.Width = (int)(Size.Width / (float)scale[0] * ((Size)ctrl.Tag).Width);
-                ctrl.Height = (int)(Size.Height / (float)scale[1] * ((Size)ctrl.Tag).Height);
-            }
         }
 
         private void ExportExecl_Click(object sender, EventArgs e)