Merge branch 'master' into LWQ

LWQ

2025-07-24 dc5497d482727accd3fbcfa77db52b99f2e9eb0e

 ENRIT/MainFrm.cpp

@@ -683,8 +683,7 @@

      SetSlashText(GLOBAL_DEFINE::emText, _T("Image Loading Start"), RGB(0,0,0));

      if(iSide > -1)
      {
      if(iSide > -1) {

         CString strGlsID, strTmp , strExt;

@@ -698,40 +697,36 @@

         char str_filename[200];

         for(int i = 0 ; i < 6 ; i++)
         {
         for(int i = 0 ; i < 6 ; i++) {
            strPath.Format(_T("%s\\%s__%s_%d.%s"),strTmp,strGlsID,PANEL_SIDE[iSide],i,strExt);
            USES_CONVERSION;               
            sprintf_s(str_filename, "%s", W2A(strPath));
            if(access(str_filename, 0) == 0)
            {
               nHeight = LoadFullImage(strPath,iSide,nStartY);
               if(nHeight == -1)
            if(access(str_filename, 0) == 0) {
               nHeight = LoadFullImage(strPath, iSide, nStartY);
               if (nHeight == -1) {
                  break;
               }

               nStartY += nHeight;
            }
            else
            else {
               break;
            }
         }

         if(pGlassData != NULL)
         {
         if(pGlassData != NULL) {
            INS_EDGE_RESULT_INFO *pResInfo = pGlassData->GetEdgeResultInfo((DimensionDir)iSide);
            if(pResInfo != NULL)
            {
            if(pResInfo != NULL) {
               pResInfo->nGlassStartLine = 0;
               pResInfo->nGlassEndLine = nStartY;
            }

         }

         if(_Func != nullptr)
         {
         if(_Func != nullptr) {
            _Func(iSide);
         }         
      }
      else
      {
      else {

         CString strGlsID, strTmp , strExt;

@@ -741,42 +736,38 @@
         g_pBase->m_strHPanelID = strGlsID;

         char str_filename[200];
         for(int i = 0; i < MAX_PANEL_SIDE * UPDN_TYPE; i++)
         {
         for(int i = 0; i < MAX_PANEL_SIDE * UPDN_TYPE; i++) {
            strTmp = dlg.GetPathName();
            strTmp = strTmp.Left( strTmp.ReverseFind(_T('\\')));

            nStartY = 0, nHeight = 0;

            for(int j = 0 ; j < 6 ; j++)
            {
               strPath.Format(_T("%s\\%s__%s_%d.%s"),strTmp,strGlsID,PANEL_SIDE[i],j,strExt);
            for(int j = 0 ; j < 6 ; j++) {
               strPath.Format(_T("%s\\%s__%s_%d.%s"), strTmp, strGlsID, PANEL_SIDE[i], j, strExt);

               USES_CONVERSION;               
               sprintf_s(str_filename, "%s", W2A(strPath));
               if(access(str_filename, 0) == 0)
               {
               if(access(str_filename, 0) == 0) {
                  nHeight = LoadFullImage(strPath,i,nStartY);
                  if(nHeight == -1)
                  if (nHeight == -1) {
                     break;
                  }

                  nStartY += nHeight;
               }               
               else
               else {
                  break;
               }
            }

            if(pGlassData != NULL)
            {
            if(pGlassData != NULL) {
               INS_EDGE_RESULT_INFO *pResInfo = pGlassData->GetEdgeResultInfo((DimensionDir)i);
               if(pResInfo != NULL)
               {
               if(pResInfo != NULL) {
                  pResInfo->nGlassStartLine = 0;
                  pResInfo->nGlassEndLine = nStartY;
               }

            }
            if(_Func != nullptr)
            {					
            if(_Func != nullptr) {					
               _Func(i);
            }
         }