Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -1512,7 +1512,7 @@ namespace OTSIncAReportGrids
             else
             {
                 m_frm_userprogress.Width = (int)(MyPrimaryScreen.DESKTOP.Width / MyPrimaryScreen.ScaleX * 0.9);
-                m_frm_userprogress.Location = new Point(ls_main_form.Location.X + 200, ls_main_form.Location.Y + 200 + (int)(MyPrimaryScreen.DESKTOP.Height / MyPrimaryScreen.ScaleX) / 2);
+                m_frm_userprogress.Location = new Point(ls_main_form.Location.X + 80, ls_main_form.Location.Y + (int)(MyPrimaryScreen.DESKTOP.Height / MyPrimaryScreen.ScaleX) / 2);
                 m_frm_userprogress.Show();
                 m_frm_userprogress.SetProgressValueAndText(0, "Loading data of particles...");
             }

OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayParticle.cs

@@ -572,32 +572,38 @@ namespace OTSIncAReportGraph
            
             if (GetPaintState() == PaintState.PAINT)
             {
-                DisplaySegment ds = m_listdsegment[0];
-                if (ds.ShowMode == SegmentShowMode.DRAWPOINT)
+                if (m_listdsegment.Count > 0)
                 {
-                    try
+
+                    DisplaySegment ds = m_listdsegment[0];
+                    if (ds.ShowMode == SegmentShowMode.DRAWPOINT)
                     {
-                        e.Graphics.DrawImage(m_image, m_rect);
+                        try
+                        {
+                            e.Graphics.DrawImage(m_image, m_rect);
+
+                        }
+                        catch (Exception ex)
+                        {
+                            NLog.LogManager.GetCurrentClassLogger().Error(ex.ToString());
+                        }
+
 
                     }
-                    catch (Exception ex)
+                    else
                     {
-                        NLog.LogManager.GetCurrentClassLogger().Error(ex.ToString());
-                    }
-                  
+                        //调用绘制基本线
+                        foreach (DisplaySegment item in m_listdsegment)
+                        {
+                            item.OnPaint(e);
+                        }
 
-                }
-                else 
-                {
-                    //调用绘制基本线
-                    foreach (DisplaySegment item in m_listdsegment)
-                    {
-                        item.OnPaint(e);
                     }
 
                 }
-             
-              
+
+
+