屏蔽发送到副机的指令(OPEN_FILE);

副机自己打开图纸.

LaiPuLaser/ClientMgr.cpp

@@ -88,9 +88,9 @@ void CClientMgr::SendCmd_TransFile(CString filePath)
 
 
 	CopyFile(filePath, NewFilePath, false);
-	CopyFile(parFile, NewParFilePath, false);
+	//CopyFile(parFile, NewParFilePath, false);
-	CopyFile(areFile, NewAreFilePath, false);
+	//CopyFile(areFile, NewAreFilePath, false);
-	CopyFile(PIFile, NewPIFilePath, false);
+	//CopyFile(PIFile, NewPIFilePath, false);
 
 }
 
@@ -98,12 +98,12 @@ void CClientMgr::SendCmd_OpenFile(CString filePath)
 {
 
 	SendCmd_TransFile(filePath);
-	Sleep(100);
+	/*Sleep(100);
 	if (Connect2Server())
 	{
 		CString str = "OPEN_FILE;" + filePath;
 		Send(str, str.GetLength());
-	}
+	}*/
 
 }
 

LaiPuLaser/ClientMgr.h

@@ -25,9 +25,9 @@ public:
 	
 	void SendCmd_OpenFile(CString filePath);		//发指令给副机,打开文件
 
-	void SendCmd_CollectData();		//发Product内容给客户端
+	void SendCmd_CollectData();		//发命令给副机,收集原始数据
 
-	void SendCmd_ProductInfo(CProduct product);		//发Product内容给客户端
+	void SendCmd_ProductInfo(CProduct product);		//发Product变换内容给客户端(仿射参数)
 
 	void SendCmd_SetSpecialObj();					//发指令给副机,设置特殊对象
 

LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp

@@ -1164,6 +1164,9 @@ void CTrackWorkFlow::CatchMarkNewly()
 
 	//收集未移动前的数据
 	gClientMgr->SendCmd_CollectData();
+	//数据移动回默认的位置(防止area 移位)
+	gProgramCutMgr->MoveObjData(Dbxy(0, 0));
+	gMarkAreaMgr->MoveAllAreaToTargetPt(Dbxy(0, 0));
 	//gMarkAreaMgr->CollectOrgWorkData(gProgram_SZ_XL->IsbSelMarkMode());
 	thread t1(&CMarkAreaMgr::CollectOrgWorkData, gMarkAreaMgr, gProgram_SZ_XL->IsbSelMarkMode());
 	t1.detach();
@@ -1207,8 +1210,8 @@ void CTrackWorkFlow::CatchMarkNewly()
 		}
 
 		Product.SetBasePt(BasePt);
-	/*	//移动obj
+		/*	//移动obj
-		gProgramCutMgr->MoveObjData(BasePt);
+	    gProgramCutMgr->MoveObjData(BasePt);
 		//移动area
 		//计算所有obj 的中心点
 		gObjComponentMgr->CalAllObjCenterPt();