From f8ad0695ff2431cb90640be52b523d6434bdbf83 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 22 八月 2025 15:48:03 +0800
Subject: [PATCH] Merge branch 'LWQ' into liuyang
---
EdgeInspector_App/MainFrm.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/EdgeInspector_App/MainFrm.cpp b/EdgeInspector_App/MainFrm.cpp
index 9589286..9ffc2e9 100644
--- a/EdgeInspector_App/MainFrm.cpp
+++ b/EdgeInspector_App/MainFrm.cpp
@@ -1,5 +1,5 @@
-
-// MainFrm.cpp : CMainFrame 努贰胶狼 备泅
+锘�
+// MainFrm.cpp : CMainFrame 鍔窗鑳剁嫾 澶囨硡
//
#include "stdafx.h"
@@ -29,7 +29,7 @@
ON_WM_GETMINMAXINFO()
END_MESSAGE_MAP()
-// CMainFrame 积己/家戈
+// CMainFrame 绉繁/瀹舵垐
CMainFrame::CMainFrame()
{
@@ -77,10 +77,10 @@
return TRUE;
}
-// CMainFrame 皋矫瘤 贸府扁
+// CMainFrame 鐨嬬煫鐦� 璐稿簻鎵�
void CMainFrame::OnGetMinMaxInfo(MINMAXINFO* lpMMI)
{
- // TODO: 咯扁俊 皋矫瘤 贸府扁 内靛甫 眠啊 棺/肚绰 扁夯蔼阑 龋免钦聪促.
+ // TODO: 鍜墎淇� 鐨嬬煫鐦� 璐稿簻鎵� 鍐呴潧鐢� 鐪犲晩 妫�/鑲氱话 鎵佸く钄奸槕 榫嬪厤閽﹁仾淇�.
//CFrameWndEx::OnGetMinMaxInfo(lpMMI);
lpMMI->ptMinTrackSize.x = TOTAL_WINDOW_SIZE_X;
@@ -90,7 +90,7 @@
lpMMI->ptMaxTrackSize.y = TOTAL_WINDOW_SIZE_Y;
}
-// CMainFrame 柳窜
+// CMainFrame 鏌崇獪
#ifdef _DEBUG
void CMainFrame::AssertValid() const
@@ -105,7 +105,7 @@
#endif //_DEBUG
-// CMainFrame 皋矫瘤 贸府扁
+// CMainFrame 鐨嬬煫鐦� 璐稿簻鎵�
void CMainFrame::SetView(CEdgeInspector_AppView *pView)
{
m_pView = pView;
@@ -200,7 +200,7 @@
if (PathFileExists(strExePath) && PathFileExists(strConfigPath)) {
LPCTSTR pszExeName = PathFindFileName(strExePath);
- // 去掉 .exe，并杀死进程
+ // 鍘绘帀 .exe锛屽苟鏉�姝昏繘绋�
TCHAR szNameWithoutExt[MAX_PATH] = { 0 };
_tcscpy_s(szNameWithoutExt, pszExeName);
PathRemoveExtension(szNameWithoutExt);
@@ -220,7 +220,7 @@
if (PathFileExists(strExePath) && PathFileExists(strConfigPath)) {
LPCTSTR pszExeName = PathFindFileName(strExePath);
- // 去掉 .exe，并杀死进程
+ // 鍘绘帀 .exe锛屽苟鏉�姝昏繘绋�
TCHAR szNameWithoutExt[MAX_PATH] = { 0 };
_tcscpy_s(szNameWithoutExt, pszExeName);
PathRemoveExtension(szNameWithoutExt);
@@ -307,7 +307,7 @@
{
m_strReserveRecipe.Empty();
- if(!IsScanNow()) // 八荤 吝
+ if(!IsScanNow()) // 鍏崵 鍚�
{
if(LoadGlassRecipe(strRecipe,TRUE) == TRUE)
{
@@ -510,7 +510,7 @@
g_pBase->m_eProcessMode = PROC_MODE_SIMULATION_ONESIDE;
m_eManualInspectSide = eDim;
- // 烙矫肺 阜澜
+ // 鐑欑煫鑲� 闃滄緶
//return TRUE;
AfxBeginThread(ManualInspectProcess,this);
--
Gitblit v1.9.3