复原按组分类显示

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -6,11 +6,7 @@ using System.Collections.Generic;
 namespace OTSIncAReportApp.OTSSampleReportInfo
 {
     #region 相关枚举定义
-    /// <summary>
-    /// document标签标识
-    /// </summary>
-    /// 
-
+  
     public enum REPORT_GRID_DATA_TYPE
     {
         STRING = 0,

OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayParticle.cs

@@ -52,6 +52,7 @@ namespace OTSIncAReportGraph
     {
         DRAWPARTICLEIMAGE = 0,
         DRAWCOLORIMAGE = 1,
+        DRAWGROUPCOLORIMAGE = 2
     }
 
     /// <summary>
@@ -80,6 +81,7 @@ namespace OTSIncAReportGraph
         private SegmentShowMode show_mode = SegmentShowMode.DRAWPARTICLEIMAGE;//绘线，绘点,默认绘点，意思为默认显示BSE原图像
         private Bitmap m_BSEimage;
         private Bitmap m_Colorimage;
+        private Bitmap m_GroupColorimage;
         private Bitmap originalFieldImage;
         private string m_sort_type = "从大到小";
         private float m_f_size = 0;
@@ -173,6 +175,7 @@ namespace OTSIncAReportGraph
 
             this.m_BSEimage = new Bitmap(objParticleData.RectWidth + 1, objParticleData.RectHeight + 1);
             this.m_Colorimage = new Bitmap(objParticleData.RectWidth + 1, objParticleData.RectHeight + 1);
+            m_GroupColorimage = new Bitmap(objParticleData.RectWidth + 1, objParticleData.RectHeight + 1);
             //再循环取出里面所有的segment
             foreach (Segment seg in list_seg)
             {
@@ -193,6 +196,7 @@ namespace OTSIncAReportGraph
 
                     var pixelColor = originalFieldImage.GetPixel(lsjs_x, lsjs_y);
 
+                    var GroupColor = DrawFunction.colorHx16toRGB(objParticleData.GroupColor);
                     lsjs_x = seg.Start - objParticleData.RectLeft + m;
 
                     lsjs_y = seg.Height - objParticleData.RectTop;
@@ -203,7 +207,7 @@ namespace OTSIncAReportGraph
 
                     m_BSEimage.SetPixel(lsjs_x, lsjs_y, pixelColor);//ls_list_colors[m]
                     m_Colorimage.SetPixel(lsjs_x, lsjs_y, m_color);
-
+                    m_GroupColorimage.SetPixel(lsjs_x, lsjs_y, GroupColor);
                 }
 
                 #endregion //------------------------------------------------------------------------------
@@ -618,18 +622,24 @@ namespace OTSIncAReportGraph
            
             if (GetPaintState() == PaintState.PAINT)
             {
-             
-                   
-                    if (this.ShowMode == SegmentShowMode.DRAWPARTICLEIMAGE)
-                    {
-                            g.DrawImage(m_BSEimage, m_Globalrect);
-                    }
-                    else
-                    {
-                        
-                        g.DrawImage(m_Colorimage, m_Globalrect);
-
-                    }
+
+
+                if (this.ShowMode == SegmentShowMode.DRAWPARTICLEIMAGE)
+                {
+                    g.DrawImage(m_BSEimage, m_Globalrect);
+                }
+
+                else
+            if (this.ShowMode == SegmentShowMode.DRAWCOLORIMAGE)
+                {
+
+                    g.DrawImage(m_Colorimage, m_Globalrect);
+
+                }
+                else
+                {
+                    g.DrawImage(m_GroupColorimage, m_Globalrect);
+                }
 
             }
             if (GetPaintState() == PaintState.CONCISEPAINT)

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1690,7 +1690,6 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>