From afbd05efeb5228df6548b298be420376982c81ae Mon Sep 17 00:00:00 2001 From: bestlqiang Date: Wed, 1 Dec 2021 16:32:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=8F=91=E9=80=81=E5=88=B0?= =?UTF-8?q?=E5=89=AF=E6=9C=BA=E7=9A=84=E6=8C=87=E4=BB=A4(OPEN=5FFILE);=20?= =?UTF-8?q?=E5=89=AF=E6=9C=BA=E8=87=AA=E5=B7=B1=E6=89=93=E5=BC=80=E5=9B=BE?= =?UTF-8?q?=E7=BA=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaiPuLaser/ClientMgr.cpp | 10 +++++----- LaiPuLaser/ClientMgr.h | 4 ++-- LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp | 7 +++++-- LaiPuLaser/hlp/LaiPuLaser.chm | Bin 11726 -> 11728 bytes 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/LaiPuLaser/ClientMgr.cpp b/LaiPuLaser/ClientMgr.cpp index 2ecc5cc..6e3fced 100644 --- a/LaiPuLaser/ClientMgr.cpp +++ b/LaiPuLaser/ClientMgr.cpp @@ -88,9 +88,9 @@ void CClientMgr::SendCmd_TransFile(CString filePath) CopyFile(filePath, NewFilePath, false); - CopyFile(parFile, NewParFilePath, false); - CopyFile(areFile, NewAreFilePath, false); - CopyFile(PIFile, NewPIFilePath, false); + //CopyFile(parFile, NewParFilePath, false); + //CopyFile(areFile, NewAreFilePath, 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()); - } + }*/ } diff --git a/LaiPuLaser/ClientMgr.h b/LaiPuLaser/ClientMgr.h index 96c5808..f80ee89 100644 --- a/LaiPuLaser/ClientMgr.h +++ b/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(); //发指令给副机,设置特殊对象 diff --git a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp index d4a60bd..51c196d 100644 --- a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp +++ b/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 - gProgramCutMgr->MoveObjData(BasePt); + /* //移动obj + gProgramCutMgr->MoveObjData(BasePt); //移动area //计算所有obj 的中心点 gObjComponentMgr->CalAllObjCenterPt(); diff --git a/LaiPuLaser/hlp/LaiPuLaser.chm b/LaiPuLaser/hlp/LaiPuLaser.chm index 0cb8e131c4e1e8a889e97a3e9aa0532b6cbc3330..6d03f1eae994b7ff3a03efc56bbe502151f72230 100644 GIT binary patch delta 3106 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 delta 3104 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