Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.cpp

@@ -316,8 +316,11 @@ namespace OTSGBCalculate
 				double dFeretDiameter = pParticle->GetFeretDiameter();
 				if (dFeretDiameter >= 13)
 				{
-					// DS					
-					listDSParticles.push_back(pParticle);
+					// DS		
+					if (pParticle->GetType() != OTS_PARTICLE_TYPE::INVALID)//here we take all the particles 
+					{
+						listDSParticles.push_back(pParticle);
+					}
 				}
 				else
 				{
@@ -347,7 +350,7 @@ namespace OTSGBCalculate
 					else
 					{
 						// B or D
-						if (pParticle->GetChemicalType() != GB_CHEMICAL_TYPE::INVALID)//here we take all the particles 
+						if (pParticle->GetType() != OTS_PARTICLE_TYPE::INVALID)//here we take all the particles 
 						{
 							GBParticle gbP = GBParticle(pParticle, GB_LEVEL_TYPE::INVALID, GB_WIDTH_TYPE::INVALID);
 							//²»ÄÜÈ·¶¨ÊÇB»òD£¬ÏÈÉèΪINVALID
@@ -359,6 +362,9 @@ namespace OTSGBCalculate
 
 				}
 			}
+
+
+
 		}
 		
 			for (auto pGBParticle : listBAndDParticles)
@@ -510,8 +516,12 @@ namespace OTSGBCalculate
 				double dFeretDiameter = pParticle->GetFeretDiameter();
 				if (dFeretDiameter >= 13)
 				{
-					// DS					
-					listDSParticles.push_back(pParticle);
+					// DS			
+					if (pParticle->GetType() != OTS_PARTICLE_TYPE::INVALID)//here we take all the particles 
+					{
+						listDSParticles.push_back(pParticle);
+					}
+					
 				}
 				else
 				{
@@ -724,7 +734,11 @@ namespace OTSGBCalculate
 				if (dFeretDiameter >= 13)
 				{
 					// DS					
-					listDSParticles.push_back(pParticle);
+					if (pParticle->GetType() != OTS_PARTICLE_TYPE::INVALID)//here we take all the particles 
+					{
+						listDSParticles.push_back(pParticle);
+					}
+					
 				}
 				else
 				{
@@ -908,7 +922,10 @@ namespace OTSGBCalculate
 				if (dFeretDiameter >= 13)
 				{
 					// DS					
-					listDSParticles.push_back(pParticle);
+					if (pParticle->GetType() != OTS_PARTICLE_TYPE::INVALID)//here we take all the particles 
+					{
+						listDSParticles.push_back(pParticle);
+					}
 				}
 				else
 				{

OTSIncAMeasureApp/CRegistration.cs

@@ -14,23 +14,25 @@ namespace OTSMeasureApp
    
         public bool RegistrationVerification()
         {
-           
-            try
-            {
-                //if (!checkRegistration())//文件授权法
-                //{
-                //    return false;
 
-                //}
-                //狗加密法
-                SenseShield.DogDecrypting.decrypting(101);//参数为许可号
-            }
-            catch (Exception ex)
+            if (!checkRegistration())//文件授权法
             {
+                //return false;
+                try
+                {
 
-                return false;
+                    //狗加密法
+                    SenseShield.DogDecrypting.decrypting(101);//参数为许可号
+                }
+                catch (Exception ex)
+                {
+
+                    return false;
 
+                }
             }
+
+            
             return true;
         }
         private bool checkRegistration()

OTSIncAMeasureApp/Program.cs

@@ -22,11 +22,11 @@ namespace OTSMeasureApp
                     System.Environment.Exit(0);
                     return;
                 }
-            }
-            
-            //--------------------------只运行一个测量程序--------------------------------
+        }
+
+        //--------------------------只运行一个测量程序--------------------------------
 
-            bool flag = false;
+        bool flag = false;
             System.Threading.Mutex mutex = new System.Threading.Mutex(true, "OTSIncAMeasureApp", out flag);
             //第一个参数:true--给调用线程赋予互斥体的初始所属权  
             //第一个参数:互斥体的名称  

OTSIncAReportApp/OTSIncAReportApp.csproj.user

@@ -3,4 +3,7 @@
   <PropertyGroup>
     <ReferencePath>D:\夹杂物\2.4\OTS2_0\Bin\x64\Release_oxford50\</ReferencePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
+    <EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
+  </PropertyGroup>
 </Project>