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

OTSCPP/OTSImagePro/OTSImageProcess.cpp

@@ -590,7 +590,7 @@ namespace OTSIMGPROC
 		long nBGEnd;
 		long nPartStart;
 		long nPartEnd;
-		//long nNumParticle = 0;
+		long nNumParticle = 0;
 		if (a_pImageProcessParam->GetBGRemoveType() == OTS_BGREMOVE_TYPE::MANUAL)
 		{
 			nBGStart = a_pImageProcessParam->GetBGGray().GetStart();
@@ -601,8 +601,8 @@ namespace OTSIMGPROC
 			
 			
 			
-			CVRemoveBG(srcImgMat, rstMat, nBGStart, nBGEnd);
-			//RemoveBG_old(srcImgMat, rstMat, nBGStart, nBGEnd, nNumParticle);
+			//CVRemoveBG(srcImgMat, rstMat, nBGStart, nBGEnd);
+			RemoveBG_old(srcImgMat, rstMat, nBGStart, nBGEnd, nNumParticle);
 
 			pPixel = rstMat.data;
 		

OTSIncAMeasureApp/ServiceCenter/CImageHandler.cs

@@ -228,7 +228,9 @@ namespace OTSModelSharp.ServiceCenter
             {
                 return;
             }
-
+            tempFld.CalParticleImageProp(parts);
+            tempFld.SelectParticlesAccordingImgProp(a_pImgProcessParam);
+            parts = tempFld.GetListAnalysisParticles();
             if (a_pImgProcessParam.GetSpecialGreyRangeParam().GetIsToRun())
             {
                 var param = a_pImgProcessParam.GetSpecialGreyRangeParam();
@@ -309,7 +311,9 @@ namespace OTSModelSharp.ServiceCenter
             {
                 return;
             }
-
+            tempFld.CalParticleImageProp(parts);
+            tempFld.SelectParticlesAccordingImgProp(a_pImgProcessParam);
+            parts = tempFld.GetListAnalysisParticles();
             if (a_pImgProcessParam.GetSpecialGreyRangeParam().GetIsToRun())
             {
                 var param = a_pImgProcessParam.GetSpecialGreyRangeParam();
@@ -556,8 +560,7 @@ namespace OTSModelSharp.ServiceCenter
             //currentField.FilterParticles(m_Sample.GetMsrParams().GetXRayParam());//filter according to the xraylimit
            
             currentField.SetListAnalysisParticles(parts);
-            currentField.CalParticleImageProp(parts);
-            currentField.SelectParticlesAccordingImgProp(a_pImgProcessParam);
+          
             parts = currentField.GetListAnalysisParticles();
             return true;
 

OTSIncAReportApp/1-UI/Control_Graph/Controls/ImageExporter.cs

@@ -353,7 +353,7 @@ namespace OTSIncAReportApp._3_ServiceCenter
                 list_pano.Add(pano);
             }
 
-            for (int i = 0; i < list_pano.Count; i++)
+            for (int i = 0; i < list_mats.Length; i++)
             {
                 list_mats[i] = list_pano[i];
             }