不解析Mark点

LaiPuLaser/ObjComponentMgr.cpp

@@ -1008,19 +1008,21 @@ void CObjComponentMgr::CreatObjByLayerObj()
 //从obj 中分析出两个定位mark 的位置
 void CObjComponentMgr::AnalyseMarkPt()
 {
-      vector<CObjComponent*> MarkVec;
+		return;
+      //vector<CObjComponent*> MarkVec;
       //先找出圆形对象
       {
             vector<CObjComponent>::iterator iter = m_ComponentVec.begin();
             vector<CObjComponent>::iterator iter_end = m_ComponentVec.end();
-            for(;iter!=iter_end;iter++)
+            for(;iter!=iter_end;)
             {
-                   if((*iter).IsCircle())
+				if ((*iter).IsCircle())
-                   {
+					m_ComponentVec.erase(iter);
-                        MarkVec.push_back(&(*iter));
+				else
-                   }
+					iter++;
             }
       }
+/*
       {
             bool flg = false;
             int size = MarkVec.size();
@@ -1035,7 +1037,7 @@ void CObjComponentMgr::AnalyseMarkPt()
 					MarkVec[1]->SetbMarkObj(true);
 					MarkVec[2]->SetbMarkObj(true);
 			}
-           /* if(size>=3)
+           / * if(size>=3)
             {
 
 				sort(MarkVec.begin(), MarkVec.end(), [](CObjComponent * &  a, CObjComponent* & b) {return (a->GetBasePt().y) < (b->GetBasePt().y); });
@@ -1143,13 +1145,13 @@ void CObjComponentMgr::AnalyseMarkPt()
                         MarkVec[Mark3Idx]->NotCollect();//不要收集加工数据
 						MarkVec[Mark3Idx]->SetbMark1Obj(false);
                   }* /
-            }*/
+            }* /
             if(!flg)
             {
                   CMsgBox MsgBox;
                   MsgBox.Show("未发现定位点!");
             }
-      }
+      }*/
 }
 //获得基准对象的
 DbSize CObjComponentMgr::GetBaseSize(int idx)

LaiPuLaser/ServerMgr.cpp

@@ -139,7 +139,7 @@ void CServerMgr::OnReceive(int nErrorCode)
 #ifndef     DEBUG_lOCAL
 				CString NetDir = gProgram_SZ_XL->m_NetPath + ":";  //¹²ÏíÅÌ
 #else
-				CString NetDir = "D:\\紫外切割机\\信利双头(20200519)\\LaiPuLaser\\Debug\\TempMarkData\\";//共享盘   
+				CString NetDir = "D:\\紫外切割机\\同兴达双头 - 推治具\\LaiPuLaser\\Debug\\TempMarkData";//共享盘   
 #endif
 				CString NetparfilePath = NetDir + Name + ".par";
 				CString NetarefilePath = NetDir + Name + ".are";
@@ -149,7 +149,7 @@ void CServerMgr::OnReceive(int nErrorCode)
 				CopyFile(NetarefilePath, NewAreFilePath, false);
 				CopyFile(NetPIfilePath, NewPIFilePath, false);
 
-				fileName.MakeLower();
+				//fileName.MakeLower();
 				if (fileName.Find("dxf") != -1)
 				{
 					gServer->m_RcvFileName = NetDir +"\\"+ fileName;