fix the xray quantify problem of new oxford driver

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordScanController.cs

@@ -26,11 +26,7 @@ namespace OTSMeasureApp.ServiceCenter
         //private APIClass ApiClass = null;
         public OxfordScanController(ImageInputSources sourceType)
         {
-            //IpcClientChannel channel = new IpcClientChannel();
-            ////Register the channel with ChannelServices.
-            //ChannelServices.RegisterChannel(channel, false);
-            //iExtender = (ExtenderWrapper)Activator.GetObject(typeof(ExtenderWrapper), "ipc://ExtenderServerChannel/ExtenderWrapper");
-
+  
             iExtender = ExtenderWrapperIpc.GetExtenderWrapper();
             imagesourceType = sourceType;
         }

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordSemController.cs

@@ -108,6 +108,7 @@ namespace OTSMeasureApp.ServiceCenter
         {
            var b1= iExtender.MoveStageXY((float)a_dPositionX, (float)a_dPositionY);
             var b2=iExtender.SetStageGotoR((float)rotation);
+            Thread.Sleep(500);
             return b1&b2;
         }
 

OTSSysMgrApp/ControllerSettingForm.Designer.cs

@@ -317,7 +317,7 @@
             this.ddlDwellTime.Margin = new System.Windows.Forms.Padding(2);
             this.ddlDwellTime.Name = "ddlDwellTime";
             this.ddlDwellTime.Size = new System.Drawing.Size(82, 20);
-            this.ddlDwellTime.TabIndex = 3;
+            this.ddlDwellTime.TabIndex = 0;
             // 
             // groupBox2
             // 

OTSSysMgrApp/ControllerSettingForm.cs

@@ -140,7 +140,7 @@ namespace OTSSysMgrApp
             //设置窗体图表
 
             Control.CheckForIllegalCrossThreadCalls = false;
-            ddlDwellTime.SelectedIndex = 2;
+            ddlDwellTime.SelectedIndex = 0;
             InitXRayData();
             int width = Convert.ToInt32(tbRWidth.Text);
             int height = Convert.ToInt32(tbRHeight.Text);

OxfordExtenderWrapper/ExtenderIpcUI.cs

@@ -38,10 +38,11 @@ namespace OxfordExtenderWrapper
             var p1 = p;
             var thread = new Task(() =>
             {
-
+                iExtender.SetSemScanExternal(true);
                r= iExtender.AquisitionImage(ref  p1);
+                iExtender.SetSemScanExternal(false);
             });
-            //thread.IsBackground = true;
+          
             thread.Start();
             thread.Wait();
             p = p1;
@@ -52,8 +53,9 @@ namespace OxfordExtenderWrapper
             var r = false;
             var thread = new Task(() =>
             {
-
+                iExtender.SetSemScanExternal(true);
                 r = iExtender.MoveStageXY(x,y);
+                iExtender.SetSemScanExternal(false);
             });
             thread.Start();
             thread.Wait();
@@ -66,8 +68,9 @@ namespace OxfordExtenderWrapper
             var p1 = p;
             var thread = new Task(() =>
             {
-
+                iExtender.SetSemScanExternal(true);
                 r = iExtender.XrayAreaCollecting(ref p1);
+                iExtender.SetSemScanExternal(false);
             });
             //thread.IsBackground = true;
             thread.Start();
@@ -82,8 +85,9 @@ namespace OxfordExtenderWrapper
             var p1 = p;
             var thread = new Task(() =>
             {
-
+                iExtender.SetSemScanExternal(true);
                 r = iExtender.XrayPointCollecting(ref p1);
+                iExtender.SetSemScanExternal(false);
             });
           
             thread.Start();
@@ -99,8 +103,9 @@ namespace OxfordExtenderWrapper
             var p1 = a_listPoints;
             var thread = new Task(() =>
             {
-
+                iExtender.SetSemScanExternal(true);
                 r = iExtender.CollectXrayByPoints(ref p1,a_nXRayAQTime,a_bElementInfo);
+                iExtender.SetSemScanExternal(false);
             });
           
             thread.Start();
@@ -115,8 +120,9 @@ namespace OxfordExtenderWrapper
             var p1 = a_listFeatures;
             var thread = new Task(() =>
             {
-
+                iExtender.SetSemScanExternal(true);
                 r = iExtender.CollectXrayByFeatures(ref p1, a_nXRayAQTime, a_bElementInfo);
+                iExtender.SetSemScanExternal(false);
             });
             //thread.IsBackground = true;
             thread.Start();

OxfordExtenderWrapper/ExtenderWrapper.cs

@@ -614,16 +614,12 @@ namespace OxfordExtenderWrapper
                 prm.b_quant = a_bElementInfo;
                 EdSpectrumSettings.ScanSettings.AcquisitionRegion.CreatePointRegion(new System.Windows.Point(prm.x * m_dImagePixelsize, prm.y * m_dImagePixelsize));
 
-                //log.Info("开始XrayStartAcquisition:t=" + dMilliSecondsTime.ToString() + "pos=" + "(" + prm.x.ToString() + "," + prm.y.ToString() + ")");
-
                 try
                 {
                     m_bXrayDone = false;
 
-
                     IEdSpectrum edSpectrum = EdSpectrumAcquisitionController.StartAcquisition(EdSpectrumSettings);
 
-
                 }
                 catch (InvalidSettingsException invalidSettingsException)
                 {

OxfordExtenderWrapper/ExtenderWrapper1.cs

@@ -53,28 +53,24 @@ namespace OxfordExtenderWrapper
         private IAutoIdSettings autoIdSettings = null;
         private ISEMQuantSettings quantSettings = null;
 
-        private IEdChordListAcquisitionController _edsChordListController = null;
-        private OxfordControllerState m_nState;
+        //private IEdChordListAcquisitionController _edsChordListController = null;
+        //private OxfordControllerState m_nState;
         private IEdChordListSettings _edsChordListSetting;
         private int XRayChannelLength = 2000;
 
         private int EDSColletionTimeOut = 10000;
-        private AutoResetEvent m_endControllerEvent;
+        //private AutoResetEvent m_endControllerEvent;
 
         //当前feature的pixel数控制 
-        private long m_nCollectedPixelCounts;
-        private long m_nPixelNum;
-        private List<Element> m_listElementResult;
+        //private long m_nCollectedPixelCounts;
+        //private long m_nPixelNum;
+        //private List<Element> m_listElementResult;
 
 
         const int g_nOxfordControllerProcessTime = 4;
         const int g_nOxfordControllerEnergyRange = 20;
 
 
-        // feature计数控制
-        private long m_nXrayDataCount;
-        private long m_nCollectedXrayCounts;
-
         private bool m_bXrayDone = false;
         //电压
         private double m_dHighVoltage;
@@ -98,7 +94,7 @@ namespace OxfordExtenderWrapper
         private double m_dStageR;
         private double m_dStageT;
 
-        private double m_dStageXMax;
+
 
         //构造函数
         public ExtenderWrapper1()
@@ -145,7 +141,6 @@ namespace OxfordExtenderWrapper
         private void ControlerThread()
         {
 
-            log.Info("this has been initialized");
             while (true)
             {
 
@@ -156,7 +151,7 @@ namespace OxfordExtenderWrapper
 
                         break;
                     }
-                    //Thread.Sleep(50);
+                  
                     Application.DoEvents();
                 }
 
@@ -182,7 +177,7 @@ namespace OxfordExtenderWrapper
                             while (!m_StageUpdated)
                             {
                                 Application.DoEvents();
-                                Thread.Sleep(100);
+                             
                                 time2 = Environment.TickCount;
                                 if (time2 - time1 > 20000)
                                 {
@@ -210,9 +205,9 @@ namespace OxfordExtenderWrapper
                                 imageAcquisitionController.BeginMultipleAcquisition();
                                 IEnumerable<IElectronImage> images = imageAcquisitionController.StartAcquisition(imageAcquisitionSettings);
 
-                              
 
 
+                                var time1 = Environment.TickCount;
                                 while (true)
                                 {
                                     if (m_bAcquistionDone)
@@ -224,9 +219,9 @@ namespace OxfordExtenderWrapper
                                     }
                                     Application.DoEvents();
 
-                                    Thread.Sleep(100);
-                                    lastingTime += 100;
-                                    if (lastingTime > EDSColletionTimeOut * 6)
+                                  
+                                    var time2 = Environment.TickCount;
+                                    if (time2 - time1 > EDSColletionTimeOut * 6)
                                     {
                                         currentCommand.returnType = false;
                                     }
@@ -269,31 +264,36 @@ namespace OxfordExtenderWrapper
                             try
                             {
                                 m_bXrayDone = false;
-                                int lastingTime = 0;
+                                var time1 = Environment.TickCount;
 
                                 IEdSpectrum edSpectrum = EdSpectrumAcquisitionController.StartAcquisition(EdSpectrumSettings);
                              
 
                                 while (true)
                                 {
+                                   
                                     if (m_bXrayDone)
                                     {
-                                      
+
                                         currentCommand.returnType = true;
                                         break;
                                     }
                                     Application.DoEvents();
 
-                                    Thread.Sleep(100);
-                                    lastingTime += 100;
-                                    if (lastingTime > EDSColletionTimeOut * 3)
+                                    var time2 = Environment.TickCount;
+                                    if (time2 - time1 > EDSColletionTimeOut * 2)
                                     {
-                                      
+                                        EdSpectrumAcquisitionController.EndMultipleAcquisition();
                                         log.Warn("XrayStartAcquisition 超时！");
-                                       
+
                                         currentCommand.returnType = false;
                                     }
+
+
+
                                 }
+
+
                             }
                             catch (InvalidSettingsException invalidSettingsException)
                             {
@@ -362,7 +362,7 @@ namespace OxfordExtenderWrapper
 
                             }
 
-
+                            var time1 = Environment.TickCount;
                             while (true)
                             {
                                 if (m_bXrayDone)
@@ -372,9 +372,9 @@ namespace OxfordExtenderWrapper
                                 }
                                 Application.DoEvents();
 
-                                Thread.Sleep(100);
-                                lastingTime += 100;
-                                if (lastingTime > EDSColletionTimeOut * 3)
+                              
+                                var time2 = Environment.TickCount;
+                                if (time2 - time1 > EDSColletionTimeOut * 3)
                                 {
                                     EdSpectrumAcquisitionController.EndMultipleAcquisition();
                                     log.Warn("XrayStartAcquisition 超时！");
@@ -388,7 +388,7 @@ namespace OxfordExtenderWrapper
                     case OxfordCommandType.XrayAreaCollection:
                         {
                             AreaXrayParam p = currentCommand.areaXrayPrm;
-                            log.Info("线程：开始面扫xray");
+                          
                             
                             m_bXrayDone = false;
 
@@ -407,7 +407,7 @@ namespace OxfordExtenderWrapper
                                 int lastingTime = 0;
                                 IEdSpectrum edSpectrum = EdSpectrumAcquisitionController.StartAcquisition(EdSpectrumSettings);
 
-
+                                var time1 = Environment.TickCount;
                                 while (true)
                                 {
                                     if (m_bXrayDone)
@@ -417,10 +417,10 @@ namespace OxfordExtenderWrapper
                                         break;
                                     }
 
-                                    Thread.Sleep(100);
+                                   
                                     Application.DoEvents();
-                                    lastingTime += 100;
-                                    if (lastingTime > EDSColletionTimeOut * 8)
+                                    var time2 = Environment.TickCount;
+                                    if (time2 - time1 > EDSColletionTimeOut * 3)
                                     {
                                         currentCommand.returnType = false;
                                        
@@ -446,9 +446,8 @@ namespace OxfordExtenderWrapper
                     case OxfordCommandType.COLLECT_XRAYFEATURES:
                         {
                             var p = currentCommand.XrayPrmForFeatures;
-                            currentCommand.AreaXrayDataReceived = 0;
-                            log.Info("线程：开始线扫xray");
-                            //m_XrayData = null;
+                            currentCommand.AreaXrayDataReceived = 0;                      
+                          
                             m_bXrayDone = false;
                             int lastingTime = 0;
 
@@ -492,7 +491,7 @@ namespace OxfordExtenderWrapper
 
                             }
 
-
+                            var time1 = Environment.TickCount;
                             while (true)
                             {
                                 if (m_bXrayDone)
@@ -501,11 +500,9 @@ namespace OxfordExtenderWrapper
 
                                     break;
                                 }
-                                Application.DoEvents();
-
-                                Thread.Sleep(100);
-                                lastingTime += 100;
-                                if (lastingTime > EDSColletionTimeOut * 3)
+                                Application.DoEvents();                              
+                                var time2 = Environment.TickCount;
+                                if (time2 - time1 > EDSColletionTimeOut * 3)
                                 {
                                     EdSpectrumAcquisitionController.EndMultipleAcquisition();
                                     log.Warn("XrayStartAcquisition 超时！");
@@ -552,7 +549,7 @@ namespace OxfordExtenderWrapper
                 IEnumerable<IElectronImage> images = imageAcquisitionController.StartAcquisition(imageAcquisitionSettings);
 
 
-
+                var time1 = Environment.TickCount;
                 while (true)
                 {
                     if (m_bAcquistionDone)
@@ -565,8 +562,8 @@ namespace OxfordExtenderWrapper
                     Application.DoEvents();
 
                     Thread.Sleep(100);
-                    lastingTime += 100;
-                    if (lastingTime > EDSColletionTimeOut * 6)
+                    var time2 = Environment.TickCount;
+                    if (time2 - time1 > EDSColletionTimeOut * 6)
                     {
                         currentCommand.returnType = false;
                         break;
@@ -586,7 +583,7 @@ namespace OxfordExtenderWrapper
                 string msg = string.Format(@"AcquisitionStartException: {0}", startException.Message);
                 NLog.LogManager.GetCurrentClassLogger().Error(msg);
             }
-
+            imageAcquisitionController.EndMultipleAcquisition();
             if (currentCommand.returnType == true)
             {
 
@@ -674,10 +671,19 @@ namespace OxfordExtenderWrapper
         }
         public bool CollectXrayByPoints(ref List<PointXrayParam> a_listPoints, uint a_nXRayAQTime, bool a_bElementInfo)
         {
+            foreach (var prm in a_listPoints)
+            {
 
+                prm.b_quant = a_bElementInfo;
+                prm.dMilliSecondsTime = a_nXRayAQTime;
+            }
 
             currentCommand.XrayPrmForPoints = a_listPoints;
-            currentCommand.commandType = OxfordCommandType.COLLECT_XRAYPOINTS;
+            
+
+
+
+                currentCommand.commandType = OxfordCommandType.COLLECT_XRAYPOINTS;
             startEvent.Set();
 
             while (true)
@@ -702,7 +708,12 @@ namespace OxfordExtenderWrapper
         public bool CollectXrayByFeatures(ref List<AreaXrayParam> a_listFeatures, double a_nXRayAQTime, bool a_bElementInfo)
         {
 
+            foreach (var prm in a_listFeatures)
+            {
 
+                prm.b_quant = a_bElementInfo;
+                prm.dMilliSecondsTime = a_nXRayAQTime;
+            }
             currentCommand.XrayPrmForFeatures = a_listFeatures;
 
 
@@ -747,10 +758,10 @@ namespace OxfordExtenderWrapper
         void InitMicroscopeController()
         {
             this.microscopeController = AcquireFactory.CreateMicroscopeControl();
-            this.microscopeController.ColumnChange += this.OnMicroscopeColumnChange;
-            this.microscopeController.StageChange += this.OnMicroscopeStageChange;
-            //this.microscopeController.ColumnConnected += this.OnMicroscopeColumnConnected;
-            //this.microscopeController.StageConnected += this.OnMicroscopeStageConnected;
+            //this.microscopeController.ColumnChange += this.OnMicroscopeColumnChange;
+            //this.microscopeController.StageChange += this.OnMicroscopeStageChange;
+            this.microscopeController.ColumnConnected += this.OnMicroscopeColumnConnected;
+            this.microscopeController.StageConnected += this.OnMicroscopeStageConnected;
             this.microscopeController.ChangeCompleted += this.OnMicroscopeChangeCompleted;
 
             ReadMicroscopeColumn();
@@ -764,8 +775,8 @@ namespace OxfordExtenderWrapper
             if (microscopeController != null)
             {
               
-                this.microscopeController.ColumnChange -= this.OnMicroscopeColumnChange;
-                this.microscopeController.StageChange -= this.OnMicroscopeStageChange;
+                //this.microscopeController.ColumnChange -= this.OnMicroscopeColumnChange;
+                //this.microscopeController.StageChange -= this.OnMicroscopeStageChange;
                 this.microscopeController.ColumnConnected -= this.OnMicroscopeColumnConnected;
                 this.microscopeController.StageConnected -= this.OnMicroscopeStageConnected;
                 this.microscopeController.ChangeCompleted -= this.OnMicroscopeChangeCompleted;
@@ -824,12 +835,12 @@ namespace OxfordExtenderWrapper
 
             if (stageCapabilities.StageX.CanRead)
             {
-                this.m_dStageX = stageConditions.StageX/1000.0;
+                this.m_dStageX = stageConditions.StageX*1000.0;
             }
 
             if (stageCapabilities.StageY.CanRead)
             {
-                this.m_dStageY = stageConditions.StageY/1000.0;
+                this.m_dStageY = stageConditions.StageY*1000.0;
             }
 
             if (stageCapabilities.StageZ.CanRead)
@@ -852,20 +863,20 @@ namespace OxfordExtenderWrapper
         private void OnMicroscopeColumnChange(object sender, EventArgs e)
         {
           
-            ReadMicroscopeColumn();
+            //ReadMicroscopeColumn();
         }
 
         //样品台控制改变事件
         private void OnMicroscopeStageChange(object sender, EventArgs e)
         {
-            
-            ReadStage();
+
+            //ReadStage();
         }
 
         //列控制连接或断开时的事件
         private void OnMicroscopeColumnConnected(object sender, EventArgs e)
         {
-          
+            ReadMicroscopeColumn();
         }
 
         //样品台控制连接或断开时的事件
@@ -1023,8 +1034,8 @@ namespace OxfordExtenderWrapper
 
             var stageDictionary = new Dictionary<Stage, double>
             {
-                { Stage.StageX, (double)stageX },
-                { Stage.StageY, (double)stageY },
+                { Stage.StageX, (double)stageX/1000.0 },
+                { Stage.StageY, (double)stageY/1000.0 },
                 { Stage.StageZ, (double)stageZ },
                 { Stage.StageT, (double)stageT },
                 { Stage.StageR, (double)stageR }
@@ -1061,7 +1072,7 @@ namespace OxfordExtenderWrapper
 
             var stageDictionary = new Dictionary<Stage, double>
             {
-                { Stage.StageX, (double)stageX }
+                { Stage.StageX, (double)stageX/1000.0 }
             };
 
             this.microscopeController.SetStageConditions(stageDictionary);
@@ -1075,7 +1086,7 @@ namespace OxfordExtenderWrapper
 
             var stageDictionary = new Dictionary<Stage, double>
             {
-                { Stage.StageY, (double)stageY }
+                { Stage.StageY, (double)stageY/1000.0 }
             };
 
             this.microscopeController.SetStageConditions(stageDictionary);
@@ -1185,7 +1196,7 @@ namespace OxfordExtenderWrapper
             imageAcquisitionController = AcquireFactory.CreateImageServer();
             imageAcquisitionSettings = AcquireFactory.CreateImageSettings();
             //imageAcquisitionSettings.
-            imageAcquisitionController.ExperimentStarted += this.OnImageExperimentStarted;
+            //imageAcquisitionController.ExperimentStarted += this.OnImageExperimentStarted;
             imageAcquisitionController.ExperimentFinished += this.OnImageExperimentFinished;
 
         }
@@ -1206,7 +1217,7 @@ namespace OxfordExtenderWrapper
         {
             if (imageAcquisitionController != null)
             {
-                imageAcquisitionController.ExperimentStarted -= this.OnImageExperimentStarted;
+                //imageAcquisitionController.ExperimentStarted -= this.OnImageExperimentStarted;
                 imageAcquisitionController.ExperimentFinished -= this.OnImageExperimentFinished;
                 imageAcquisitionController = null;
             }

OxfordExtenderWrapper/OxfordExtenderWrapper.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
-    <OutputPath>..\bin\x64\Release_oxford61\OxfordExtender\</OutputPath>
+    <OutputPath>..\Bin\x64\Debug\OxfordExtender\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -25,7 +25,7 @@
     <StartupObject>OxfordExtenderWrapper.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_oxford61|x64' ">
-    <OutputPath>..\bin\x64\Release_oxford61\OxfordExtender\</OutputPath>
+    <OutputPath>..\Bin\x64\Release_oxford61\OxfordExtender\</OutputPath>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>