|
@@ -203,15 +203,15 @@ namespace OTSDataType
|
|
|
|
|
|
if (isStoring)
|
|
|
{
|
|
|
- xnStopMode.AssignValue(m_nStopMode.ToString());
|
|
|
+ xnStopMode.AssignValue((int)m_nStopMode+":"+m_nStopMode.ToString());//
|
|
|
xnStopParamMeasTime.AssignValue( m_nStopParamMeasTime);
|
|
|
xnStopParamFields.AssignValue(m_nStopParamFields);
|
|
|
xnStopParamParticles.AssignValue(m_nStopParamParticles);
|
|
|
- xnSatrtImageMode.AssignValue(m_nSatrtImageMode.ToString());
|
|
|
- xnScanImageSpeed.AssignValue( m_nScanImageSpeed.ToString());
|
|
|
- xnImageSize.AssignValue( m_nImageResulotion.ToString());
|
|
|
+ xnSatrtImageMode.AssignValue((int)m_nSatrtImageMode+":"+m_nSatrtImageMode.ToString());
|
|
|
+ xnScanImageSpeed.AssignValue((int)m_nScanImageSpeed+":"+ m_nScanImageSpeed.ToString());
|
|
|
+ xnImageSize.AssignValue( (int)m_nImageResulotion+":"+m_nImageResulotion.ToString());
|
|
|
|
|
|
- xnFieldStopMode.AssignValue(m_nFieldStopMode.ToString());
|
|
|
+ xnFieldStopMode.AssignValue((int)m_nFieldStopMode+":"+m_nFieldStopMode.ToString());
|
|
|
xnFieldSmallParticles.AssignValue(m_nFieldSmallParticles);
|
|
|
xnFieldSmallParticlePercentage .AssignValue(m_nFieldSmallParticlesPercentage);
|
|
|
|
|
@@ -223,22 +223,22 @@ namespace OTSDataType
|
|
|
{
|
|
|
slo.Serialize(false, classDoc, rootNode);
|
|
|
|
|
|
- m_nStopMode =(OTS_MEASURE_STOP_MODE)Enum.Parse(typeof(OTS_MEASURE_STOP_MODE), xnStopMode.value());
|
|
|
+ m_nStopMode = (OTS_MEASURE_STOP_MODE)Convert.ToInt32(xnStopMode.value().Split(':')[0]);
|
|
|
m_nStopParamMeasTime = xnStopParamMeasTime.value();
|
|
|
m_nStopParamFields = xnStopParamFields.value();
|
|
|
m_nStopParamParticles = xnStopParamParticles.value();
|
|
|
- m_nSatrtImageMode = (OTS_GET_IMAGE_MODE)Enum.Parse(typeof(OTS_GET_IMAGE_MODE), xnSatrtImageMode.value());
|
|
|
- m_nScanImageSpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)Enum.Parse(typeof(OTS_IMAGE_SCANSPEED_OPTIONS), xnScanImageSpeed.value());
|
|
|
- m_nImageResulotion = (OTS_IMAGE_RESULOTION_OPTIONS)Enum.Parse(typeof(OTS_IMAGE_RESULOTION_OPTIONS), xnImageSize.value());
|
|
|
+ m_nSatrtImageMode = (OTS_GET_IMAGE_MODE)Convert.ToInt32(xnSatrtImageMode.value().Split(':')[0]);
|
|
|
+ m_nScanImageSpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(xnScanImageSpeed.value().Split(':')[0]);
|
|
|
+ m_nImageResulotion = (OTS_IMAGE_RESULOTION_OPTIONS)Convert.ToInt32(xnImageSize.value().Split(':')[0]);
|
|
|
|
|
|
- m_nFieldStopMode = (OTS_MEASURE_FIELD_STOP_MODE)Enum.Parse(typeof(OTS_MEASURE_FIELD_STOP_MODE),xnFieldStopMode.value());
|
|
|
+ m_nFieldStopMode = (OTS_MEASURE_FIELD_STOP_MODE)Convert.ToInt32(xnFieldStopMode.value().Split(':')[0]);
|
|
|
m_nFieldAreaPercentage = xnFieldAreaPercentage.value();
|
|
|
m_nFieldLargeParticles = xnFieldLargeParticles.value();
|
|
|
m_nFieldLargeParticlesPercentage = xnFieldLargeParticlePercentage.value();
|
|
|
m_nFieldSmallParticles = xnFieldSmallParticles.value();
|
|
|
m_nFieldSmallParticlesPercentage = xnFieldSmallParticlePercentage.value();
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|