add the ability of displaying particles in both grey mode and color mode. fix the bug that cann't editing the sample name.

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -1184,16 +1184,15 @@ namespace OTSModelSharp
             int nindex = -1;
             foreach (var pSample in m_listSamples)
             {
-                nindex++;
+               
 
                 String sSampleName = pSample.GetName();
-                if (a_sName.CompareTo(sSampleName) != 0)
+                if (a_sName.Equals(sSampleName))
                 {
-                    if (nindex != m_nWorkingSampeIndex)
-                    {
+                    
 
                         return false;
-                    }
+                   
                 }
             }
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -31,8 +31,6 @@ namespace OTSMeasureApp
         public void DisplaySampleMeasureInfo(OTSSamplePropertyInfo SampleInfo)
         {
 
-
-            //当点击事件响应结束后，将之前点击的行数和列数清0，避免选择工作样品重新赋值响应CELL值改变事件
             PropGrid.Show();
             m_SampleGrid.m_ClickRow = 0;
             m_SampleGrid.m_ClickColumn = 0;
@@ -129,10 +127,10 @@ namespace OTSMeasureApp
                     //去除修改GRID的样品名的前后空格
                     string str = (string)ObjVal;
                     str = str.Trim();
-                    ObjVal = str;
-                    if (!m_measurePara.CheckSampleNameIsValid((string)ObjVal))
+                   
+                    if (!m_measurePara.CheckSampleNameIsValid(str))
                     {
-                     
+                        m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME, OTS_ITEM_TYPES.STRING, str);
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                        
                       

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/CreateRectangle.cs

@@ -1125,7 +1125,7 @@ namespace OTSMeasureApp
             BSEImageWitdh = m_RegionF.Width;
             BSEImageHeight = m_RegionF.Height;
             BSEImageLocation = m_RegionF.Location;
-            //SEMCenterPoint = m_RegionF.Location;
+          
             LineStartPoint = m_RegionF.Location;
 
             
@@ -1333,19 +1333,20 @@ namespace OTSMeasureApp
         SetVisualGray = 1,
         //显示BSE灰度曲线图
         SetVisualGrayForSpecialGray=2,
-        grayToolStripMenuItem =4,
+        grayToolStripMenuItem =3,
         //切换至BSE图
-        ChangeDiffImageShow = 5,
+        ChangeDiffImageShow = 4,
         //BSE去背景图
-        DelBSEBG =6,
+        DelBSEBG =5,
+        ColoredBSENoBG=6,
         //显示BSE去背景灰度曲线图
         SampleHoleBSEImage = 7,
         //线扫描曲线
-        MenuItemLineScam = 9,
+        MenuItemLineScam = 8,
         //单点采集Xray与元素信息
-        PointScanElementMenuItem = 10,
+        PointScanElementMenuItem = 9,
         //导出采集信息报告
-        ExportReport =11
+        ExportReport =10
     }
 
 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/VisualStage.cs

@@ -548,7 +548,7 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
                 sampleGDIObject.sampleName = SMeasurePara.sSampleName;
 
                 sampleGDIObject.SelColor = selColor;
-;
+
 
                 //add the default measure area from config file.
 

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.Designer.cs

@@ -36,15 +36,16 @@
             this.picBox = new System.Windows.Forms.PictureBox();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.SampleParaLock = new System.Windows.Forms.ToolStripMenuItem();
-            this.ViewStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.VisualAdjustingMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.grayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.ChangeDiffImageShow = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.AbandonGrayStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.MenuItemLineScam = new System.Windows.Forms.ToolStripMenuItem();
+            this.MenuItemLineScan = new System.Windows.Forms.ToolStripMenuItem();
             this.PointScanElementMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ExportScanInfoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.myChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
@@ -54,12 +55,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.myChart)).BeginInit();
             this.SuspendLayout();
             // 
-            // pbBSEImage
+            // picBox
             // 
             this.picBox.BackColor = System.Drawing.Color.Transparent;
             this.picBox.Location = new System.Drawing.Point(0, 0);
-            this.picBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.picBox.Name = "pbBSEImage";
+            this.picBox.Margin = new System.Windows.Forms.Padding(2);
+            this.picBox.Name = "picBox";
             this.picBox.Size = new System.Drawing.Size(781, 453);
             this.picBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.picBox.TabIndex = 0;
@@ -74,19 +75,20 @@
             this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.SampleParaLock,
-            this.ViewStripMenuItem,
+            this.VisualAdjustingMenu,
             this.toolStripMenuItem1,
             this.grayToolStripMenuItem,
             this.toolStripSeparator1,
             this.ChangeDiffImageShow,
             this.ToolStripMenuItem,
+            this.toolStripMenuItem2,
             this.AbandonGrayStripMenuItem,
             this.toolStripSeparator2,
-            this.MenuItemLineScam,
+            this.MenuItemLineScan,
             this.PointScanElementMenuItem,
             this.ExportScanInfoMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(243, 236);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(243, 280);
             this.contextMenuStrip1.Opened += new System.EventHandler(this.contextMenuStrip1_Opened);
             // 
             // SampleParaLock
@@ -98,10 +100,10 @@
             // 
             // ViewStripMenuItem
             // 
-            this.ViewStripMenuItem.Name = "ViewStripMenuItem";
-            this.ViewStripMenuItem.Size = new System.Drawing.Size(242, 22);
-            this.ViewStripMenuItem.Text = "可视化设置BSE图背景灰度范围";
-            this.ViewStripMenuItem.Click += new System.EventHandler(this.ViewStripMenuItem_Click);
+            this.VisualAdjustingMenu.Name = "ViewStripMenuItem";
+            this.VisualAdjustingMenu.Size = new System.Drawing.Size(242, 22);
+            this.VisualAdjustingMenu.Text = "可视化设置BSE图背景灰度范围";
+            this.VisualAdjustingMenu.Click += new System.EventHandler(this.ViewStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
@@ -136,6 +138,13 @@
             this.ToolStripMenuItem.Text = "BSE去背景图";
             this.ToolStripMenuItem.Click += new System.EventHandler(this.ShowRemoveBGImage_Click);
             // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(242, 22);
+            this.toolStripMenuItem2.Text = "BSE去背景彩色图";
+            this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
+            // 
             // AbandonGrayStripMenuItem
             // 
             this.AbandonGrayStripMenuItem.Name = "AbandonGrayStripMenuItem";
@@ -150,12 +159,11 @@
             // 
             // MenuItemLineScam
             // 
-            this.MenuItemLineScam.CheckOnClick = true;
-            this.MenuItemLineScam.Enabled = false;
-            this.MenuItemLineScam.Name = "MenuItemLineScam";
-            this.MenuItemLineScam.Size = new System.Drawing.Size(242, 22);
-            this.MenuItemLineScam.Text = "线扫描曲线";
-            this.MenuItemLineScam.Click += new System.EventHandler(this.ShowGrayLevelLine_Click);
+            this.MenuItemLineScan.CheckOnClick = true;
+            this.MenuItemLineScan.Name = "MenuItemLineScam";
+            this.MenuItemLineScan.Size = new System.Drawing.Size(242, 22);
+            this.MenuItemLineScan.Text = "线扫描曲线";
+            this.MenuItemLineScan.Click += new System.EventHandler(this.ShowGrayLevelLine_Click);
             // 
             // PointScanElementMenuItem
             // 
@@ -186,7 +194,7 @@
             legend1.Name = "Legend1";
             this.myChart.Legends.Add(legend1);
             this.myChart.Location = new System.Drawing.Point(0, 0);
-            this.myChart.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.myChart.Margin = new System.Windows.Forms.Padding(2);
             this.myChart.Name = "myChart";
             series1.ChartArea = "ChartArea1";
             series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
@@ -206,7 +214,7 @@
             // 
             this.panelXray.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.panelXray.Location = new System.Drawing.Point(0, 253);
-            this.panelXray.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panelXray.Margin = new System.Windows.Forms.Padding(2);
             this.panelXray.Name = "panelXray";
             this.panelXray.Size = new System.Drawing.Size(781, 200);
             this.panelXray.TabIndex = 0;
@@ -223,7 +231,7 @@
             this.Controls.Add(this.picBox);
             this.Controls.Add(this.myChart);
             this.DockAreas = ((OTS.WinFormsUI.Docking.DockAreas)((OTS.WinFormsUI.Docking.DockAreas.DockTop | OTS.WinFormsUI.Docking.DockAreas.Document)));
-            this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Name = "OTSMeasureStatusWindow";
             this.Text = "OTSMeasureStatus";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -241,7 +249,7 @@
         private System.Windows.Forms.ToolStripMenuItem SampleParaLock;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem grayToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem MenuItemLineScam;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemLineScan;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         public System.Windows.Forms.PictureBox picBox;
@@ -252,7 +260,8 @@
         private OTSIncAGraph.Controls.Control_XRayTable control_XRayTable1;
         private System.Windows.Forms.ToolStripMenuItem PointScanElementMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ExportScanInfoMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem ViewStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem VisualAdjustingMenu;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
     }
 }

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -709,6 +709,7 @@ namespace OTSMeasureApp
             //给SampleWindow 发送样品信息
            
             m_SamplepaceWindow.AddSampleArea(SMInfo.SMeasurePara);
+
              m_SamplepaceWindow.ReadSEMDataAndSetToCurrentSample();
             //给PropWindow 发送工作样品属性信息
             m_SPropertyWindows.DisplaySampleMeasureInfo(SMInfo);