Merge branch 'OTSRelease3_2' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_2

OTSIncAMeasureApp/1-OTSMeasure/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -54,7 +54,11 @@ namespace OTSModelSharp
         public bool ClassifyParticles(List<COTSParticleClr> a_listAnalysisParticles, string libname)// classify particles
         {
 
-
+            if(libname == "NoSTDDB")
+            {
+                log.Error("No STDDB, can not classify particles");
+                return false;
+            }
             int nSize = (int)a_listAnalysisParticles.Count();
 
             // go through all analysis particles

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -1115,12 +1115,12 @@ namespace OTSModelSharp
                 // get SEM controller to set magnification and working distance
                 if (!pSEMCtrl.SetMagnification(dMinMag))
                 {
-                    log.Error("DoHolePreview: fail to set SEM data.");
-                    pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
-                    // record end time
-                    pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
+                    log.Error("DoHolePreview: fail to set magnification.");
+                    //pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
+                    //// record end time
+                    //pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
 
-                    return;
+                    //return;
                 }
 
      
@@ -1128,11 +1128,11 @@ namespace OTSModelSharp
                 if (!SetHoleBSEParam(m_HolePreviewSample))
                 {
                     log.Error("DoHolePreview: fail to set BSE param.");
-                    pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
-                    // record end time
-                    pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
+                    //pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
+                    //// record end time
+                    //pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
 
-                    return;
+                    //return;
                 }
 
             

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -40,7 +40,7 @@ namespace OTSMeasureApp
         //单点采集Xray与元素信息
         PointScanElementMenuItem = 9,
 
-        BatchCollectXray=10,
+        BatchCollectXray = 10,
         //导出采集信息报告
         ExportReport = 11
     }
@@ -1024,8 +1024,8 @@ namespace OTSMeasureApp
                 double bri = 0;
                 double contra = 0;
                 double kv = 0;
-                m_MeasureAppForm.m_ProjParam.GetWorkingSampleSEMData(ref iWDistance, ref dMagni,ref bri,ref contra,ref kv);
-                if (iWDistance != 0 && dMagni != 0 && bri!=0 && contra!=0)
+                m_MeasureAppForm.m_ProjParam.GetWorkingSampleSEMData(ref iWDistance, ref dMagni, ref bri, ref contra, ref kv);
+                if (iWDistance != 0 && dMagni != 0 && bri != 0 && contra != 0)
                 {
                     contextMenuStrip1.Items[(int)MeasureStateMenuType.ReadBSEPic].Enabled = true;
                 }
@@ -1099,7 +1099,7 @@ namespace OTSMeasureApp
                 var mode = m_MeasureAppForm.m_ProjRstData.GetWorkingSample().GetMsrParams().GetXRayParam().GetScanMode();
                 GetSelectedParticle((int)mousepos.X, (int)mousepos.Y, ref selpart);
 
-               
+
 
                 if (selpart == null)
                 {
@@ -1244,7 +1244,7 @@ namespace OTSMeasureApp
             }
 
             ClassifyParticles(selectedParts);
-            
+
             return true;
 
         }
@@ -1591,14 +1591,9 @@ namespace OTSMeasureApp
                 m_MeasureAppForm.UpdatePropertyVal();
                 //确认后进行去背景
                 var m_systype = m_MeasureAppForm.m_ProjParam.GetResultData().SystemTypeId;
-                if (m_systype != otsdataconst.OTS_SysType_ID.IncA)
-                {
-                    ShowColoredRemoveBGImage();
-                }
-                else
-                {
-                    ShowRemoveBGImage();
-                }
+
+                ShowColoredRemoveBGImage();
+
 
             }
         }
@@ -1741,7 +1736,7 @@ namespace OTSMeasureApp
                 }
 
 
-               
+
                 //3.根据所要扫描的位置进行元素分析
                 uint a_Milliseconds = 0;
                 //采集时间
@@ -1749,12 +1744,12 @@ namespace OTSMeasureApp
 
 
                 var parts = myFld.GetListAnalysisParticles();
-               
-                    GetXRayAndElements(a_Milliseconds, parts, mode);
+
+                GetXRayAndElements(a_Milliseconds, parts, mode);
+
 
 
 
-                
                 var colorImg = myFld.GetAnalysisParticleSTDColoredImage();
                 pictureBox2.Image = colorImg;
                 ExportScanInfoMenuItem.Enabled = true;