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

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionSortImage.cs

@@ -389,7 +389,6 @@ namespace OTSIncAReportGraph.Controls
             {
                 SolidBrush b = new SolidBrush(Color.White);
                 e.Graphics.FillRectangle(b, ls_sortparticledistribution.RectF);
-
                 //绘制矩形的外边框
                 ControlPaint.DrawBorder(e.Graphics, Rectangle.Round(ls_sortparticledistribution.RectF),
                                     m_c_ColumnRectangleColor,
@@ -407,10 +406,12 @@ namespace OTSIncAReportGraph.Controls
             }
             #endregion
 
+            
+
             #region //进行绘制部份------------------------------------
-     
 
-             
+
+
 
             foreach (SortParticleDistribution ls_sortparticledistribution in m_list_sortparticledistribution)
             {

OTSIncAReportApp/1-UI/Control_Graph/OTSIncAReportGraphFuncation/SortParticleDistribution.cs

@@ -258,7 +258,7 @@ namespace OTSIncAReportGraph
             float f_ls_y = this.m_rectf.Y + 3 ;
 
             float rectf_height = 0;
-            foreach (DisplayParticle dp in this.list_dparticle)
+            foreach (DisplayParticle dp in this.List_DParticle)
             {
                 //这里要对不显示的颗粒进行屏蔽,也就是进行不计算位置，不知道会不会有其它的影响
                 if (dp.GetPaintState() != PaintState.NOPAINT)
@@ -294,8 +294,9 @@ namespace OTSIncAReportGraph
                     //}
                     //定位好该多边形后，对x轴进行增长，为下一个多边形定位好位置
                     f_ls_x = f_ls_x + dp.GetShowRect().Width + 3 ;
+                    dp.SetShowRect(new RectangleF(dp.GetShowRect().X + f_cz_x, dp.GetShowRect().Y + f_cz_y, dp.GetShowRect().Width, dp.GetShowRect().Height));
+
 
-    
                 }
             }
         }

OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayParticle.cs

@@ -291,8 +291,10 @@ namespace OTSIncAReportGraph
             return m_Globalrect; 
         
         }
-
-  
+        public void SetShowRect(RectangleF rectangleF)
+        {
+            m_Globalrect= rectangleF;
+        }
 
         /// <summary>
         /// OTSPointF
@@ -604,9 +606,7 @@ namespace OTSIncAReportGraph
                    
                     if (this.ShowMode == SegmentShowMode.DRAWPARTICLEIMAGE)
                     {
-                      
                             g.DrawImage(m_BSEimage, m_Globalrect);
-
                     }
                     else
                     {