|
@@ -43,7 +43,7 @@ namespace OTSDataType
|
|
|
private int m_nQutantifyMinSize;
|
|
|
private int m_nFastXrayTime;
|
|
|
|
|
|
- private int m_nUsingXray;
|
|
|
+ private bool m_nUsingXray;
|
|
|
|
|
|
void Init()
|
|
|
{
|
|
@@ -73,8 +73,8 @@ namespace OTSDataType
|
|
|
m_nMidAnalyAQTime = a_oSource.m_nMidAnalyAQTime;
|
|
|
m_nQutantifyMinSize = a_oSource.m_nQutantifyMinSize;
|
|
|
m_nFastXrayTime = a_oSource.m_nFastXrayTime;
|
|
|
-
|
|
|
- m_nUsingXray = a_oSource.m_nUsingXray>0?0:1;
|
|
|
+
|
|
|
+ m_nUsingXray = a_oSource.m_nUsingXray;
|
|
|
}
|
|
|
// copy constructor
|
|
|
public COTSXRayParam(COTSXRayParam a_oSource)
|
|
@@ -133,29 +133,10 @@ namespace OTSDataType
|
|
|
{
|
|
|
m_nFastXrayTime = a_nFastXrayTime;
|
|
|
}
|
|
|
- public void SetLowSearchAQTime(int a_nLowSearchAQTime)
|
|
|
- {
|
|
|
- m_nMidSearchAQTime = (int)(a_nLowSearchAQTime * 4 / 3 + 0.5);
|
|
|
- }
|
|
|
-
|
|
|
- public void SetHightSearchAQTime(int a_nHighSearchAQTime)
|
|
|
- {
|
|
|
- m_nMidSearchAQTime = (int)(a_nHighSearchAQTime * 4 / 5 + 0.5);
|
|
|
- }
|
|
|
-
|
|
|
- public void SetLowAnalyAQTime(int a_nLowAnalyAQTime)
|
|
|
- {
|
|
|
- m_nMidSearchAQTime = (int)(a_nLowAnalyAQTime * 4 / 3 + 0.5);
|
|
|
- }
|
|
|
-
|
|
|
- public void SetHighAnalyAQTime(int a_nHighAnalyAQTime)
|
|
|
- {
|
|
|
- m_nMidSearchAQTime = (int)(a_nHighAnalyAQTime * 4 / 5 + 0.5);
|
|
|
- }
|
|
|
|
|
|
|
|
|
- public int GetUsingXray() { return m_nUsingXray; }
|
|
|
- public void SetUsingXray(int a_nUsingXray)
|
|
|
+ public bool GetUsingXray() { return m_nUsingXray; }
|
|
|
+ public void SetUsingXray(bool a_nUsingXray)
|
|
|
{
|
|
|
m_nUsingXray = a_nUsingXray;
|
|
|
}
|
|
@@ -166,7 +147,8 @@ namespace OTSDataType
|
|
|
xInt xnAnalyExpCount = new xInt();
|
|
|
|
|
|
xInt xnMidAnalyAQTime = new xInt();
|
|
|
- xInt xnUsingXray = new xInt();
|
|
|
+
|
|
|
+ xBool xnUsingXray = new xBool();
|
|
|
|
|
|
|
|
|
Slo slo = new Slo();
|
|
@@ -196,6 +178,7 @@ namespace OTSDataType
|
|
|
else
|
|
|
{
|
|
|
slo.Serialize(false, classDoc, rootNode);
|
|
|
+
|
|
|
m_nScanMode = (OTS_X_RAY_SCAN_MODE)Enum.Parse(typeof(OTS_X_RAY_SCAN_MODE),xnScanMode.value());
|
|
|
|
|
|
m_nAnalyExpCount = xnAnalyExpCount.value();
|