diff --git a/LaiPuLaser/CommonFlowMgr.cpp b/LaiPuLaser/CommonFlowMgr.cpp index 30c488d..7b4a360 100644 --- a/LaiPuLaser/CommonFlowMgr.cpp +++ b/LaiPuLaser/CommonFlowMgr.cpp @@ -1646,7 +1646,7 @@ void CCommonFlowMgr::MovePtToCamera(vector &PtVec, vector &ResultVec pCmd->SetResultVec(ResultVec);//绑定结果容器 pCmd->SetFrontDelay(Camera.GetCatchFrontDelay());//抓取前延时 pCmd->SetAfterDelay(300);//移动后延时 - pCmd->SetbAlam(false);//不要蜂鸣器提示 + pCmd->SetbAlam(true);//不要蜂鸣器提示 CmdContainer.AddCmd(pCmd); } } diff --git a/LaiPuLaser/DlgDnCutCamera.cpp b/LaiPuLaser/DlgDnCutCamera.cpp index fe94cd3..ae62cb0 100644 --- a/LaiPuLaser/DlgDnCutCamera.cpp +++ b/LaiPuLaser/DlgDnCutCamera.cpp @@ -171,9 +171,7 @@ void DlgHawkvisCamera::UpdateInfo() if ((!gLogMgr->IsDebuging()) && gCameraHawkvis->GetCurShapeModelID() != m_ShapeModelID) { auto temp = m_pHawkvisCtrl; - m_ShapeModelID = gCameraHawkvis->GetCurShapeModelID(); - m_pHawkvisCtrl = &m_HawkvisCtrl1; OnBnClickedLoadCatchTemp(); Sleep(200); @@ -181,6 +179,7 @@ void DlgHawkvisCamera::UpdateInfo() OnBnClickedLoadCatchTemp(); m_pHawkvisCtrl = temp; + } if (m_DlgCurCamIndex == gCameraHawkvis->GetCamIndex()) return; @@ -439,7 +438,7 @@ void DlgHawkvisCamera::OnBnClickedLoadCatchTemp() // auto b=m_HawkvisCtrl.LoadShapeModel((LPCTSTR)path); try { - auto b = m_pHawkvisCtrl->LoadShapeModelByID(gCameraHawkvis->GetCurShapeModelID(), (LPCTSTR)path); + auto b = m_pHawkvisCtrl->LoadShapeModelByID(0, (LPCTSTR)path); CString str; str.Format("Hawkvis : LoadatchTemp [%d]", gCameraHawkvis->GetCurShapeModelID()); diff --git a/LaiPuLaser/KnownFileNameVec b/LaiPuLaser/KnownFileNameVec index 5414e5d..873142a 100644 Binary files a/LaiPuLaser/KnownFileNameVec and b/LaiPuLaser/KnownFileNameVec differ diff --git a/LaiPuLaser/WorkCmdCameraCatch.cpp b/LaiPuLaser/WorkCmdCameraCatch.cpp index d72b322..e10311a 100644 --- a/LaiPuLaser/WorkCmdCameraCatch.cpp +++ b/LaiPuLaser/WorkCmdCameraCatch.cpp @@ -3,6 +3,7 @@ #include "ExceptionMsg.h" #include "Program_SZ_XL_TrackWorkFlow.h" #include "CommonFlowMgr.h" +#include "CameraHawkvis.h" CWorkCmdCameraCatch::CWorkCmdCameraCatch(CCamera &Camera) :m_Camera(Camera) { @@ -53,7 +54,8 @@ bool CWorkCmdCameraCatch::Excute() //顺便保存在容器中 if(m_pResultVec != NULL) { - m_pResultVec->push_back(pt); + auto CamCoord = gCameraHawkvis->m_Coord; + m_pResultVec->push_back(pt- CamCoord); } return true; }