|
@@ -6,6 +6,7 @@ using OTS.WinFormsUI.Docking;
|
|
|
using OTSDataType;
|
|
|
using OTSMeasureApp._3_OTSDisplaySourceGridData;
|
|
|
using OTSModelSharp.ResourceManage;
|
|
|
+using System.Collections.Generic;
|
|
|
|
|
|
namespace OTSMeasureApp
|
|
|
{
|
|
@@ -91,6 +92,8 @@ namespace OTSMeasureApp
|
|
|
//设置样品属性参数成功
|
|
|
OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
|
|
|
var m_measurePara = m_MeasureAppForm.m_ProjParam;
|
|
|
+ var curSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
|
|
|
+ var curpara = curSample.GetMsrParams();
|
|
|
//当前正在测量
|
|
|
if (PropertyMeasureThreadRunFlag)//measureThread is running
|
|
|
{
|
|
@@ -112,7 +115,10 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
if (m_measurePara.SetSTDFileName((int)ObjVal))
|
|
|
{
|
|
|
-
|
|
|
+ //int pos=0;
|
|
|
+ //var filenamelist = new List<string>();
|
|
|
+ //m_measurePara.GetSTDFileName(ref pos, ref filenamelist);
|
|
|
+ //curpara.SetSTDName(filenamelist[pos]);
|
|
|
m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|