Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -58,7 +58,7 @@ namespace OTSMeasureApp
         public int m_PropWindow_Y = 0;
 
      //   int Cur_Grid_Rows = 0;           //临时用于计算用的grid行号
-        public static int Const_Grid_Row = 49;    //总行数
+        public static int Const_Grid_Row = 50;    //总行数
         public static int Const_Grid_Column = 3;   //总列数
 
 

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -787,10 +787,10 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         public Bitmap GetBitmapByParticle(Bitmap ls_bt, Rectangle offset_rect)
         {
             //为了能把整个颗粒显示完整
-            offset_rect.X = offset_rect.X - 5;
-            offset_rect.Y = offset_rect.Y - 5;
-            offset_rect.Width = offset_rect.Width + 10;
-            offset_rect.Height = offset_rect.Height + 10;
+            offset_rect.X = offset_rect.X - 10;
+            offset_rect.Y = offset_rect.Y - 10;
+            offset_rect.Width = offset_rect.Width + 20;
+            offset_rect.Height = offset_rect.Height + 20;
 
             //防止计算偏差后，有坐标溢出现象
             if (offset_rect.X < 0)