Merge branch 'feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용' int...

LYW

2021-07-09 6e0a9dd083fae3138418444eb783e99509bb522b

 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp

@@ -788,6 +788,20 @@
         if (( nTotalCount += pGlassResult->GetTotalSReviewResultCount()) > 0)
         {
            m_pSP2P->ISP2P_DisplayMessage(_T("[Sequence Processor] Review Plan Start!"));
            //LYW DCOLL 임시조치
            CDitGlassRawClient *pDitRawClient = CDitGlassRawClient::GetInstance();
            if (pDitRawClient->isConnect() == TRUE)
            {

               _grmDefectData* pSharedDefect = pDitRawClient->GetDefectData(0);//pReviewResult->nDefectidx2
               _grmDefectReviewData * pSharedDefectReview = &pSharedDefect->m_ReviewDefect;

               //size_t CharactersConverted;
               //wcstombs_s(&CharactersConverted, pSharedDefectReview->m_strRevImageName, pReviewResult->strImgFileName, _TRUNCATE);

               strcpy(pSharedDefectReview->m_strRevImageName, "");
            }
            //LYW DCOLL 임시조치
            ::Sleep(nWaitTime);
            m_pSP2P->ISP2P_GetReviewProcessor()->ResetGantryDone();
            bExcute = ReviewStartProcessing(pGlassResult, nPlanIdx);
@@ -1047,9 +1061,15 @@
         m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] Send Loading Success Signal!"));

         strFileName.Format(_T("%s_%s"), strGlassIDTemp, strGlassStepIdTemp);
<<<<<<< HEAD
         //업데이트시
         bFileFind = FindRawBinFile(strFileName);
         //bFileFind = TRUE;
=======
         //������Ʈ��
         //bFileFind = FindRawBinFile(strFileName);
         bFileFind = TRUE;
>>>>>>> feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용

         pDitRawClient->SetReviewStart();
         Sleep(1000);
@@ -1244,7 +1264,6 @@
         if(pAlignCameraControl->AlignCameraDisconnectCheck() == FALSE)
         {
            SendResultToSignalControl(PCControlSendData_AlignResult_CPJT, SIGNAL_SEND_RESULT_FAIL);
            m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail! Align Cam Disconnect"));
            m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Algin Camera Disconnect!!!!"));
         }
      }      
@@ -3132,7 +3151,7 @@
               strReadData = pTransferData->strRerferData;
               break;
            }
            m_pSP2P->ISP2P_DisplayMessage(_T("[ReadTransferData] Name: %s, Addr: %s, Size: %d, Data: %s"), pInfo->strName, strReadAddress, nReadSize, strReadData); //0517
         //   m_pSP2P->ISP2P_DisplayMessage(_T("[ReadTransferData] Name: %s, Addr: %s, Size: %d, Data: %s"), pInfo->strName, strReadAddress, nReadSize, strReadData); //0517
      }
   }

@@ -4590,7 +4609,6 @@
   //WSI �¿� ��Ʈ�� �����̵� 
   pMotorControl->GantrySetTwoGantrySyncModeSend(1);
   

   // WSI result count
   for (int nModuleIdx = 0; nModuleIdx < Module_GetModuleStatusCount(); nModuleIdx++)
   {
@@ -4636,7 +4654,6 @@
            return 0;
         }
      }
		

      // get result index
      int nStartIdx = pWsiResult->GetStartSReviewResultIndex();
@@ -6094,7 +6111,6 @@
   pReviewScheduler->GetPathSchedulerParam()->SetSelectModuleType(type);
   
   nSchedulingCount = pReviewScheduler->PathScheduling(vecPathData, vecStartPathData);


   if (nSchedulingCount>0)
   {