|
@@ -114,8 +114,6 @@ namespace OTSMeasureApp
|
|
|
if (SMInfo.SetSTDFileName((int)ObjVal))
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
-
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
return;
|
|
|
}
|
|
@@ -128,7 +126,7 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
|
|
|
//update source grid,recover to the original value
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
return;
|
|
|
}
|
|
@@ -140,7 +138,7 @@ namespace OTSMeasureApp
|
|
|
//update the project sample list on the left of the main gui interface.
|
|
|
m_SolutionWindows.m_TreeViewBase.EditTreeWorkSampleName(oldName, strNewName);
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
//update source grid
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
|
|
@@ -152,8 +150,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, frmStopModeDialog.FieldMode)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
-
|
|
|
+
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
return;
|
|
@@ -161,8 +158,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, frmStopModeDialog.TimeMode)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
-
|
|
|
+
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
return;
|
|
@@ -170,7 +166,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, frmStopModeDialog.ParticleMode)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
@@ -179,7 +175,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA, OTS_ITEM_TYPES.INT, frmStopModeDialog.AreaMode)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
@@ -188,7 +184,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE, OTS_ITEM_TYPES.STRING, frmStopModeDialog.StopMode)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
@@ -201,7 +197,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.OtherSelection, OTS_ITEM_TYPES.STRING, otherSelectionForm.OtherSelection)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
@@ -213,7 +209,7 @@ namespace OTSMeasureApp
|
|
|
if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal)) // Prop值变化,修改样品值成功
|
|
|
{
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
|
|
|
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
@@ -240,13 +236,13 @@ namespace OTSMeasureApp
|
|
|
m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
|
|
|
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
|
|
|
- //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
|
|
|
+
|
|
|
if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
|
|
|
{
|
|
|
|
|
@@ -257,7 +253,7 @@ namespace OTSMeasureApp
|
|
|
|
|
|
|
|
|
|
|
|
- //m_measurePara.UpdateGroupValAndItemVal(SampleId);
|
|
|
+
|
|
|
//update the source grid value
|
|
|
DisplaySampleMeasureInfo(SMInfo);
|
|
|
|