From 65bd511efd36ceb38a9b60c10f28ebff53ce9d53 Mon Sep 17 00:00:00 2001
From: bestlqiang <bestlqiang@163.com>
Date: Thu, 3 Dec 2020 14:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=89=93=E5=BC=80=E6=97=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9B=B8=E6=9C=BA=E5=BA=8F=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaiPuLaser/DlgDnCutCamera.cpp              |  52 ++++++++++-----------
 LaiPuLaser/KnownFileNameVec                | Bin 526 -> 530 bytes
 LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp |  10 ++--
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/LaiPuLaser/DlgDnCutCamera.cpp b/LaiPuLaser/DlgDnCutCamera.cpp
index 23d02b0..a92e80e 100644
--- a/LaiPuLaser/DlgDnCutCamera.cpp
+++ b/LaiPuLaser/DlgDnCutCamera.cpp
@@ -109,58 +109,53 @@ BOOL DlgHawkvisCamera::OnInitDialog()
 
 	try
 	{
-		if (m_HawkvisCtrl1.MV_SelectAdapterByIdx(0))
+		if (m_HawkvisCtrl2.MV_SelectAdapterByIdx(1))
 		{
-			if (m_HawkvisCtrl1.MV_OpenCamera())
+			if (m_HawkvisCtrl2.MV_OpenCamera())
 			{
-				m_pHawkvisCtrl = &m_HawkvisCtrl1;
-				m_HawkvisCtrl1.MV_SetCameraExpTime(gCameraHawkvis->m_nCam1Expore);
-				m_nExpore = gCameraHawkvis->m_nCam1Expore;
+				m_pHawkvisCtrl = &m_HawkvisCtrl2;
+				m_HawkvisCtrl2.MV_SetCameraExpTime(gCameraHawkvis->m_nCam2Expore);
 			}
 			else
 			{
-				AfxMessageBox("相机1 MV_OpenCamera 失败!");
+				AfxMessageBox("相机2 MV_OpenCamera 失败!");
 			}
-			m_HawkvisCtrl1.SetCrossShow(1, 30, 30, -1, -1, TRUE);
-			if (m_HawkvisCtrl1.MV_GetOneFrame())
+			m_HawkvisCtrl2.SetCrossShow(1, 30, 30, -1, -1, TRUE);
+			if (m_HawkvisCtrl2.MV_GetOneFrame())
 			{
-				m_HawkvisCtrl1.ZoomFitWindow();
+				m_HawkvisCtrl2.ZoomFitWindow();
 			}
 			else
 			{
-				AfxMessageBox("相机1 MV_GetOneFrame 失败!");
+				AfxMessageBox("相机2 MV_GetOneFrame 失败!");
 			}
 		}
-	/*	else
-		{
-			gLogMgr->WriteDebugLog("*****未发现相机[1]!");
-		}*/
 
-		if (m_HawkvisCtrl2.MV_SelectAdapterByIdx(1))
+		if (m_HawkvisCtrl1.MV_SelectAdapterByIdx(0))
 		{
-			if (m_HawkvisCtrl2.MV_OpenCamera())
+			if (m_HawkvisCtrl1.MV_OpenCamera())
 			{
-				m_pHawkvisCtrl = &m_HawkvisCtrl2;
-				m_HawkvisCtrl2.MV_SetCameraExpTime(gCameraHawkvis->m_nCam2Expore);
+				m_pHawkvisCtrl = &m_HawkvisCtrl1;
+				m_HawkvisCtrl1.MV_SetCameraExpTime(gCameraHawkvis->m_nCam1Expore);
+				m_nExpore = gCameraHawkvis->m_nCam1Expore;
 			}
 			else
 			{
-				AfxMessageBox("相机2 MV_OpenCamera 失败!");
+				AfxMessageBox("相机1 MV_OpenCamera 失败!");
 			}
-			m_HawkvisCtrl2.SetCrossShow(1, 30, 30, -1, -1, TRUE);
-			if (m_HawkvisCtrl2.MV_GetOneFrame())
+			m_HawkvisCtrl1.SetCrossShow(1, 30, 30, -1, -1, TRUE);
+			if (m_HawkvisCtrl1.MV_GetOneFrame())
 			{
-				m_HawkvisCtrl2.ZoomFitWindow();
+				m_HawkvisCtrl1.ZoomFitWindow();
 			}
 			else
 			{
-				AfxMessageBox("相机2 MV_GetOneFrame 失败!");
+				AfxMessageBox("相机1 MV_GetOneFrame 失败!");
 			}
 		}
-		/*else
-		{
-			gLogMgr->WriteDebugLog("*****未发现相机[2]!");
-		}*/
+	
+	
+	
 	}
 	catch (...)
 	{
@@ -175,6 +170,8 @@ void DlgHawkvisCamera::UpdateInfo()
 	//换文件时,自动换模板
 	if ((!gLogMgr->IsDebuging()) && gCameraHawkvis->GetCurShapeModelID() != m_ShapeModelID)
 	{
+		auto temp = m_pHawkvisCtrl;
+
 		m_ShapeModelID = gCameraHawkvis->GetCurShapeModelID();
 
 		m_pHawkvisCtrl = &m_HawkvisCtrl1;
@@ -183,6 +180,7 @@ void DlgHawkvisCamera::UpdateInfo()
 		m_pHawkvisCtrl = &m_HawkvisCtrl2;
 		OnBnClickedLoadCatchTemp();
 
+		m_pHawkvisCtrl = temp;
 	}
 	if (m_DlgCurCamIndex == gCameraHawkvis->GetCamIndex())
 		return;
diff --git a/LaiPuLaser/KnownFileNameVec b/LaiPuLaser/KnownFileNameVec
index 24b93e02695f9f364caa4259dde3401cf29294dd..5414e5d5b5bd7bdcec92c9ddf2d9cd681eac11b3 100644
GIT binary patch
delta 36
rcmeBUnZ&}#Kanw1nAyb0nB62fvnV+ymCYwG#5Fi%<HB6Vi5qMHryUBM

delta 16
XcmbQl(#OKcGm$ZL<HSbBi3`jDC_e>B

diff --git a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
index c0de9b6..63b21bc 100644
--- a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
+++ b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
@@ -1306,13 +1306,13 @@ void CTrackWorkFlow::UnLoad()
 		gLogMgr->WriteDebugLog(logstr);
 
 
-		int cnt = 0;
-		while ((!m_bPushJigReady) && cnt < 400)
+		//int cnt = 0;
+		while ((!m_bPushJigReady) )//&& cnt < 400)
 		{
 			Sleep(300);
-			cnt++;
+			//cnt++;
 		}
-		if (cnt == 400)
+		/*if (cnt == 400)
 		{
 			Log = m_TrackName + " [下料机] 运动至下载具位 超时!";
 			gLogMgr->WriteDebugLog(Log);
@@ -1321,7 +1321,7 @@ void CTrackWorkFlow::UnLoad()
 			gTrackWorkFlow1.RadAlamOnOff(false);
 			SetCurTrackWorkStep(_ETrack_Step_Unload_Err);
 			return;
-		}
+		}*/
 
 		if (!PushJigOut())//推出治具
 		{