Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -366,7 +366,6 @@ namespace OTSIncAReportGrids
 
         private void BindDataGridView()
         {
-
             #region 加载显示进度条部份
             this.Cursor = Cursors.WaitCursor;
             m_frm_userprogress = new Frm_UserProgress();
@@ -385,10 +384,6 @@ namespace OTSIncAReportGrids
                 m_frm_userprogress.Show();
                 m_frm_userprogress.SetProgressValueAndText(0, str7);
             }
-
-            string str2 = "加载颗粒列表，开始从底层加载数据....";
-            str2 = table["str2"].ToString();
-            m_frm_userprogress.SetProgressValueAndText(1, str2);
             #endregion
 
             dgV_ParticlesDevidePage.Rows.Clear();
@@ -536,7 +531,7 @@ namespace OTSIncAReportGrids
             for (int i = 0; i < particles.Rows.Count; i++)
             {
                 //更新进度,每100条记录加载完，更新一次进度
-                if (i % 100 == 0)
+                if (i % 2 == 0)
                     
                     m_frm_userprogress.SetProgressValueAndText((int)(jd * i), "loading..");
 
@@ -595,6 +590,7 @@ namespace OTSIncAReportGrids
                                 Bitmap bmap = fielddata.GetBitmapByParticle(FieldImage.Value, rectangle);
                                 bmap.Tag = new List<string>() { particles.Rows[i]["FieldId"].ToString(), particles.Rows[i]["ParticleId"].ToString(), particles.Rows[i]["TypeId"].ToString() };
                                 dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = bmap;
+                                dgV_ParticlesDevidePage.Rows[add_rowindex].Height = bmap.Height+20;
                             //}
                         }
                         if (enl.Current.Key == "DiameterRatio")
@@ -650,17 +646,8 @@ namespace OTSIncAReportGrids
                         }
                     }
                 }
-
-                //每加载2000条数据后，进行一次内存回收
-                //if (i % 2000 == 0)
-                //{
-                //    GC.Collect();
-                //    GC.WaitForPendingFinalizers();
-                //}
-
             }
 
-            this.dgV_ParticlesDevidePage.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCellsExceptHeaders;
             #region 加载进度条进度部份结束
             //加载完成设置鼠标为默认
             this.Cursor = Cursors.Default;