فهرست منبع

do normalization after bruker quantification

gsp 1 سال پیش
والد
کامیت
5ab6767361

+ 0 - 19
OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.h

@@ -1,20 +1,5 @@
 #pragma once
 
-
-/**
-@file
-@brief		OTSControl  DLL Interface  provide for C#
-@author		xiaoxing.zhang£¬Anna Hao
-@version	1.0.0.0
-@date		2017/6/28
-
-- 2017/6/28 1.0.0.0  xiaoxing.zhang  developed SEM Interface
-- 2017/6/28 1.0.0.0  Anna Hao  developed Scan Interface
-- 2017/6/29 1.0.0.0  Anna Hao  developed EDS Interface
-- 2017/7/3 1.0.0.0  xiaoxing.zhang  Add log for SemInterface 
-- 2021 gaoshipeng revised. complete the whole interface so that we can get all infomation through this interface in C#.
-*/
-
 #include "BSEImg.h"
 #include "OTSSemBase.h"
 #include "OTSScanBase.h"
@@ -25,10 +10,6 @@
 #include <OTSParticleClr.h>
 
 
-
-
-
-
 using namespace System;
 using namespace System::Drawing;
 using namespace System::Collections::Generic;

+ 7 - 11
OTSIncAMeasureApp/ServiceCenter/CPP(Bruker)API/EDSController.cs

@@ -263,20 +263,16 @@ namespace OTSModelSharp.ServiceCenter
 
 
             }
-           
-
-
 
-
-            //if (result == true)
-            //{
-            //    foreach (var p in a_listParticles)
-            //    {
-            //        ProcessXrayInfo(p);
-            //    }
+            if (result == true)
+            {
+                foreach (var p in a_listParticles)
+                {
+                    ProcessXrayInfo(p);
+                }
 
 
-            //}
+            }
             return result;
         }