Explorar el Código

remove useless comment

gsp hace 1 año
padre
commit
52fdf7cf62

+ 1 - 3
OTSCPP/OTSControl/Bruker/OTSEDSBrucker.h

@@ -54,9 +54,7 @@ namespace OTSController {
 			std::vector<BrukerFeature>& a_listFeatures,
 			const DWORD a_nXRayAQTime) override;
 		virtual BOOL COTSEDSBrucker::StopXrayAcquistion()override;
-		/*virtual BOOL GetXRayByFeaturesFromMultiPoint(std::vector<CPosXrayPtr>& a_listXRayPoints,
-			std::vector<std::vector<BrukerSegment>>& a_listFeatures,
-			const DWORD a_nXRayAQTime) override;*/
+	
 	
 		// Quatification
 		virtual void SetQuantification(BOOL a_bQuantification) override;

+ 5 - 8
OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -786,7 +786,7 @@ namespace OTSModelSharp
                     //start db save
                     StartSaveFileThread(ref curFld);
 
-                    SendFieldParticlesInfoToScreen(curFld, m_Sample.GetMsrStatus());
+                    SendFieldParticlesInfoToGUI(curFld, m_Sample.GetMsrStatus());
                 }
                 while (bSaveThreadWorking)//wait untill all the field data has been saved.
                 {
@@ -949,7 +949,7 @@ namespace OTSModelSharp
             var workmode = pXRayParam.GetScanMode();
             if (workmode == OTS_X_RAY_SCAN_MODE.PointMode)
             {
-                // calculate search x-ray acquire time
+              
                 uint nXRayAQTime;
                 List<COTSParticleClr> parts = new List<COTSParticleClr>();
               
@@ -962,7 +962,7 @@ namespace OTSModelSharp
                     }
                 }
                
-                curFldData.CreateXrayList(parts); //small particle using the fast xray strategy
+                curFldData.CreateXrayList(parts); 
 
                 if (parts.Count > 0)
                 {
@@ -990,10 +990,7 @@ namespace OTSModelSharp
                     }
                 }
 
-                curFldData.CreateXrayList(allparts); // big particle using the full xray strategy.
-
-
-              
+                curFldData.CreateXrayList(allparts); 
 
                 if (allparts.Count > 0)
                 {
@@ -1349,7 +1346,7 @@ namespace OTSModelSharp
             }
             return;
         }
-        private void SendFieldParticlesInfoToScreen(COTSFieldData curFld,CMsrSampleStatus pStatus)
+        private void SendFieldParticlesInfoToGUI(COTSFieldData curFld,CMsrSampleStatus pStatus)
         {
             double measuredArea = 0; // this area should be the field area
             var a_pBSEImg = curFld.GetBSEImage();