|
|
@ -1659,6 +1659,14 @@ void CCommonFlowMgr::MovePtToCamera(vector<Dbxy> &PtVec, vector<Dbxy> &ResultVec
|
|
|
|
pCmd->SetAfterDelay(300);//移动后延时
|
|
|
|
pCmd->SetAfterDelay(300);//移动后延时
|
|
|
|
CmdContainer.AddCmd(pCmd);
|
|
|
|
CmdContainer.AddCmd(pCmd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//等待运动结束-------------------------------------------------
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
CWorkCmdWaitMotorStop *pCmd = new CWorkCmdWaitMotorStop();
|
|
|
|
|
|
|
|
pCmd->SetbWaitMotorX();
|
|
|
|
|
|
|
|
pCmd->SetbWaitMotorX2();
|
|
|
|
|
|
|
|
pCmd->SetbWaitMotorY();
|
|
|
|
|
|
|
|
CmdContainer.AddCmd(pCmd);
|
|
|
|
|
|
|
|
}
|
|
|
|
//抓取--------------------------------------------------------
|
|
|
|
//抓取--------------------------------------------------------
|
|
|
|
if (bCatch)
|
|
|
|
if (bCatch)
|
|
|
|
{
|
|
|
|
{
|
|
|
|