1. 修复RIP新增配方闪退的问题 2. 完善RIP结果绘画在视图窗口

mrDarker

2025-08-14 4fb0f6c9b7b0fdfc6cc52c9bf1153d87f92651ca

 EdgeInspector_App/View/ViewMain_HWSetting.cpp

@@ -373,7 +373,7 @@
   int         iCam,iScan,i;
   int         iRow,iCol;
   CString      str;      
   const   TCHAR* SET_CAMERA_DIR[] = {_T("Top"),_T("Bottom")};
   const   TCHAR* SET_CAMERA_DIR[] = {_T("Top"),_T("Bottom"),_T("Side") };
   const   TCHAR* SET_INS_DIR[] = {_T("Long"),_T("Short")};   
   const TCHAR* SET_INS_DIMENSION[] = {
      _T("A Top"), _T("B Top"), _T("C Top"), _T("D Top"),
@@ -384,15 +384,16 @@
   CStringArray   arrDir,arrInsDir,arrDimension;
   CGridCellCombo *pCell;      
   
   for(i=0;i<2;i++)
   {
      arrDir.Add(SET_CAMERA_DIR[i]);		
      arrInsDir.Add(SET_INS_DIR[i]);		
   }	
   for(i=0;i<12;i++)
   {
      arrDimension.Add(SET_INS_DIMENSION[i]);				
   }	
   for (i = 0; i < 3; i++) {
      arrDir.Add(SET_CAMERA_DIR[i]);
   }

   for (i = 0; i < 2; i++) {
      arrInsDir.Add(SET_INS_DIR[i]);
   }
   for (i = 0; i < 12; i++) {
      arrDimension.Add(SET_INS_DIMENSION[i]);
   }
   
   if(bWrite == TRUE)
   {
@@ -422,7 +423,8 @@
            switch(pCamera->m_enCamDir)
            {
            case CAMDIR_TOP: str.Format(_T("%s"),SET_CAMERA_DIR[0]); break;
            case CAMDIR_BOTTOM: str.Format(_T("%s"),SET_CAMERA_DIR[1]); break;				
            case CAMDIR_BOTTOM: str.Format(_T("%s"),SET_CAMERA_DIR[1]); break;
            case CAMDIR_SIDE: str.Format(_T("%s"), SET_CAMERA_DIR[2]); break;
            default: str.Format(_T("%s"),_T("No")); break;
            }         
            m_CameraGrid.SetItemText(iRow,iCol,str);   
@@ -669,23 +671,19 @@

void CViewMain_HWSetting::UpdateControlValue(BOOL bWrite)
{
   if(bWrite == TRUE)
   {
   if(bWrite == TRUE) {
      UpdateData(FALSE);
      FillLightGrid(TRUE);
      FillCameraGrid(TRUE);

      ((CComboBox*)(GetDlgItem(IDC_COMBO_BORAD_TYPE)))->SetCurSel((int)m_pDlgHDSettingParm->m_nBoardType);      
   }
   else
   {
   else {
      UpdateData(TRUE);
      FillLightGrid(FALSE);
      FillCameraGrid(FALSE);
      if(m_pHDSetting != NULL)
      {
      if(m_pHDSetting != NULL) {
         m_pDlgHDSettingParm->m_nBoardType = (BOARD_TYPE)((CComboBox*)(GetDlgItem(IDC_COMBO_BORAD_TYPE)))->GetCurSel();

         *m_pHDSetting = *m_pDlgHDSettingParm;
      }
   }
@@ -721,40 +719,30 @@
   CreateDirectory(_T("C:\\EdgeInspector_App\\Config"),NULL);
   CreateDirectory(_T("C:\\EdgeInspector_App\\Config\\Backup"),NULL);

   CTime currentTime = CTime::GetCurrentTime();
	
   CString   str;

   str.Format(_T("%s\\HardwareSetting_%02d%02d%02d_%02d%02d%02d.cfg"), HARDWARE_SETTING_BACKUP_DIR_PATH
                                                      , currentTime.GetYear()
                                                      , currentTime.GetMonth()
                                                      , currentTime.GetDay()
                                                      , currentTime.GetHour()
                                                      , currentTime.GetMinute()
                                                      , currentTime.GetSecond());
   CTime time = CTime::GetCurrentTime();
   str.Format(_T("%s\\HardwareSetting_%02d%02d%02d_%02d%02d%02d.cfg"), HARDWARE_SETTING_BACKUP_DIR_PATH, time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());

   UpdateControlValue(FALSE);   
   if(m_pHDSetting->WriteHardwareSettingsFile(str) == FALSE)
   {
   if(m_pHDSetting->WriteHardwareSettingsFile(str) == FALSE) {
      AfxMessageBox(_T("Save Fail!"));
   }
}

void CViewMain_HWSetting::ClickHWSaveButton()
{
   if(m_pHDSetting == NULL)
   if (m_pHDSetting == NULL) {
      return;
   }

   if (IDYES == AfxMessageBox(_T("Do you want to save? \n Restarting is required to change settings."), MB_YESNO | MB_ICONQUESTION))
   {
   if (IDYES == AfxMessageBox(_T("Do you want to save? \n Restarting is required to change settings."), MB_YESNO | MB_ICONQUESTION)) {
      UpdateControlValue(FALSE);
		
      if(m_pHDSetting->WriteHardwareSettingsFile(HARDWARE_SETTING_PATH) == FALSE)// if(m_pHDSetting->WriteHardwareSettingsRegistry() == FALSE)
      {
         AfxMessageBox(_T("Save Fail!"));
      g_pLog->DisplayMessage(_T("Saving HW settings file[%s]..."), HARDWARE_SETTING_PATH);
      if (m_pHDSetting->WriteHardwareSettingsFile(HARDWARE_SETTING_PATH) == FALSE) {
         g_pLog->DisplayMessage(_T("Failed to save hardware settings file!"));
         return;
      }
      SaveHardwareFileBackup();		
      SaveHardwareFileBackup();
   }
}