add the ExpandScan xray collection mode

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-EN.xml

@@ -49,7 +49,7 @@
 		<collection RegName="ResGrp" grpKey="3" text="x-ray" description="">
 
 			<member itemKey="20032" itemName="" itemText="Big x-ray(ms)"/>
-			<member itemKey="20033" itemName="" itemText="ScanMode" comboContent="Spot Scan,Plane Scan" />
+			<member itemKey="20033" itemName="" itemText="ScanMode" comboContent="SpotScan,PlaneScan,ExpandScan" />
 			<member itemKey="20034" itemName="" itemText="ExpectCounts"/>
 			<member itemKey="20036" itemName="" itemText="BigPartThreshold（ECD/um）" description=""/>
 			<member itemKey="20037" itemName="" itemText="Small X-ray（Ms）" description=""/>
@@ -429,9 +429,9 @@
         <member itemKey="12285" itemName="" itemText="3072x2048"/>
         <member itemKey="12286" itemName="" itemText="4096x3072"/>
         <member itemKey="12287" itemName="" itemText="space"/>
-        <member itemKey="12288" itemName="" itemText="Spot Scan"/>
-        <member itemKey="12289" itemName="" itemText="Plain Scan"/>
-        <member itemKey="12290" itemName="" itemText="space"/>
+        <member itemKey="12288" itemName="" itemText="SpotScan"/>
+        <member itemKey="12289" itemName="" itemText="PlainScan"/>
+        <member itemKey="12290" itemName="" itemText="ExpandScan"/>
         <member itemKey="12291" itemName="" itemText="space"/>
         <member itemKey="12292" itemName="" itemText="space"/>
         <member itemKey="12293" itemName="" itemText="space"/>

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-ZH.xml

@@ -47,7 +47,7 @@
 		<collection RegName="ResGrp" grpKey="3" text="x-ray参数" description="">
 		
 			<member itemKey="20032" itemName="" itemText="x-ray时间（毫秒）" description="输入分析x-ray时间。"/>
-			<member itemKey="20033" itemName="" itemText="扫描方式" comboContent="点扫描,面扫描" description="选择分析x-ray扫描方式。"/>
+			<member itemKey="20033" itemName="" itemText="扫描方式" comboContent="点扫描,面扫描,扩展扫描" description="选择分析x-ray扫描方式。"/>
 			<member itemKey="20034" itemName="" itemText="期望计数率" description="输入分析x-ray计数率期望值。"/>
 			<member itemKey="20036" itemName="" itemText="分析阈值（等效圆直径/微米）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
 			<member itemKey="20037" itemName="" itemText="小颗粒x-ray时间（毫秒）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
@@ -399,7 +399,7 @@
         <member itemKey="12287" itemName="" itemText="空"/>
         <member itemKey="12288" itemName="" itemText="点扫描"/>
         <member itemKey="12289" itemName="" itemText="面扫描"/>
-        <member itemKey="12290" itemName="" itemText="空"/>
+        <member itemKey="12290" itemName="" itemText="扩展扫描"/>
         <member itemKey="12291" itemName="" itemText="取中"/>
         <member itemKey="12292" itemName="" itemText="向下"/>
         <member itemKey="12293" itemName="" itemText="向上"/>

OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -279,6 +279,7 @@ namespace OTSDataType
         {
             PointMode = 0,
             FeatureMode = 1,
+            ExpandMode=2
           
         }
 

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -980,7 +980,30 @@ namespace OTSModelSharp
 
 
             }
-           
+            else if (workmode == OTS_X_RAY_SCAN_MODE.ExpandMode)
+            {
+
+                uint nXRayAQTime;
+
+                if (bigparts.Count > 0)
+                {
+                    log.Info("Begin to collect xraydata:" + bigparts.Count + " on " + OTS_X_RAY_SCAN_MODE.FeatureMode.ToString());
+                    nXRayAQTime = (uint)pXRayParam.GetMidAnalyAQTime();
+                    m_EDSController.GetXRayByExpandFeatures(bigparts, nXRayAQTime, true);
+
+                }
+                if (smallparts.Count > 0)
+                {
+                    Thread.Sleep(500);
+                    log.Info("Begin to collect xraydata:" + smallparts.Count + " on " + OTS_X_RAY_SCAN_MODE.PointMode.ToString());
+                    nXRayAQTime = (uint)pXRayParam.GetSmallPartXrayTime();
+                    m_EDSController.GetXRayByParts(smallparts, nXRayAQTime, true);
+
+                }
+
+
+            }
+
             return;
         }
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -604,10 +604,7 @@ namespace OTSMeasureApp
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                     {
-                        if (OTS_GET_IMAGE_MODE.Spiral > (OTS_GET_IMAGE_MODE)(int)objVal || (OTS_GET_IMAGE_MODE)(int)objVal > OTS_GET_IMAGE_MODE.Zshape)
-                        {
-                            return false;
-                        }
+                      
 
                         m_poMsrParams.GetImageScanParam().SetStartImageMode((OTS_GET_IMAGE_MODE)(int)objVal);
                     }
@@ -615,20 +612,14 @@ namespace OTSMeasureApp
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_SPEED:
                     {
-                        if (OTS_IMAGE_SCANSPEED_OPTIONS.low > (OTS_IMAGE_SCANSPEED_OPTIONS)(int)objVal || (OTS_IMAGE_SCANSPEED_OPTIONS)(int)objVal > OTS_IMAGE_SCANSPEED_OPTIONS.high)
-                        {
-                            return false;
-                        }
+                       
                         m_poMsrParams.GetImageScanParam().SetScanImageSpeed((OTS_IMAGE_SCANSPEED_OPTIONS)(int)objVal);
                     }
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
                     {
-                        if (OTS_IMAGE_RESULOTION_OPTIONS._512_384 > (OTS_IMAGE_RESULOTION_OPTIONS)(int)objVal || (OTS_IMAGE_RESULOTION_OPTIONS)(int)objVal > OTS_IMAGE_RESULOTION_OPTIONS._4096_3072)
-                        {
-                            return false;
-                        }
+                      
                         m_poMsrParams.GetImageScanParam().SetImageResulotion((OTS_IMAGE_RESULOTION_OPTIONS)(int)objVal);
                     }
                     break;
@@ -637,23 +628,11 @@ namespace OTSMeasureApp
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.XRAYSCAN_MODE:
                     {
-                        if (OTS_X_RAY_SCAN_MODE.PointMode > (OTS_X_RAY_SCAN_MODE)(int)objVal || (OTS_X_RAY_SCAN_MODE)(int)objVal > OTS_X_RAY_SCAN_MODE.FeatureMode)
-                        {
-                            return false;
-                        }
+                     
                         m_poMsrParams.GetXRayParam().SetScanMode((OTS_X_RAY_SCAN_MODE)(int)objVal);
                     }
                     break;
-                //case OTS_SAMPLE_PROP_GRID_ITEMS.MEMBRANE_TYPE:
-                //    {
-                //        if (MEMBRANE_TYPE.MIN > (MEMBRANE_TYPE)(int)objVal || (MEMBRANE_TYPE)(int)objVal > MEMBRANE_TYPE.MAX)
-                //        {
-                //            return false;
-                //        }
-                //        m_Sample.SetMembraneType((MEMBRANE_TYPE)(int)objVal);
-                //    }
-                //    break;
-               
+           
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.BGREMOVE_TYPE:
                     {

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -226,20 +226,6 @@ namespace OTSMeasureApp
                 IDC_COMBO_AUTOBGREMOVETYP.SelectedIndex = 0;
             this.IDC_COMBO_AUTOBGREMOVETYP.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_AUTOBGREMOVETYPE_SelectedIndexChanged);
 
-            //腐蚀膨胀系数
-            //IDC_COMBO_CorrosionExpansionCoefficient.Items.Clear();
-            //ComboBoxItem ci = new ComboBoxItem();
-            //ci.Text = "0";
-            //ci.Value = 0;
-            //IDC_COMBO_CorrosionExpansionCoefficient.Items.Add(ci);
-            //for (int i=1;i<6;i++)
-            //{
-            //    ComboBoxItem cbi = new ComboBoxItem();
-            //    cbi.Text = (i*2+1).ToString();
-            //    cbi.Value = i;
-            //    IDC_COMBO_CorrosionExpansionCoefficient.Items.Add(cbi);
-            //}
-
 
             //X-Ray扫描方式
             IDC_COMBO_XRAYSCANMODE.Items.Clear();
@@ -248,7 +234,7 @@ namespace OTSMeasureApp
                 ComboBoxItem cbi = new ComboBoxItem();
                 cbi.Text = GetXRayScanModeIdString(enum_one);
                 cbi.Value = (int)enum_one;
-                //只添加点扫描
+             
 
                 IDC_COMBO_XRAYSCANMODE.Items.Add(cbi);
                
@@ -258,20 +244,7 @@ namespace OTSMeasureApp
                 IDC_COMBO_XRAYSCANMODE.SelectedIndex = 0;
             this.IDC_COMBO_XRAYSCANMODE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_XRAYSCANMODE_SelectedIndexChanged);
        
-            //分析X-Ray精度
-            //IDC_COMBO_ANALYXRAYSPEED.Items.Clear();
-            //foreach (otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)))
-            //{
-            //    ComboBoxItem cbi = new ComboBoxItem();
-            //    cbi.Text = GetXRayAnalySpeedIdString(enum_one);
-            //    cbi.Value = (int)enum_one;
-            //    IDC_COMBO_ANALYXRAYSPEED.Items.Add(cbi);
-            //}
-            //this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged -= new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
-            //if (IDC_COMBO_ANALYXRAYSPEED.Items.Count > 0)
-            //    IDC_COMBO_ANALYXRAYSPEED.SelectedIndex = 0;
-            //this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
-
+  
             //精炼工艺下拉框选项
             IDC_COMBO_TECHNOLOGY.Items.Clear();
             foreach (STEEL_TECHNOLOGY enum_one in Enum.GetValues(typeof(STEEL_TECHNOLOGY)))
@@ -1185,14 +1158,7 @@ namespace OTSMeasureApp
                 IDC_COMBO_XRAYSCANMODE.SelectAll();
                 return false;
             }
-            //if ("" == IDC_COMBO_ANALYXRAYSPEED.Text)
-            //{
-            //    string message = table["message21"].ToString();
-            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    IDC_COMBO_ANALYXRAYSPEED.Focus();
-            //    IDC_COMBO_ANALYXRAYSPEED.SelectAll();
-            //    return false;
-            //}
+          
             if ("" == IDC_EDIT_ANALYXRAYAIMVALUE.Text)
             {
                 string message = table["message22"].ToString();
@@ -1210,14 +1176,7 @@ namespace OTSMeasureApp
                 tBMeasArea.SelectAll();
                 return false;
             }
-            //if ("" == IDC_COMBO_CorrosionExpansionCoefficient.Text)
-            //{
-            //    string message = table["message62"].ToString();
-            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    IDC_COMBO_CorrosionExpansionCoefficient.Focus();
-            //    IDC_COMBO_CorrosionExpansionCoefficient.SelectAll();
-            //    return false;
-            //}
+     
 
             //string pat = @"^(-|\+)?\d{1,8}$";//只能输入1到3位的正负整数
             string pat = @"^-?[0-9]\d*$";//只能限定正负整数,包含0
@@ -1230,18 +1189,7 @@ namespace OTSMeasureApp
             Regex rgPositiveDecimals = new Regex(PositiveDecimals);
             Regex rgpositiveInteger = new Regex(positiveInteger);
             Regex rgpositiveOddNumber = new Regex(positiveOddNumber);
-            //是否是正确的数值格式类型判断
-            //if(IDC_COMBO_CorrosionExpansionCoefficient.Text!="0")
-            //{
-            //    if (rgpositiveOddNumber.Match(IDC_COMBO_CorrosionExpansionCoefficient.Text.Trim()).Success)
-            //    {
-            //        IDC_COMBO_CorrosionExpansionCoefficient.Focus();
-            //        IDC_COMBO_CorrosionExpansionCoefficient.SelectAll();
-            //        string message = table["message66"].ToString();
-            //        MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //        return false;
-            //    }
-            //}
+        
             //100倍时屏幕尺寸
             if (false == rg.Match(IDC_EDIT_SCREENWIDTH.Text.Trim()).Success)
             {
@@ -1406,14 +1354,7 @@ namespace OTSMeasureApp
                 return false;
             }
 
-            //if (false == rgPositiveDecimals.Match(IDC_EDIT_QuantifyMinSize.Text.Trim()).Success)
-            //{
-            //    IDC_EDIT_QuantifyMinSize.Focus();
-            //    IDC_EDIT_QuantifyMinSize.SelectAll();
-            //    string message = table["message63"].ToString();
-            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    return false;
-            //}
+       
           
             
             pat = @"^[0-9]+(\.[0-9]{1,3})?$";  //只能输入，1到3位小数的正数
@@ -1428,15 +1369,7 @@ namespace OTSMeasureApp
                 return false;
             }
 
-            ////最小放大倍数不得小于45倍
-            //if (Convert.ToInt32(IDC_EDIT_MINMAG.Text.Trim()) < 45)
-            //{
-            //    IDC_EDIT_MINMAG.Focus();
-            //    IDC_EDIT_MINMAG.SelectAll();
-            //    string message = "The minimum magnification cannot be less than 45 times";
-            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    return false;
-            //}
+       
 
             //再限制,x轴,y轴，的起止的，输入长度，因为现在已经有在mm和um之间的转换，所以这里要限制一下
             //x轴行程/mm 起
@@ -1616,13 +1549,7 @@ namespace OTSMeasureApp
 
             ThisSetIsModify();
 
-            //加载相关参数信息
-            //StageLoad();
-            //LoadSEMStageData();
-            //LoadImageScanPrm();
-            //LoadCGenParam();
-            //LoadImageProc();
-            //LoadXRayParam();
+           
         }
         /// <summary>
         /// 通过id设置当前正在工作的样品台

OTSIncAMeasureApp/ServiceCenter/CPP(Bruker)API/EDSController.cs

@@ -360,5 +360,10 @@ namespace OTSModelSharp.ServiceCenter
         {
             eds.SetQuantificationParam(IfAutoId, knownElements);
         }
+
+        public bool GetXRayByExpandFeatures(List<COTSParticleClr> a_listParticles, double a_nXRayAQTime, bool a_bElementInfo)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

OTSIncAMeasureApp/ServiceCenter/FEIAutoScript/FEIEDSController.cs

@@ -178,5 +178,10 @@ namespace OTSMeasureApp.ServiceCenter
         {
             ApiClass.SetQuantificationParam(IfAutoId, knownElements);
         }
+
+        public bool GetXRayByExpandFeatures(List<COTSParticleClr> a_listParticles, double a_nXRayAQTime, bool a_bElementInfo)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

OTSIncAMeasureApp/ServiceCenter/IMeasureHardware.cs

@@ -77,6 +77,8 @@ namespace OTSModelSharp.ServiceCenter
     {
         bool Connect();
         bool GetXRayByFeatures(List<COTSParticleClr> a_listParticles,  double a_nXRayAQTime, bool a_bElementInfo /*= FALSE*/);//这里将DWORD转成了Double类型，因为在后续调用时还有DWORD强制转换
+
+        bool GetXRayByExpandFeatures(List<COTSParticleClr> a_listParticles, double a_nXRayAQTime, bool a_bElementInfo /*= FALSE*/);
         bool GetXRayByParts(List<COTSParticleClr> a_listParticles, uint a_nXRayAQTime, bool a_bElementInfo /*= FALSE*/);
         bool CollectSpectrum(uint a_nXRayAQTime, ref uint[] a_XrayData);
         bool QuantifyXrayByPart(COTSParticleClr part);

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordEDSController.cs

@@ -195,5 +195,55 @@ namespace OTSMeasureApp.ServiceCenter
         {
             iExtender.SetQuantifiCationParam1(IfAutoId, knownElements);
         }
+
+        public bool GetXRayByExpandFeatures(List<COTSParticleClr> a_listParticles, double a_nXRayAQTime, bool a_bElementInfo)
+        {
+            List<AreaXrayParam> areaPrms = new List<AreaXrayParam>();
+            foreach (var part in a_listParticles)
+            {
+                var p = new AreaXrayParam();
+
+                p.dMilliSecondsTime = a_nXRayAQTime;
+                var feas = part.GetFeature().GetSegmentsList();
+              
+                foreach (var f in feas)
+                {
+                    var len = f.GetLength();
+                    var start = f.GetStart() - len*2;
+                    if (start < 0)
+                    {
+                        start = 0;
+                    }
+                    len = len * 3;
+
+                    p.a_listChord.Add(new Segment() { X = start, Y = f.GetHeight(), Length =len });
+
+                }
+
+                areaPrms.Add(p);
+            }
+            NLog.LogManager.GetCurrentClassLogger().Info("Begin to acquire feature xray data :" + areaPrms.Count);
+            iExtender.CollectXrayByFeatures(ref areaPrms, a_nXRayAQTime, a_bElementInfo);
+            NLog.LogManager.GetCurrentClassLogger().Info("End acquiring feature xray data :" + areaPrms.Count);
+            for (int i = 0; i < a_listParticles.Count; i++)
+            {
+                CPosXrayClr xray = a_listParticles[i].GetXray();
+                xray.SetXrayData(areaPrms[i].XrayData);
+                var listElement = areaPrms[i].listElement;
+                List<CElementChemistryClr> chelist = new List<CElementChemistryClr>();
+                foreach (var ele in listElement)
+                {
+                    var che = new CElementChemistryClr();
+                    che.SetName(ele.Key);
+                    che.SetPercentage(ele.Value);
+                    chelist.Add(che);
+                }
+                xray.SetElementQuantifyData(chelist);
+                a_listParticles[i].SetXray(xray);
+            }
+
+
+            return true;
+        }
     }
 }

OxfordExtenderWrapper/Form1.Designer.cs

@@ -29,10 +29,10 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -179,7 +179,6 @@
             this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.隐藏ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.button30 = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.拍图.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pBImage)).BeginInit();
@@ -1033,7 +1032,6 @@
             // 
             // 拍图
             // 
-            this.拍图.Controls.Add(this.button30);
             this.拍图.Controls.Add(this.cboSource);
             this.拍图.Controls.Add(this.txtBSEDwell);
             this.拍图.Controls.Add(this.txtBSEHeight);
@@ -1712,25 +1710,25 @@
             // 
             // chart1
             // 
-            chartArea2.Name = "ChartArea1";
-            this.chart1.ChartAreas.Add(chartArea2);
-            legend2.Alignment = System.Drawing.StringAlignment.Center;
-            legend2.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
-            legend2.Name = "Legend1";
-            this.chart1.Legends.Add(legend2);
+            chartArea1.Name = "ChartArea1";
+            this.chart1.ChartAreas.Add(chartArea1);
+            legend1.Alignment = System.Drawing.StringAlignment.Center;
+            legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
+            legend1.Name = "Legend1";
+            this.chart1.Legends.Add(legend1);
             this.chart1.Location = new System.Drawing.Point(554, 31);
             this.chart1.Margin = new System.Windows.Forms.Padding(2);
             this.chart1.Name = "chart1";
-            series3.ChartArea = "ChartArea1";
-            series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
-            series3.Legend = "Legend1";
-            series3.Name = "Series1";
-            series4.ChartArea = "ChartArea1";
-            series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
-            series4.Legend = "Legend1";
-            series4.Name = "Series2";
-            this.chart1.Series.Add(series3);
-            this.chart1.Series.Add(series4);
+            series1.ChartArea = "ChartArea1";
+            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
+            series1.Legend = "Legend1";
+            series1.Name = "Series1";
+            series2.ChartArea = "ChartArea1";
+            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
+            series2.Legend = "Legend1";
+            series2.Name = "Series2";
+            this.chart1.Series.Add(series1);
+            this.chart1.Series.Add(series2);
             this.chart1.Size = new System.Drawing.Size(593, 352);
             this.chart1.TabIndex = 3;
             this.chart1.Text = "chart1";
@@ -1795,16 +1793,6 @@
             this.退出ToolStripMenuItem.Text = "退出";
             this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
             // 
-            // button30
-            // 
-            this.button30.Location = new System.Drawing.Point(562, 18);
-            this.button30.Name = "button30";
-            this.button30.Size = new System.Drawing.Size(55, 23);
-            this.button30.TabIndex = 14;
-            this.button30.Text = "拍矩形";
-            this.button30.UseVisualStyleBackColor = true;
-            this.button30.Click += new System.EventHandler(this.button30_Click);
-            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1982,7 +1970,6 @@
         private System.Windows.Forms.ToolStripMenuItem 隐藏ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 退出ToolStripMenuItem;
         private System.Windows.Forms.Button button17;
-        private System.Windows.Forms.Button button30;
     }
 }
 

OxfordExtenderWrapper/Form1.cs

@@ -849,57 +849,7 @@ namespace OxfordExtenderWrapper
             }
         }
 
-        private void button30_Click(object sender, EventArgs e)
-        {
-            try
-            {
-
-                string path = System.Environment.CurrentDirectory;
-
-                ImageAquistionParam p = new ImageAquistionParam();
-                p.height = Convert.ToInt32(txtBSEHeight.Text);
-                p.width = Convert.ToInt32(txtBSEWidth.Text);
-                p.DwellTime = Convert.ToInt32(txtBSEDwell.Text);
-              
-                if (cboSource.Text == "BSE")
-                {
-                    p.sourceType = ExtenderIpcUI.ImageInputSourceType.Bse;
-                }
-                else
-                {
-                    p.sourceType = ExtenderIpcUI.ImageInputSourceType.SE;
-                }
-
-                p.ImageData = new byte[0];
-                var tr = new Thread(() =>
-                {
-
-
-                    iExtender.AquisitionImage(ref p);
-                }
-
-               );
-                tr.IsBackground = true;
-                tr.Start();
-                while (tr.IsAlive)
-                {
-                    Application.DoEvents();
-                }
-
-
-                var m_Bitmap = ToGrayBitmap(p.ImageData, p.width, p.height);
-
-                if (m_Bitmap != null)
-                {
-                    pBImage.Image = m_Bitmap;
-                }
-            }
-            catch (Exception r)
-            {
-                MessageBox.Show(r.Message);
-
-            }
-        }
+      
     }
 
 }

OxfordExtenderWrapper/Form1.resx

@@ -123,12 +123,6 @@
   <metadata name="含量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="元素.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="含量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="notifyIcon_wrapper.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>