|
|
@@ -558,16 +558,11 @@ namespace OTSMeasureApp
|
|
|
if (!bfResult) { return; }
|
|
|
|
|
|
|
|
|
- //用于线扫描曲线
|
|
|
-
|
|
|
- //UpdateImageOrChart(m_imagetype);
|
|
|
+
|
|
|
ShowBitmap(m_iWidth, m_iHeight, coloredParticleImage);
|
|
|
- //Imagedata = new byte[m_iWidth];
|
|
|
+
|
|
|
IsShowGrayLevelLine = false;
|
|
|
- //获取默认Y轴
|
|
|
- //GetYSize();
|
|
|
- ////获取行数据
|
|
|
- //GetLineImage(YSize, m_iWidth, ref Imagedata);
|
|
|
+
|
|
|
|
|
|
myChart.Visible = false;
|
|
|
picBox.Show();
|
|
|
@@ -1058,8 +1053,7 @@ namespace OTSMeasureApp
|
|
|
//Y值
|
|
|
double rate = (double)picBox.Image.Height / (double)rectangle.Height;
|
|
|
int YSize = Convert.ToInt32((rate * (double)e.Y));
|
|
|
- //显示线扫描 黄色线的曲线数据
|
|
|
- //GetLineImage(YSize, m_iWidth, ref Imagedata);
|
|
|
+
|
|
|
string strGrayValue = grayValue.ToString();
|
|
|
switch (strGrayValue.ToString().Length)
|
|
|
{
|
|
|
@@ -1306,23 +1300,6 @@ namespace OTSMeasureApp
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
|
- #region 获取SEM当前位置
|
|
|
- //public void GetSEMLocation(ref double dPositionX, ref double dPositionY, ref double dPositionR)
|
|
|
- //{
|
|
|
- // try
|
|
|
- // {
|
|
|
- // COTSControlFunExport cfun = COTSControlFunExport.GetControllerInstance();
|
|
|
- // //获取SEM当前位置
|
|
|
- // cfun.GetSemPositionXY(ref dPositionX, ref dPositionY, ref dPositionR);
|
|
|
- // //m_ImageData.GetSemPositionXY(ref dPositionX, ref dPositionY, ref dPositionR);
|
|
|
- // }
|
|
|
- // catch (Exception ex)
|
|
|
- // {
|
|
|
-
|
|
|
- // MessageBox.Show(table["message24"].ToString() + ex.ToString());
|
|
|
- // }
|
|
|
- //}
|
|
|
- #endregion
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1464,11 +1441,7 @@ namespace OTSMeasureApp
|
|
|
//1.连接电镜
|
|
|
if (m_EDSHardwareMgr.Init())
|
|
|
{
|
|
|
- bool initResult = false;
|
|
|
- //线程调用 加载
|
|
|
- initResult = m_EDSHardwareMgr.Init();
|
|
|
- if (initResult)
|
|
|
- {
|
|
|
+
|
|
|
COTSMsrPrjResultData cProjMgr = m_MeasureAppForm.m_ProjParam.GetResultData();
|
|
|
//获取工作样品对象
|
|
|
COTSSample sampleClr = cProjMgr.GetWorkingSample();
|
|
|
@@ -1550,7 +1523,7 @@ namespace OTSMeasureApp
|
|
|
}
|
|
|
ExportScanInfoMenuItem.Enabled = true;
|
|
|
this.Invalidate();
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
|
