|
|
@@ -122,24 +122,8 @@ namespace OTSMeasureApp
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME == SampleId)
|
|
|
- {
|
|
|
- //去除修改GRID的样品名的前后空格
|
|
|
- string str = (string)ObjVal;
|
|
|
- str = str.Trim();
|
|
|
-
|
|
|
- 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);
|
|
|
-
|
|
|
-
|
|
|
- DisplaySampleMeasureInfo(SMInfo);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- //更新COMBBOX值
|
|
|
+
|
|
|
+
|
|
|
if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal)) // Prop值变化，修改样品值成功
|
|
|
{
|
|
|
|
