1.修复：区分测量精度及研磨量距离单像素精度功能 2.修改：上传到CIM的数据

LWQ

2025-07-30 daf053dfd30a3c20524d92290be9d3dc2ac599ec

1.修复：区分测量精度及研磨量距离单像素精度功能
2.修改：上传到CIM的数据

 ENRIT/Data/Glass_Data.h

@@ -106,6 +106,7 @@
    short                    nProfileData[MAX_PROFILE_SETTING_COUNT];
    short                    nChamferUp[MAX_PROFILE_SETTING_COUNT];
    short                    nChamferDn[MAX_PROFILE_SETTING_COUNT];
	

    _INS_PROFILE_RESULT_INFO()
    {
@@ -116,6 +117,7 @@
        ZeroMemory(nProfileData,sizeof(short)*MAX_PROFILE_SETTING_COUNT);
        ZeroMemory(nChamferUp,sizeof(short)*MAX_PROFILE_SETTING_COUNT);
        ZeroMemory(nChamferDn,sizeof(short)*MAX_PROFILE_SETTING_COUNT);

    }
} INS_PROFILE_RESULT_INFO, *pINS_PROFILE_RESULT_INFO;


 ENRIT/Define/InspectionBase.cpp

@@ -107,7 +107,7 @@
    m_nFrameDefectPixel    = 14000;
    m_nMaxDefect        = 1000;        
    m_eProcessMode        = 0;
    m_nStageNo            = 0;
    m_nStageNo            = 1;

    if(m_pFrameWidth != NULL)
        delete[] m_pFrameWidth, m_pFrameWidth=NULL;

 ENRIT/InterfaceManager.cpp

@@ -838,13 +838,63 @@
    g_pLog->DisplayMessage(_T("write PLC Result Data : Resut %d,1_L_Theat %d,1_S_Theat %d,2_L_Theat %d,2_S_Theat %d,pResult[10]:%d"),pResult[0],pResult[1],pResult[2],pResult[3],pResult[4], pResult[10]);

    INS_PROFILE_RESULT_INFO *pProfileResult = m_GlassData.GetProfileResultInfo();

	
    for(int i=0;i<MAX_PROFILE_SETTING_COUNT;i++)
    {
        pProfileResult->nProfileData[i] = pHistory.nProfileDiff[i];
        /*pProfileResult->nProfileData[i] = pHistory.nProfileDiff[i];
        pProfileResult->nChamferUp[i] = pHistory.nChamferThickUp[i];
        pProfileResult->nChamferDn[i] = pHistory.nChamferThickDn[i];
        pProfileResult->nChamferDn[i] = pHistory.nChamferThickDn[i];*/
        //上报测量精度及研磨量数据到CIM
        if (i<10)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[1];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[1];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[1];
        }
        if (i<23&&i>=10)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[2];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[2];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[2];
        }if (i<33&&i>=23)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[3];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[3];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[3];
        }if (i<46&&i>=33)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[0];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[0];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[0];
        }if (i<59&&i>=46)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[4];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[4];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[4];
        }
        if (i<64&&i>=59)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[5];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[5];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[5];
        }if (i<69&&i>=64)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[7];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[7];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[7];
        }if (i<74&&i>=69)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[6];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[6];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[6];
        }if (i<79&&i>=74)
        {
            pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[8];
            pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[8];
            pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[8];
        }
    }
	

    m_pControlInterface->SendCIMData((short*)pProfileResult,PLC_ADDR_PROFILE_JUDEMENT,MAX_PROFILE_SETTING_COUNT*3);


 ENRIT/View/DlgCoordinateConvert.cpp

@@ -132,10 +132,10 @@
        str.Format(_T("%.10f"), profile.m_dConvResolution[i][0]);
        m_gridCameraList.SetItemText(iRow, 1, str);

        str.Format(_T("%.10f"), profile.m_dConvResolution[i][1]);
        str.Format(_T("%.10f"), profile.m_dScanResolution[i][0]);
        m_gridCameraList.SetItemText(iRow, 2, str);

        str.Format(_T("%.10f"), profile.m_dScanResolution[i][0]);
        str.Format(_T("%.10f"), profile.m_dConvResolution[i][1]);
        m_gridCameraList.SetItemText(iRow, 3, str);

        str.Format(_T("%.10f"), profile.m_dScanResolution[i][1]);
@@ -191,10 +191,10 @@
            m_pDlgRecipe->m_ProfilePrm.m_dConvResolution[i][0] = _tstof(strVal);

            strVal = m_gridCameraList.GetItemText(iRow, 2);
            m_pDlgRecipe->m_ProfilePrm.m_dConvResolution[i][1] = _tstof(strVal);
            m_pDlgRecipe->m_ProfilePrm.m_dScanResolution[i][0] = _tstof(strVal);

            strVal = m_gridCameraList.GetItemText(iRow, 3);
            m_pDlgRecipe->m_ProfilePrm.m_dScanResolution[i][0] = _tstof(strVal);
            m_pDlgRecipe->m_ProfilePrm.m_dConvResolution[i][1] = _tstof(strVal);

            strVal = m_gridCameraList.GetItemText(iRow, 4);
            m_pDlgRecipe->m_ProfilePrm.m_dScanResolution[i][1] = _tstof(strVal);