Merge branch 'Release3.3' of http://36.129.169.60:30080/gogsadmin/OTS into Release3.3

OTSCPP/OTSClassifyEngine/ExpressionClassifyEngine.cpp

@@ -121,11 +121,37 @@ bool ExpressionClassifyEngine::ClassifyExpression(COTSParticlePtr particle, CPos
 			auto matchedItem = matchedItems[0];
 			for (auto itm : matchedItems)
 			{
-
-				if (itm->GetExpressionStr().size() > matchedItem->GetExpressionStr().size())
+				 if(itm->GetGrpID() ==0 && matchedItem->GetGrpID()==0)
 				{
-					matchedItem = itm;
+					//choose the most detailed one.
+					 if (itm->GetExpressionStr().size() > matchedItem->GetExpressionStr().size())
+					 {
+						 matchedItem = itm;
+					 }
+					 continue;
 				}
+				if(itm->GetGrpID()>0 )
+				{
+					if(itm->GetGrpID()<matchedItem->GetGrpID())
+					{
+						//choose the item with the smallest group id first.
+						matchedItem = itm;
+						continue;
+					}
+					else if(itm->GetGrpID() == matchedItem->GetGrpID())	
+					{
+						//choose the most detailed one.
+						if (itm->GetExpressionStr().size() > matchedItem->GetExpressionStr().size())
+						{
+							matchedItem = itm;
+						}
+						continue;	
+					}
+					
+					
+				}
+				
+				
 				
 			}
 			particle->SetBasicClassifyId(OTS_PARTICLE_BASIC_CLASSIFY::IDENTIFIED);

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -477,42 +477,6 @@ namespace OTSMeasureApp
             }
         }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        
-        
-        
-        
-        
-        
         
         public void DrawCircleByFixedpoint()
         {

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/frmInitializeImageboundary.Designer.cs

@@ -388,6 +388,7 @@
             this.tBx_Magnification.Name = "tBx_Magnification";
             this.tBx_Magnification.Size = new System.Drawing.Size(100, 21);
             this.tBx_Magnification.TabIndex = 29;
+            this.tBx_Magnification.Text = "100";
             this.tBx_Magnification.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // label10

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/frmInitializeImageboundary.cs

@@ -67,7 +67,7 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
         {
             if (cfun == null) { cfun = SemController.GetSEMController(); }
             cB_Inclinedplanefocus.Checked = true; double val = 0;
-            if (cfun.GetMagnification(ref val)) tBx_Magnification.Text = val.ToString();
+            //if (cfun.GetMagnification(ref val)) tBx_Magnification.Text = val.ToString();
             if (panel1 != null)
             {
                 panel1.Paint += panel1_Paint;