| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -1008,18 +1008,16 @@ void CObjComponentMgr::CreatObjByLayerObj()
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//从obj 中分析出两个定位mark 的位置
 | 
					 | 
					 | 
					 | 
					//从obj 中分析出两个定位mark 的位置
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					void CObjComponentMgr::AnalyseMarkPt()
 | 
					 | 
					 | 
					 | 
					void CObjComponentMgr::AnalyseMarkPt()
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					{
 | 
					 | 
					 | 
					 | 
					{
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
							return;
 | 
					 | 
					 | 
					 | 
							//return;
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					      //vector<CObjComponent*> MarkVec;
 | 
					 | 
					 | 
					 | 
					      //vector<CObjComponent*> MarkVec;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					      //先找出圆形对象
 | 
					 | 
					 | 
					 | 
					      //先找出圆形对象
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					      {
 | 
					 | 
					 | 
					 | 
					      {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            vector<CObjComponent>::iterator iter = m_ComponentVec.begin();
 | 
					 | 
					 | 
					 | 
					            vector<CObjComponent>::iterator iter = m_ComponentVec.begin();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            vector<CObjComponent>::iterator iter_end = m_ComponentVec.end();
 | 
					 | 
					 | 
					 | 
					            vector<CObjComponent>::iterator iter_end = m_ComponentVec.end();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            for(;iter!=iter_end;)
 | 
					 | 
					 | 
					 | 
					            for(;iter!=iter_end;iter++)
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            {
 | 
					 | 
					 | 
					 | 
					            {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
									if ((*iter).IsCircle())				
 | 
					 | 
					 | 
					 | 
									if ((*iter).IsCircle())				
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										m_ComponentVec.erase(iter);
 | 
					 | 
					 | 
					 | 
										iter->SetbMarkObj(true);
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
									else
 | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										iter++;
 | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            }
 | 
					 | 
					 | 
					 | 
					            }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					      }
 | 
					 | 
					 | 
					 | 
					      }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					/*
 | 
					 | 
					 | 
					 | 
					/*
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
 
 |