修正打开时默认相机序号不对

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_pHawkvisCtrl = &m_HawkvisCtrl2;
-				m_HawkvisCtrl1.MV_SetCameraExpTime(gCameraHawkvis->m_nCam1Expore);
+				m_HawkvisCtrl2.MV_SetCameraExpTime(gCameraHawkvis->m_nCam2Expore);
-				m_nExpore = gCameraHawkvis->m_nCam1Expore;
 			}
 			else
 			{
-				AfxMessageBox("相机1 MV_OpenCamera 失败!");
+				AfxMessageBox("相机2 MV_OpenCamera 失败!");
 			}
-			m_HawkvisCtrl1.SetCrossShow(1, 30, 30, -1, -1, TRUE);
+			m_HawkvisCtrl2.SetCrossShow(1, 30, 30, -1, -1, TRUE);
-			if (m_HawkvisCtrl1.MV_GetOneFrame())
+			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_pHawkvisCtrl = &m_HawkvisCtrl1;
-				m_HawkvisCtrl2.MV_SetCameraExpTime(gCameraHawkvis->m_nCam2Expore);
+				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);
+			m_HawkvisCtrl1.SetCrossShow(1, 30, 30, -1, -1, TRUE);
-			if (m_HawkvisCtrl2.MV_GetOneFrame())
+			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;

LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp

@@ -1306,13 +1306,13 @@ void CTrackWorkFlow::UnLoad()
 		gLogMgr->WriteDebugLog(logstr);
 
 
-		int cnt = 0;
+		//int cnt = 0;
-		while ((!m_bPushJigReady) && cnt < 400)
+		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())//推出治具
 		{