修正振镜校准的数据采集

LaiPuLaser/CommonFlowMgr.cpp

@@ -1646,7 +1646,7 @@ void CCommonFlowMgr::MovePtToCamera(vector<Dbxy> &PtVec, vector<Dbxy> &ResultVec
 			pCmd->SetResultVec(ResultVec);//绑定结果容器
 			pCmd->SetFrontDelay(Camera.GetCatchFrontDelay());//抓取前延时
 			pCmd->SetAfterDelay(300);//移动后延时
-			pCmd->SetbAlam(false);//不要蜂鸣器提示
+			pCmd->SetbAlam(true);//不要蜂鸣器提示
 			CmdContainer.AddCmd(pCmd);
 		}
 	}

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());
 

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;
 }