merge 오류 수정

LYW

2021-07-09 527c18879378e6f98d32d36308a2c55e870912b4

 ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp

@@ -97,7 +97,7 @@
   }


   // ���� ��������� ����
   // 占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙

   wsiResult.nWsi_ResultIndex = measureResut.nResultIndex;
   wsiResult.nResultCode = measureResut.nResultCode;
@@ -163,7 +163,7 @@
   memcpy(wsiResult.pWsi_ResultData, measureResut.pResultData, sizeof(wsiResult.pWsi_ResultData));


   // ��� ������ �߰�
   // 占쏙옙占?占쏙옙占쏙옙占쏙옙 占쌩곤옙
   SReviewResult *pProcessResult = NULL;
   if (pGlassResult->SetWsiResultData(nModuleIndex, nCurResultIdx, wsiResult, nGlassPosX, nGlassPosY, nMotorPosX, nMotorPosY, dTime))
   {
@@ -192,7 +192,7 @@
   
   LeaveCriticalSection(&m_csUserCriticalSection);

   // ��� ����.
   // 占쏙옙占?占쏙옙占쏙옙.
   m_pRP2P->IRP2P_UpdateReviewResult(nModuleIndex, pGlassResult);
   return;

@@ -246,14 +246,14 @@
      g_pLog->DisplayMessage(_T("[ReviewProcessor]SetWsiResultData module[%d] point[%d] result[%d]"), nModuleIndex, measureResut.nResultIndex, nCurResultIdx);
   }

   // ���� ��������� ����
   // 占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙
   wsiUserResult.nWsi_ResultCode      = measureResut.nResultCode;
   wsiUserResult.nWsi_Type            = measureResut.nResultType;
   wsiUserResult.nWsi_SlopeWarn      = measureResut.nXSlopeWarn;
   memcpy(wsiUserResult.pWsi_ResultData, measureResut.pResultData, sizeof(wsiUserResult.pWsi_ResultData));


   // ��� ������ �߰�
   // 占쏙옙占?占쏙옙占쏙옙占쏙옙 占쌩곤옙
   SReviewResult *pProcessResult = NULL;
   if (pGlassResult->SetUserWsiResultData(nModuleIndex, nCurResultIdx, wsiUserResult, nGlassPosX, nGlassPosY, nMotorPosX, nMotorPosY, dTime))
   {
@@ -282,7 +282,7 @@

   LeaveCriticalSection(&m_csUserCriticalSection);

   // ��� ����.
   // 占쏙옙占?占쏙옙占쏙옙.
   m_pRP2P->IRP2P_UpdateReviewResult(nModuleIndex, pGlassResult);
   return;

@@ -345,7 +345,7 @@
      g_pLog->DisplayMessage(_T("[ReviewProcessor]SetWsiMultiShotResultData module[%d] point[%d] result[%d]"), nModuleIndex, measureResut.nResultIndex, nCurResultIdx);
   }

   // ���� ��������� ����
   // 占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙
   wsiResult.nWsi_ResultCode = measureResut.nResultCode;
   wsiResult.nWsi_Type = measureResut.nResultType;
   wsiResult.nWsi_SlopeWarn = measureResut.nXSlopeWarn;
@@ -353,7 +353,7 @@
   memcpy(wsiResult.pWsi_ResultData, measureResut.pResultData, sizeof(wsiResult.pWsi_ResultData));


   // ��� ������ �߰�
   // 占쏙옙占?占쏙옙占쏙옙占쏙옙 占쌩곤옙
   SReviewResult *pProcessResult = NULL;
   if (pGlassResult->SetWsiResultData(nModuleIndex, nCurResultIdx, wsiResult, nGlassPosX, nGlassPosY, nMotorPosX, nMotorPosY, dTime))
   {
@@ -382,7 +382,7 @@

   LeaveCriticalSection(&m_csUserCriticalSection);

   // ��� ����.
   // 占쏙옙占?占쏙옙占쏙옙.
   m_pRP2P->IRP2P_UpdateReviewResult(nModuleIndex, pGlassResult);
   return;

@@ -465,7 +465,7 @@
      g_pLog->DisplayMessage(_T("[ReviewProcessor]SetReviewResultData module[%d] point[%d] result[%d]"), nModuleIndex, nResultIndex, nCurResultIdx);
   }

   // ���� ����̹��� ����
   // 占쏙옙占쏙옙 占쏙옙占쏙옙譴占쏙옙占?占쏙옙占쏙옙
   SReviewResult *pProcessResult = NULL;
   switch(GetReviewProcessStatus())
   {
@@ -527,7 +527,7 @@
   }
      LeaveCriticalSection(&m_csUserCriticalSection);

      //���� ��� ����������Ʈ ������ ���ع����� �Ʒ� ������ ��Ÿ�� �ٽ� ������ǥ �Ƚ��� 
      //占쏙옙占쏙옙 占쏙옙占?占쏙옙占쏙옙占쏙옙占쏙옙占쏙옙트 占쏙옙占쏙옙占쏙옙 占쏙옙占쌔뱄옙占쏙옙占쏙옙 占싣뤄옙 占쏙옙占쏙옙占쏙옙 占쏙옙타占쏙옙 占쌕쏙옙 占쏙옙占쏙옙占쏙옙표 占싫쏙옙占쏙옙 
      // ��ȣó�� �ʿ��� �̰� ���� 
      if (nCurResultIdx + 1== pReviewResult->GetSReviewResultCount())
      {
@@ -542,7 +542,7 @@

         if (bLeftGantryReviewDone&&bRightGantryReviewDone)
         {
            ::Sleep(3000); // ����̴� �ʼ���. ������ ���� ����.
            ::Sleep(3000); // 占쏙옙占쏙옙甄占?占십쇽옙占쏙옙. 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙.
            g_pLog->DisplayMessage(_T("[ReviewProcessor]RemainReview Started module[%d]"), nModuleIndex);
            CSequenceProcessor* pSequenceProcessor = m_pRP2P->IRP2P_GetSequenceProcessor();
            switch (GetReviewProcessStatus())
@@ -567,13 +567,13 @@
         }
         else if(m_pRP2P->IRP2P_Recipe_GetRsRcpReviewInfo()->GetRcpSchedulingInfo()->GetSingleGantryPath()>0)
         {
            //20210302 �̱� ��Ʈ�� ���� ���� ������ �ΰ��� ��Ʈ���� �Ϸ�� ���¿��� 
            //������ �ؾߵ����� Review ���� Count üũ �ϴ� ������� �Ѱ�Ʈ�� ���� 200������ ���ߴ� ���� �߻�
            //�׷��� �̱� ��Ʈ�� ���� ����ó�� �Ͽ� �����ϵ��� �ٲ�ߵ� CHM
            //20210302 占싱깍옙 占쏙옙트占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙 占싸곤옙占쏙옙 占쏙옙트占쏙옙占쏙옙 占싹뤄옙占?占쏙옙占승울옙占쏙옙 
            //占쏙옙占쏙옙占쏙옙 占쌔야듸옙占쏙옙占쏙옙 Review 占쏙옙占쏙옙 Count 체크 占싹댐옙 占쏙옙占쏙옙占쏙옙占?占싼곤옙트占쏙옙 占쏙옙占쏙옙 200占쏙옙占쏙옙占쏙옙 占쏙옙占쌩댐옙 占쏙옙占쏙옙 占쌩삼옙
            //占쌓뤄옙占쏙옙 占싱깍옙 占쏙옙트占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙처占쏙옙 占싹울옙 占쏙옙占쏙옙占싹듸옙占쏙옙 占쌕뀐옙森占?CHM
            g_pLog->DisplayMessage(_T("[ReviewProcessor]Single GantryPath Use"), nModuleIndex);
            if (bLeftGantryReviewDone || bRightGantryReviewDone)
            {
               ::Sleep(3000); // ����̴� �ʼ���. ������ ���� ����.
               ::Sleep(3000); // 占쏙옙占쏙옙甄占?占십쇽옙占쏙옙. 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙.
               g_pLog->DisplayMessage(_T("[ReviewProcessor]RemainReview Started module[%d]"), nModuleIndex);
               CSequenceProcessor* pSequenceProcessor = m_pRP2P->IRP2P_GetSequenceProcessor();
               switch (GetReviewProcessStatus())
@@ -601,7 +601,7 @@

      }
      
      // ������ ����Ʈ���� �԰�, ������ ����� ���� ������...
      // 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙트占쏙옙占쏙옙 占쌉곤옙, 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙占?占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙...
      if(nCurResultIdx==nEndResultIdx && nCurResultIdx+1 < pReviewResult->GetSReviewResultCount())
       {

@@ -625,7 +625,7 @@
      pReviewResult->SetEndSReviewResultIndex(nEndResultIdx);

      // ������ ����Ʈ ���� ��������.
      ::Sleep(3000); // ����̴� �ʼ���. ������ ���� ����.
      ::Sleep(3000); // 占쏙옙占쏙옙甄占?占십쇽옙占쏙옙. 占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙.
         if (bLeftGantryReviewDone&&bRightGantryReviewDone)
         {
         
@@ -685,7 +685,7 @@
      }
   }

   // ��� ����.
   // 占쏙옙占?占쏙옙占쏙옙.
   m_pRP2P->IRP2P_UpdateReviewResult(nModuleIndex, pGlassResult, m_nReviewPlanIndex);
   return;

@@ -1143,14 +1143,14 @@
   pReviewResult->strSnapTime.Format(_T("%04d%02d%02d%02d%02d%02d"), snapTime.GetYear(), snapTime.GetMonth(), snapTime.GetDay(), 
      snapTime.GetHour(), snapTime.GetMinute(), snapTime.GetSecond());   // snap_time

   // ���� ���ε� �̹��� ���� �̸� �����
   // 占쏙옙占쏙옙 占쏙옙占싸듸옙 占싱뱄옙占쏙옙 占쏙옙占쏙옙 占싱몌옙 占쏙옙占쏙옙占?
   CString strImageFileName = _T("");
   if (MakeReviewImageFileName(pReviewResult)==FALSE)
   {
      
   }

   //������� ���� �޸� ���� �̹��� �̸� �� ��ǥ ä���ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨몌옙 占쏙옙占쏙옙 占싱뱄옙占쏙옙 占싱몌옙 占쏙옙 占쏙옙표 채占쏙옙占쌍깍옙
   if(!UpdateMemoryReviewPlan(pReviewResult))
      m_pRP2P->IRP2P_DisplayMessage(_T("[ReviewPlan] Memory Update Fail!! DefectIdx : %d"), pReviewResult->nDefectidx2);
   
@@ -1178,7 +1178,7 @@
      //   UINT64 nSize = SaveReviewImage(&uploadImage, strPath, m_nReviewImageSize, m_nReviewImageQuality, m_nReviewImageStep);
         //if (nSize > 0)
         //   m_pRP2P->IRP2P_DisplayMessage(_T("Backup Review Image Save Success! Size: %d byte [%s]"), nSize, pReviewResult->strUploadImgFileName);
         // ���ε� �̹��� ��� ���� 20190917 chm
         // 占쏙옙占싸듸옙 占싱뱄옙占쏙옙 占쏙옙占?占쏙옙占쏙옙 20190917 chm
         strPath.Format(_T("%s\\%s"), m_strSaveImageUploadPath, pReviewResult->strUploadImgFileName);
         nSize = SaveReviewImage(&uploadImage, strPath, m_nReviewImageSize, m_nReviewImageQuality, m_nReviewImageStep);

@@ -1192,21 +1192,16 @@
            {
               m_pRP2P->IRP2P_DisplayMessage(_T("RTMS Review Image Save Fail!!"));
            }
<<<<<<< HEAD
            else m_pRP2P->IRP2P_DisplayMessage(_T("RTMS Review Image Save Success! Size: %d byte [%s]"), nSize, strRTMSPath);
=======

            else m_pRP2P->IRP2P_DisplayMessage(_T("RTMS Review Image Save Success! Size: %d byte [%s] index[%d]"), nSize, strRTMSPath, pReviewResult->nDefectIdx); //taek 210128 �ӵ� ������ �ӽ÷� �α� ������ ����
>>>>>>> feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용

         }
         if (nSize > 0)
         {
            
             int aoiindex = CDitGlassRawClient::GetInstance()->GetDefectData(pReviewResult->nDefectidx2)->m_nDefectIdx;
<<<<<<< HEAD

            m_pRP2P->IRP2P_DisplayMessage(_T("Upload Review Image Save Success! Size: %d byte [%s] index[%d] AOI NO[%d]"), nSize, pReviewResult->strUploadImgFileName, pReviewResult->nDefectIdx, aoiindex); //taek 210128 속도 문제로 임시로 로그 남기지 않음
=======
            m_pRP2P->IRP2P_DisplayMessage(_T("Upload Review Image Save Success! Size: %d byte [%s] index[%d] AOI NO[%d]"), nSize, strRTMSPath, pReviewResult->nDefectIdx, aoiindex); //taek 210128 �ӵ� ������ �ӽ÷� �α� ������ ����
>>>>>>> feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용
            //m_pRP2P->IRP2P_DisplayMessage(_T("Upload Review Image Save Success! Size: %d byte [%s]"), nSize, pReviewResult->strUploadImgFileName);
         }
         else
@@ -1242,7 +1237,7 @@
   const CRsRcpReviewInfo*  psRcpReviewInfo = m_pRP2P->IRP2P_Recipe_GetRsRcpReviewInfo();
   if(psRcpReviewInfo== NULL) m_pRP2P->IRP2P_DisplayMessage(_T("RcpReviewInfo is NULL"));
   
   if(psRcpReviewInfo->m_bDefocusUse) //190819chm ����Ŀ�� �˶� ��� 
   if(psRcpReviewInfo->m_bDefocusUse) //190819chm 占쏙옙占쏙옙커占쏙옙 占싯띰옙 占쏙옙占?
   {
     if(pReviewResult->nLocation == DefectLoc_ASG || pReviewResult->nLocation == DefectLoc_PAD || pReviewResult->nLocation == DefectLoc_C2C)
     {
@@ -1349,7 +1344,7 @@
   pReviewResult->strSnapTime.Format(_T("%04d%02d%02d%02d%02d%02d"), snapTime.GetYear(), snapTime.GetMonth(), snapTime.GetDay(), 
      snapTime.GetHour(), snapTime.GetMinute(), snapTime.GetSecond());   // snap_time

   // ���� ���ε� �̹��� ���� �̸� �����
   // 占쏙옙占쏙옙 占쏙옙占싸듸옙 占싱뱄옙占쏙옙 占쏙옙占쏙옙 占싱몌옙 占쏙옙占쏙옙占?
   CString strImageFileName = _T("");
   if (MakeUserImageFileName(pReviewResult)==FALSE)
   {
@@ -1384,7 +1379,7 @@
         //uploadImage.SaveImage(strPath, 40);  // ȭ�� 60% 150k
         if(GetReviewProcessStatus() == ReviewProcessStatus_UserStart)
         {
            // ���ε� �̹��� ��� ���� 20190917 chm
            // 占쏙옙占싸듸옙 占싱뱄옙占쏙옙 占쏙옙占?占쏙옙占쏙옙 20190917 chm
            //strPath.Format(_T("%s\\%s\\%s"), m_strSaveImageUploadPath, m_strGlassID, pReviewResult->strUploadImgFileName);
            strPath.Format(_T("%s\\%s"), m_strSaveImageUploadPath, pReviewResult->strUploadImgFileName);
            nSize = SaveReviewImage(&uploadImage, strPath, m_nReviewImageSize, m_nReviewImageQuality, m_nReviewImageStep);
@@ -1406,7 +1401,7 @@
   const CRsRcpReviewInfo*  psRcpReviewInfo = m_pRP2P->IRP2P_Recipe_GetRsRcpReviewInfo();
   if(psRcpReviewInfo== NULL) m_pRP2P->IRP2P_DisplayMessage(_T("RcpReviewInfo is NULL"));

   if(psRcpReviewInfo->m_bDefocusUse) //190819chm ����Ŀ�� �˶� ��� 
   if(psRcpReviewInfo->m_bDefocusUse) //190819chm 占쏙옙占쏙옙커占쏙옙 占싯띰옙 占쏙옙占?
   {
      if(pReviewResult->nLocation == DefectLoc_ASG || pReviewResult->nLocation == DefectLoc_PAD || pReviewResult->nLocation == DefectLoc_C2C)
      {
@@ -1491,7 +1486,7 @@
   pReviewResult->strSnapTime.Format(_T("%04d%02d%02d%02d%02d%02d"), snapTime.GetYear(), snapTime.GetMonth(), snapTime.GetDay(), 
      snapTime.GetHour(), snapTime.GetMinute(), snapTime.GetSecond());   // snap_time

   // ���� ���ε� �̹��� ���� �̸� �����
   // 占쏙옙占쏙옙 占쏙옙占싸듸옙 占싱뱄옙占쏙옙 占쏙옙占쏙옙 占싱몌옙 占쏙옙占쏙옙占?
   CString strImageFileName = _T("");
   if (MakeReflowImageFileName(pReviewResult)==FALSE)
   {
@@ -1508,7 +1503,7 @@


   reflowParam reParam; //Reflow ���� ���� 
   reflowResult reResult;//Reflow ��� ����
   reflowResult reResult;//Reflow 占쏙옙占?占쏙옙占쏙옙

   //////////////////////////////////////////////////////////////////////////////////////////////
   BOOL btFlag =0;
@@ -1663,7 +1658,7 @@
         //uploadImage.SaveImage(strPath, 40);  // ȭ�� 60% 150k
         if(GetReviewProcessStatus() == ReviewProcessStatus_ReflowStart)
         {
            // ���ε� �̹��� ��� ���� 20190917 chm
            // 占쏙옙占싸듸옙 占싱뱄옙占쏙옙 占쏙옙占?占쏙옙占쏙옙 20190917 chm
            //strPath.Format(_T("%s\\%s\\%s"), m_strSaveImageUploadPath, m_strGlassID, pReviewResult->strUploadImgFileName);
            strPath.Format(_T("%s\\%s"), m_strSaveImageUploadPath, pReviewResult->strUploadImgFileName);
            nSize = SaveReviewImage(&uploadImage, strPath, m_nReviewImageSize, m_nReviewImageQuality, m_nReviewImageStep);
@@ -1916,7 +1911,7 @@

   if(GetReviewProcessStatus() == ReviewProcessStatus_ReviewStart)
   {
      // [2017:6:5]-[WEZASW] : Review Image ���ϸ�� '*' ��� ����.(����ó��)
      // [2017:6:5]-[WEZASW] : Review Image 占쏙옙占싹몌옙占?'*' 占쏙옙占?占쏙옙占쏙옙.(占쏙옙占쏙옙처占쏙옙)
      if (pReviewResult->strDefectCode.Compare(_T("***")) == 0)
         strDefectCodeTemp = _T("DC");   
      else 
@@ -2007,7 +2002,7 @@
      snapTime.GetHour(), snapTime.GetMinute(), snapTime.GetSecond());   // snap_time


   // [2017:4:10]-[WEZASW] : ����� ��û�� ���� bmp ���� �߰� ����. (�ӽû��)
   // [2017:4:10]-[WEZASW] : 占쏙옙占쏙옙占?占쏙옙청占쏙옙 占쏙옙占쏙옙 bmp 占쏙옙占쏙옙 占쌩곤옙 占쏙옙占쏙옙. (占쌈시삼옙占?
   pReviewResult->strOrignalImgFileName = strFileName + _T(".bmp");

   strFileName += _T(".jpg");
@@ -2068,7 +2063,7 @@
   
   if(GetReviewProcessStatus() == ReviewProcessStatus_UserStart)
   {
      // [2017:6:5]-[WEZASW] : Review Image ���ϸ�� '*' ��� ����.(����ó��)
      // [2017:6:5]-[WEZASW] : Review Image 占쏙옙占싹몌옙占?'*' 占쏙옙占?占쏙옙占쏙옙.(占쏙옙占쏙옙처占쏙옙)
      if (pReviewResult->strDefectCode.Compare(_T("***")) == 0)
         strDefectCodeTemp = _T("DC");   
      else 
@@ -2162,7 +2157,7 @@
   //       strFileName += pReviewResult->strSnapTime;
   //    }

   // [2017:4:10]-[WEZASW] : ����� ��û�� ���� bmp ���� �߰� ����. (�ӽû��)
   // [2017:4:10]-[WEZASW] : 占쏙옙占쏙옙占?占쏙옙청占쏙옙 占쏙옙占쏙옙 bmp 占쏙옙占쏙옙 占쌩곤옙 占쏙옙占쏙옙. (占쌈시삼옙占?
   pReviewResult->strOrignalImgFileName = strFileName + _T(".bmp");

   strFileName += _T(".jpg");
@@ -2245,7 +2240,7 @@

   FindAoiDefectImagePath(strGlassID, nOpticType, nPosX, nPosY, strAoiDarkPath, strAoiBrightPath);

   // Dark, Bright ��� ã�� ���� �ּ�ó�� [2017.7.1 bhs]
   // Dark, Bright 占쏙옙占?찾占쏙옙 占쏙옙占쏙옙 占쌍쇽옙처占쏙옙 [2017.7.1 bhs]
   // Dark image
   //if(nOpticType & DEFECT_OPTIC_DARK)
   {
@@ -2290,7 +2285,7 @@
   CFileFind finder;
   CString strSearchPath = _T("");

   // Dark, Bright ��� ã�� ���� �ּ�ó�� [2017.7.1 bhs]
   // Dark, Bright 占쏙옙占?찾占쏙옙 占쏙옙占쏙옙 占쌍쇽옙처占쏙옙 [2017.7.1 bhs]
   //if (nOpticType & DEFECT_OPTIC_DARK)
   {
      // Dark field
@@ -2364,7 +2359,7 @@
         processTimer.End();
      }

      // 4-3. ������� ���
      // 4-3. 占쏙옙占쏙옙占쏙옙占?占쏙옙占?
      double dAverageGray = 0.0;
      if (CCHImageProcess::ImageAverage(&bandImage, dAverageGray)==1)
      {
@@ -2471,7 +2466,7 @@
   double dRulerGab = 20.0 / m_dReviewImageScale;
   double dScaleResolution = pReviewResult->dMeasureResolution / m_dReviewImageScale;

   //DrawRuler(&memDC, nTotalWidth, nTotalHeight2, dScaleResolution, dRulerGab); // resolution, ruler gab //taek 210127 ��� X
   //DrawRuler(&memDC, nTotalWidth, nTotalHeight2, dScaleResolution, dRulerGab); // resolution, ruler gab //taek 210127 占쏙옙占?X

   // draw text string
   DrawDefectInfo(&memDC, findResult, pReviewResult);
@@ -2587,7 +2582,7 @@
   int nTotalWidth      = int(m_nReviewResizeWidth * m_dReviewImageScale + 0.5);
   int nTotalHeight   = int(m_nReviewResizeHeight * m_dReviewImageScale + 0.5);

   // Dark, Bright �̹����� ������ �ٵ��� ����, Dark ��, Bright �Ʒ� - ����� ��û[2017.6.30 bhs]
   // Dark, Bright 占싱뱄옙占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙 占쌕듸옙占쏙옙 占쏙옙占쏙옙, Dark 占쏙옙, Bright 占싣뤄옙 - 占쏙옙占쏙옙占?占쏙옙청[2017.6.30 bhs]
   //int nX = nTotalWidth - nWidth;
   //int nY = nTotalHeight - (nHeight * 2);

@@ -2599,7 +2594,7 @@
   //pAoiDark1->ShowImage(pDC->m_hDC,   nTotalWidth - nWidth,   nTotalHei4ght-nHeight,   pAoiDark1->GetWidth(), pAoiDark1->GetHeight(), 0, 0);
   //pAoiBright1->ShowImage(pDC->m_hDC,   nTotalWidth - nWidth,   nTotalHeight-nHeight,   pAoiBright1->GetWidth(), pAoiBright1->GetHeight(), 0, 0);

   // �˻� �̹��� �߾ӿ� ȭ��ǥ ǥ�� - ����� ��û [2017.6.30 bhs]
   // 占싯삼옙 占싱뱄옙占쏙옙 占쌩앙울옙 화占쏙옙표 표占쏙옙 - 占쏙옙占쏙옙占?占쏙옙청 [2017.6.30 bhs]
   CFont Font;
   VERIFY(Font.CreateFont(
      50,                        // nHeight
@@ -2834,7 +2829,7 @@
      }

      //taek 210127
      //������� ��ǥ�� y �� *-1�� ����
      //占쏙옙占쏙옙占쏙옙占?占쏙옙표占쏙옙 y 占쏙옙 *-1占쏙옙 占쏙옙占쏙옙
      //���� ID, �˻� ī�޶� ����, �˻� Camera ���� : (? ) ķ ?, Cell ID,   Review Cam ���� : Gantry ����,   ���� Size,   ���� Zone ����,   Stak Flag, CODE ����, ��ǥ ����
      
      // PPID
@@ -3050,7 +3045,7 @@

   if(GetReviewProcessStatus() == ReviewProcessStatus_ReflowStart)
   {
      // [2017:6:5]-[WEZASW] : Review Image ���ϸ�� '*' ��� ����.(����ó��)
      // [2017:6:5]-[WEZASW] : Review Image 占쏙옙占싹몌옙占?'*' 占쏙옙占?占쏙옙占쏙옙.(占쏙옙占쏙옙처占쏙옙)
      if (pReviewResult->strDefectCode.Compare(_T("***")) == 0)
         strDefectCodeTemp = _T("DC");   
      else 
@@ -3127,7 +3122,7 @@
   //       strFileName += pReviewResult->strSnapTime;
   //    }

   // [2017:4:10]-[WEZASW] : ����� ��û�� ���� bmp ���� �߰� ����. (�ӽû��)
   // [2017:4:10]-[WEZASW] : 占쏙옙占쏙옙占?占쏙옙청占쏙옙 占쏙옙占쏙옙 bmp 占쏙옙占쏙옙 占쌩곤옙 占쏙옙占쏙옙. (占쌈시삼옙占?
   pReviewResult->strOrignalImgFileName = strFileName + _T(".bmp");

   strFileName += _T(".jpg");
@@ -3181,7 +3176,7 @@
      g_pLog->DisplayMessage(_T("[ReviewProcessor]SetWsiResultData module[%d] point[%d] result[%d]"), nModuleIndex, measureResut.nResultIndex, nCurResultIdx);
   }

   // ���� ��������� ����
   // 占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙
   wsiResult.nWsi_ResultCode      = measureResut.nResultCode;
   wsiResult.dWsi_DamDistance      = measureResut.dDamDistance;

@@ -3191,7 +3186,7 @@
   }
   //memcpy(wsiResult.nWsi_pReflowResultData, measureResut.pReflowResultData, sizeof(wsiResult.nWsi_pReflowResultData));
   
   // ��� ������ �߰�
   // 占쏙옙占?占쏙옙占쏙옙占쏙옙 占쌩곤옙
   SReviewResult *pProcessResult = NULL;
   if (pGlassResult->SetWsiReflowResultData(nModuleIndex, nCurResultIdx, wsiResult, nGlassPosX, nGlassPosY, nMotorPosX, nMotorPosY, dTime))
   {
@@ -3219,7 +3214,7 @@

   LeaveCriticalSection(&m_csUserCriticalSection);

   // ��� ����.
   // 占쏙옙占?占쏙옙占쏙옙.
   m_pRP2P->IRP2P_UpdateReviewResult(nModuleIndex, pGlassResult, 5);
   return;

@@ -3245,7 +3240,7 @@
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. - dPosY;

      }
      else if(nCornercut == RPCRightTop)//���
      else if(nCornercut == RPCRightTop)//占쏙옙占?
      {
         nResultPosX = double(GLASS_SIZE_WIDTH)/2. - dPosX;
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. + dPosY;
@@ -3263,7 +3258,7 @@
      }
   }

   else if(nOriginDirection==RPORightTop){//���������
   else if(nOriginDirection==RPORightTop){//占쏙옙占쏙옙占쏙옙占쏙옙占?

      if(nCornercut == RPCLeftTop)//�»� 
      { 
@@ -3271,7 +3266,7 @@
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. + dPosY;

      }
      else if(nCornercut == RPCRightTop)//���
      else if(nCornercut == RPCRightTop)//占쏙옙占?
      {
         nResultPosX = double(GLASS_SIZE_WIDTH)/2. - dPosX;
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. - dPosY;
@@ -3299,7 +3294,7 @@
         nResultPosX = double(GLASS_SIZE_WIDTH) / 2. + dPosX;
         nResultPosY = double(GLASS_SIZE_HEIGHT) / 2. + dPosY;
      }
      else if(nCornercut == RPCRightTop)//���
      else if(nCornercut == RPCRightTop)//占쏙옙占?
      {
         nResultPosX = double(GLASS_SIZE_WIDTH)/2. + dPosX;
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. + dPosY;
@@ -3328,7 +3323,7 @@
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. + dPosY;

      }
      else if(nCornercut == RPCRightTop)//���
      else if(nCornercut == RPCRightTop)//占쏙옙占?
      {
         nResultPosX = double(GLASS_SIZE_WIDTH)/2. + dPosX;
         nResultPosY = double(GLASS_SIZE_HEIGHT)/2. - dPosY;
@@ -3364,7 +3359,7 @@
   CString strFileName = _T("");
   CString strDefectCodeTemp = _T("");

   // [2017:6:5]-[WEZASW] : Review Image ���ϸ�� '*' ��� ����.(����ó��)
   // [2017:6:5]-[WEZASW] : Review Image 占쏙옙占싹몌옙占?'*' 占쏙옙占?占쏙옙占쏙옙.(占쏙옙占쏙옙처占쏙옙)
   if (pReviewResult->strDefectCode.Compare(_T("***")) == 0)
      strDefectCodeTemp = _T("DC");   
   else 
@@ -3428,7 +3423,7 @@
{
   if(pReviewResult == NULL)   return FALSE;

   //������� ���� �޸� ���� �̹��� �̸� �� ��ǥ ä���ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨몌옙 占쏙옙占쏙옙 占싱뱄옙占쏙옙 占싱몌옙 占쏙옙 占쏙옙표 채占쏙옙占쌍깍옙
   CDitGlassRawClient *pDitGlassRawCleint = CDitGlassRawClient::GetInstance();
   if(pDitGlassRawCleint->isConnect() == TRUE)
   {
@@ -3449,10 +3444,10 @@
      strcpy(pSharedGlassData->m_strAlignFirst, m_strReviewFirst.MakeLower());
      strcpy(pSharedGlassData->m_strAlignSecond, m_strReviewSecned.MakeLower());

      pSharedDefectReview->m_nPlanType =  ditRaw::RPT_Review;   //0:None, 1:Location(User, Fiexed) Review, 4:reflower, ??:Wsi, 1000:AOI(�ܺ� ���� ���� ���)			
      pSharedDefectReview->m_nPlanType =  ditRaw::RPT_Review;   //0:None, 1:Location(User, Fiexed) Review, 4:reflower, ??:Wsi, 1000:AOI(占쌤븝옙 占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占?			
      pSharedDefectReview->m_nResultCode = 1;  //0:None, 1:Success
      pSharedDefectReview->m_nShotIndex = pReviewResult->nResultIdx; 
      //pSharedDefectReview->m_nShotIndex = GetPlanReviewCount(); //RTMS ���ؿ� ���� ���� ������ ��� �ƴϸ� ������ �ϴ� �ɷ� taek 210128
      //pSharedDefectReview->m_nShotIndex = GetPlanReviewCount(); //RTMS 占쏙옙占쌔울옙 占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙 占쏙옙占?占싣니몌옙 占쏙옙占쏙옙占쏙옙 占싹댐옙 占심뤄옙 taek 210128
      pSharedDefectReview->m_nModuleIndex = pReviewResult->nModuleIdx;
      pSharedDefectReview->m_nMagnificIndex = 20;
      pSharedDefectReview->m_fManification =pReviewResult->dMagnification;
@@ -3466,7 +3461,7 @@

BOOL CReviewProcessor_CPJT::UpdateMemoryUserPlan( SReviewResult* pReviewResult )
{
   //������� ���� �޸� ���� �̹��� �̸� �� ��ǥ ä���ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨몌옙 占쏙옙占쏙옙 占싱뱄옙占쏙옙 占싱몌옙 占쏙옙 占쏙옙표 채占쏙옙占쌍깍옙
   CDitGlassRawClient *pDitRawClient = CDitGlassRawClient::GetInstance();
   if(pDitRawClient->isConnect() == TRUE)
   {
@@ -3483,7 +3478,7 @@
      
      strcpy(pSharedDefectReview->m_strRevImageName,pReviewResult->strImgFileName);
   
      pSharedDefectReview->m_nPlanType = ditRaw::RPT_User;   //0:None, 1:Location(User, Fiexed) Review, 4:reflower, ??:Wsi, 1000:AOI(�ܺ� ���� ���� ���)			
      pSharedDefectReview->m_nPlanType = ditRaw::RPT_User;   //0:None, 1:Location(User, Fiexed) Review, 4:reflower, ??:Wsi, 1000:AOI(占쌤븝옙 占쏙옙占쏙옙 占쏙옙占쏙옙 占쏙옙占?			
      pSharedDefectReview->m_nResultCode = 1;  //0:None, 1:Success
      pSharedDefectReview->m_nShotIndex = pReviewResult->nResultIdx; 
      pSharedDefect->m_nShotIdx = pReviewResult->nResultIdx;
@@ -3502,7 +3497,7 @@
BOOL CReviewProcessor_CPJT::UpdateMemoryReflowPlan( SReviewResult* pReviewResult )
{
   if(pReviewResult == NULL)   return FALSE;
   //������� ���� �޸𸮿� ��� ä�� �ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨모리울옙 占쏙옙占?채占쏙옙 占쌍깍옙
   CDitGlassRawClient *pDitRawClient = CDitGlassRawClient::GetInstance();
   //int nEqpID = m_pSP2P->ISP2P_System_GetSystemInfo()->m_nMachineType;
   CString strCellID = _T("");
@@ -3524,7 +3519,7 @@
            nReflowjuge=1;
         }

         // ����� ��û���� ������. 0,1 Position�� Pass
         // 占쏙옙占쏙옙占?占쏙옙청占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙. 0,1 Position占쏙옙 Pass
         else if(nReflowjuge == 3 || nReflowjuge == 2)
         {
            m_pRP2P->IRP2P_DisplayMessage(_T("[ReflowResult] Reflow Judge Is No OverFlow %d"),nReflowjuge);
@@ -3589,7 +3584,7 @@
{
   if(pReviewResult == NULL)   return FALSE;

   //������� ���� �޸𸮿� ��� ä�� �ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨모리울옙 占쏙옙占?채占쏙옙 占쌍깍옙
   CDitGlassRawClient *pDitGlassRawClient = CDitGlassRawClient::GetInstance();

   if(pDitGlassRawClient->isConnect() == TRUE)
@@ -3631,7 +3626,7 @@
BOOL CReviewProcessor_CPJT::UpdateMemoryWsiReflowPlan( SReviewResult* pReviewResult )
{
   if(pReviewResult == NULL)   return FALSE;
   //������� ���� �޸𸮿� ��� ä�� �ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨모리울옙 占쏙옙占?채占쏙옙 占쌍깍옙
   CDitGlassRawClient *pDitRawClient = CDitGlassRawClient::GetInstance();
   

@@ -3645,12 +3640,12 @@

   /*
   pPacket->GetInt(0)         = Index
   pPacket->GetInt(1)         = Wsi ���� ���
   pPacket->GetInt(2)         = A�� ���� ��� (1 ���� 0 ����)
   pPacket->GetInt(3)          = B�� ���� ���
   pPacket->GetInt(4)          = C�� ���� ���
   pPacket->GetInt(5)          = D�� ���� ���
   pPacket->GetInt(6)          = Review���� ������� PointIndex
   pPacket->GetInt(1)         = Wsi 占쏙옙占쏙옙 占쏙옙占?
   pPacket->GetInt(2)         = A占쏙옙 占쏙옙占쏙옙 占쏙옙占?(1 占쏙옙占쏙옙 0 占쏙옙占쏙옙)
   pPacket->GetInt(3)          = B占쏙옙 占쏙옙占쏙옙 占쏙옙占?
   pPacket->GetInt(4)          = C占쏙옙 占쏙옙占쏙옙 占쏙옙占?
   pPacket->GetInt(5)          = D占쏙옙 占쏙옙占쏙옙 占쏙옙占?
   pPacket->GetInt(6)          = Review占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙占?PointIndex
   pPacket->GetDouble(0)       = �￡�� Monomo������ �Ÿ�
   */
   
@@ -3662,7 +3657,7 @@
   
   nWsiReflowJudge  = pReviewResult->nWsi_ResultCode;

   //nWsiReflowResult += pReviewResult->nWsi_pReflowResultData[0] //A 1�� �Ű�Ⱦ� 
   //nWsiReflowResult += pReviewResult->nWsi_pReflowResultData[0] //A 1占쏙옙 占신곤옙횡占?
   nWsiReflowResult += pReviewResult->nWsi_pReflowResultData[1];//B
   nWsiReflowResult += pReviewResult->nWsi_pReflowResultData[2];//C
   //nWsiReflowResult += pReviewResult->nWsi_pReflowResultData[3];//D
@@ -3722,7 +3717,7 @@
{
   if(pReviewResult == NULL)   return FALSE;

   //������� ���� �޸𸮿� ��� ä�� �ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨모리울옙 占쏙옙占?채占쏙옙 占쌍깍옙
   CDitGlassRawClient *pDitGlassRawClient = CDitGlassRawClient::GetInstance();

   if(pDitGlassRawClient->isConnect() == TRUE)
@@ -3757,7 +3752,7 @@
{
   if (pReviewResult == NULL)   return FALSE;

   //������� ���� �޸𸮿� ��� ä�� �ֱ�
   //占쏙옙占쏙옙占쏙옙占?占쏙옙占쏙옙 占쌨모리울옙 占쏙옙占?채占쏙옙 占쌍깍옙
   CDitGlassRawClient *pDitGlassRawClient = CDitGlassRawClient::GetInstance();

   if (pDitGlassRawClient->isConnect() == TRUE)