fix xraylimit bug and improve the oxford disconnect function.

OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp

@@ -51,6 +51,13 @@ void OxfordControllerWrapper::CloseClient(void)
 	}
 
 	_controllerThread->Abort();
+	_controllerThread = nullptr;
+	_microscopeController = nullptr;
+	_edSpectrumController = nullptr;
+	_imageAcqusitionController = nullptr;
+	_edsChordListController = nullptr;
+	_SEMQuantController = nullptr;
+	
 	
 }
 
@@ -60,7 +67,7 @@ OxfordControllerWrapper::~OxfordControllerWrapper(void)
 	{
 	}
 
-	_controllerThread->Abort();
+	CloseClient();
 }
 
 OxfordControllerWrapper::!OxfordControllerWrapper(void)
@@ -70,7 +77,7 @@ OxfordControllerWrapper::!OxfordControllerWrapper(void)
 		
 	}
 	
-	_controllerThread->Abort();
+	CloseClient();
 }
 
 bool OxfordControllerWrapper::Init()

OTSIncAMeasureApp/0-OTSModel/Measure/1-OTSInclution/SmplMeasureInclution.cs

@@ -195,8 +195,16 @@ namespace OTSModelSharp
 
                     listXray1.Add(listXray[i]);
                 }
-  
+
+            }
+            else
+            {
+                listXray1 = listXray;
             }
+
+
+
+
             List<COTSParticleClr> smallparts = new List<COTSParticleClr>();
             List<COTSParticleClr> bigparts = new List<COTSParticleClr>();