mrDarker
2025-08-09 7201dd0993a94087a1c03e4f9700e3a6128d17e9
1. 新增两个相机的扫描开始
已修改2个文件
64 ■■■■■ 文件已修改
EdgeInspector_App/InterfaceManager.cpp 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EdgeInspector_App/InterfaceManager.h 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EdgeInspector_App/InterfaceManager.cpp
@@ -868,10 +868,12 @@
            g_pStatus->m_iScanIdx = 1;            
            AfxBeginThread(ScanStartCam_0,this);
            AfxBeginThread(ScanStartCam_1,this);
            AfxBeginThread(ScanStartCam_2,this);
            AfxBeginThread(ScanStartCam_3,this);
            AfxBeginThread(ScanStartCam_0, this);
            AfxBeginThread(ScanStartCam_1, this);
            AfxBeginThread(ScanStartCam_2, this);
            AfxBeginThread(ScanStartCam_3, this);
            AfxBeginThread(ScanStartCam_4, this);
            AfxBeginThread(ScanStartCam_5, this);
            AfxBeginThread(CheckScanStart,this);
        }
@@ -884,10 +886,12 @@
            g_pStatus->m_iScanIdx = 0;
            AfxBeginThread(ScanStartCam_0,this);
            AfxBeginThread(ScanStartCam_1,this);
            AfxBeginThread(ScanStartCam_2,this);
            AfxBeginThread(ScanStartCam_3,this);
            AfxBeginThread(ScanStartCam_0, this);
            AfxBeginThread(ScanStartCam_1, this);
            AfxBeginThread(ScanStartCam_2, this);
            AfxBeginThread(ScanStartCam_3, this);
            AfxBeginThread(ScanStartCam_4, this);
            AfxBeginThread(ScanStartCam_5, this);
            AfxBeginThread(CheckScanStart,this);
@@ -901,20 +905,16 @@
UINT CInterfaceManager::CheckScanStart(LPVOID pParam)
{
    CInterfaceManager    *pInter = static_cast<CInterfaceManager*>(pParam);
    CInterfaceManager *pInter = static_cast<CInterfaceManager*>(pParam);
    double CurTime = GetTickCount();
    double        CurTime = GetTickCount();
    do
    {
        if (GetTickCount() - CurTime > 10000)
        {
    do {
        if (GetTickCount() - CurTime > 10000) {
            g_pLog->DisplayMessage(_T("Scan Start Ack TimeOut : Scan %d-%d"),g_pStatus->m_iScanIdx,pInter->m_nScanStartCount);
            break;
        }
        if(pInter->m_nScanStartCount == MAX_CAMERA_COUNT)
        {
        if(pInter->m_nScanStartCount == MAX_CAMERA_COUNT) {
            g_pLog->DisplayMessage(_T("Scan Start Ack Ok : Scan %d-%d"),g_pStatus->m_iScanIdx,pInter->m_nScanStartCount);
            break;
        }
@@ -923,13 +923,11 @@
    } while (1);
    
    g_pLog->DisplayMessage(_T("Scan Start Ack Signal Send : Scan %d-%d"),g_pStatus->m_iScanIdx,pInter->m_nScanStartCount);
    if(g_pStatus->m_iScanIdx == 0)
    {
    if(g_pStatus->m_iScanIdx == 0) {
        if(pInter->m_pThread_SendMSG != NULL)
            pInter->m_pThread_SendMSG->AddSendMSG(SEND_MESSAGE_CONTROLSIGNAL,IToC_Ack_LongScanStartSuccess,TRUE);
    }
    else
    {
    else {
        if(pInter->m_pThread_SendMSG != NULL)
            pInter->m_pThread_SendMSG->AddSendMSG(SEND_MESSAGE_CONTROLSIGNAL,IToC_Ack_ShortScanStartSuccess,TRUE);
    }
@@ -1017,6 +1015,24 @@
    return 0;
}
UINT CInterfaceManager::ScanStartCam_4(LPVOID pParam)
{
    CInterfaceManager* pInter = static_cast<CInterfaceManager*>(pParam);
    pInter->ScanStartCamera(4);
    return 0;
}
UINT CInterfaceManager::ScanStartCam_5(LPVOID pParam)
{
    CInterfaceManager* pInter = static_cast<CInterfaceManager*>(pParam);
    pInter->ScanStartCamera(5);
    return 0;
}
BOOL CInterfaceManager::ScanStartGrabManual(int iCam,int iScan)
{
    if(m_pGrabber[iCam] != NULL)
EdgeInspector_App/InterfaceManager.h
@@ -67,9 +67,11 @@
    static    UINT    ScanStartCam_1(LPVOID pParam);
    static    UINT    ScanStartCam_2(LPVOID pParam);
    static    UINT    ScanStartCam_3(LPVOID pParam);
    static  UINT    ScanStartCam_4(LPVOID pParam);
    static  UINT    ScanStartCam_5(LPVOID pParam);
    static  UINT    CheckScanStart(LPVOID pParam);
    static UINT        PLCSignalThreadFunc(LPVOID pParam);
    static UINT        ScanEndProcess(LPVOID pParam);
    static  UINT    PLCSignalThreadFunc(LPVOID pParam);
    static  UINT    ScanEndProcess(LPVOID pParam);
protected:
    BOOL            InitInspect();