From c94029abf4a79c26dbd0cfa86aae18a2712acf26 Mon Sep 17 00:00:00 2001 From: masayume <1936714878@qq.com> Date: Wed, 22 Dec 2021 09:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E7=AC=A6=E4=B9=B1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HuaGoCorrect/A3.cpp | 2 +- HuaGoCorrect/HuaGoCorrect.aps | Bin 108508 -> 129792 bytes HuaGoCorrect/HuaGoCorrect.rc | Bin 39416 -> 39172 bytes HuaGoCorrect/HuaGoCorrectDlg.cpp | 143 ++++++++++++++++--------------- 4 files changed, 75 insertions(+), 70 deletions(-) diff --git a/HuaGoCorrect/A3.cpp b/HuaGoCorrect/A3.cpp index b3b2391..e3accd9 100644 --- a/HuaGoCorrect/A3.cpp +++ b/HuaGoCorrect/A3.cpp @@ -317,7 +317,7 @@ void CA3::updatespeedmode(bool get) { if ((parent->m_drv->PID == 0x0400) && (i < 12)) continue; - int startindex = parent->m_drv->PID == 0x0300 ? 6 : 10; + int startindex = parent->m_drv->PID == 0x0300 ? 7: 11; m_cmbSpeedmode.SetCurSel(startindex+ speedmode); bfound = true; break; diff --git a/HuaGoCorrect/HuaGoCorrect.aps b/HuaGoCorrect/HuaGoCorrect.aps index b964a231a1a47887dd03e3d04f651180baaa7b1b..83e34458d2660a7cb3e3720c4d99ce70aaa79625 100644 GIT binary patch delta 14331 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 delta 2264 zcmb7Fe@v8R9RGf}15P>dP=Vt>6Q^*7;z@$baG@jAWO)Q?jt!X!A}(fD%9asgYb>3T zFY(mo7&$anthAih77KB?bSRukhzAnj&l*`OpkvkB_j%tt1^tJf?R~$$KHneD_x(Q4 zTRIfj)f!NdYA8PhC1l-76HyQmEgd1e6M?3a>r^xL0alT59(hO< z+2=5K9NU~`eko$`JevGeReaxq8IpFjAVyMSD-KBdX)Bg$`c_1O#KTrpYic)={D_3x zjW8+Sc4LuErt~d8=QoJus!XKv63G`(l;*P$1#QZ z79-3XLsiRYT*Yr2gynZk8Fw1V_>6)nNkrd7xWR=y5qlAF$QPLx5sM7*?nQ`6GItrB z*oIu2s>c>HFX51(8au?mXa6M<|{=AHkRnvD2|b2VM%(gFaJnBqzFX;`&FMnR5k2Hr@8) zp1^f0xJbv^l(moS$FCqp3mcJ&!<4}NT5TlmcqzGdw`aB zUY7JHk3I_h9;5~8NtTJb9)t^LC!Upvot;S2kewRR)!&IDkc!Hyx@*JL5w1;F*>!ri z?wa1MyHdi7=@72y8y;r%tJiRqup}t3-Q#VsDJW+?6dv*9<67KK{$-O$9 zV`$^e?lw`~3zMvpV_3yWMve+({)Z0o$M+5{N7Edq^x*|87tTKHpO9jqM3{Yu{ys#G zPnk#ak;DBB6`!{wY!X9OJc7s>bc(xu2t$f+Uc*WbbnqHBa1B-0_3hiQBS7n%;|8|L z+G=kgo~f(t28yJ?m3j;IAeh7(_xRW^;xDJF{`_nvBOmp05po}s{aZk^NGuuPK})`m zy%F14mdl?%x|gLu<`YEkeaseN1F#@h^3h`70LOL?pxB9C4T2%|gi-QOijzJjzhu5yhUSqE;c@Q6bTp0zwW5<5YjIS~f z&E$fY(^^`}R8`ONo5;bf<2y`Sa=hg-niOZjN8@!t6T1rI71QQ#N2`jJghK0+s#Arw z(W+YIc-8{tX4W*NW=r^Yk*jk;a6-A0Z&eQDXX6LvcHpEYmu$+$X~nbYRX9Y`Ai|BZ zG|@GPIRWx+KcnC6%9_SW0r@POpxyN%=>cE9wVIINXEi9*O}3cZyrUYv-&NJXkG?&N zMb3!6Zu1<}nU(nF$XU!C4fY{pzRa55XBMMD>68+~lT57gNq#di!57+yGl_ z0oNL3f_IA(p29Y;rq&D**Nlkw9lXoZ2@)(%%SH|C7|{dTg8KREbZ~vDY7y!XLIdP9 znihx|!&qu}CSlB{aEizs=0jCEMi+S$R}CXHu4Bv&yEF%T)WR_qb#53|L&`#k>_Oi3 iW&YC~WntnFrUuH>Sic8~$eJpgLogZ&_CxtIYwCYLSM4_d diff --git a/HuaGoCorrect/HuaGoCorrect.rc b/HuaGoCorrect/HuaGoCorrect.rc index b89ddb1b0d56aabc0a0606de8e6495d944814887..0ed5d09e08e9677639ababbe7e1376269bf7d6a3 100644 GIT binary patch delta 117 zcmeydnW<$H(*_3-UULQohStCr6FiD^(v>E^)o|V1C-Ovf@&qlO$qhP6lM6IiHXpM3 zCOi2>EJ#3YGDoD>};`KoKCQphv N1=Xgsc|~l14FJ}!FZ=)i delta 150 zcmZqK#Pnk`(*_3-PBR7thMYi;BBjY6HC!h*)Ou~cBQi^M@{CBi$^YbdChLhQZC+ya zOLp=DIV})p@|g%fBuTZ&K9R2`v#DuKwsX~+To7e9SwNd@@)ao=ux0}_rO9`q%)s(; Y(K#q`AhUKvp97nFPC;e!wirJf0L7&^=>Px# diff --git a/HuaGoCorrect/HuaGoCorrectDlg.cpp b/HuaGoCorrect/HuaGoCorrectDlg.cpp index 0409839..bf26f4f 100644 --- a/HuaGoCorrect/HuaGoCorrectDlg.cpp +++ b/HuaGoCorrect/HuaGoCorrectDlg.cpp @@ -1,5 +1,5 @@ -// HuaGoCorrectDlg.cpp : ʵ���ļ� +// HuaGoCorrectDlg.cpp : ʵÏÖÎļþ // #include "stdafx.h" @@ -20,25 +20,25 @@ using namespace std; #define new DEBUG_NEW #endif -#define N_TIME_SEC 1000 //һ��ʱ���� -#define N_TIME_SHOW 300 //0.2sˢ����ʾ +#define N_TIME_SEC 1000 //Ò»Ãëʱ¼ä¼ä¸ô +#define N_TIME_SHOW 300 //0.2sË¢ÐÂÏÔʾ #define N_TIMER_SEC 1 #define N_TIMER_SHOW 2 -// ����Ӧ�ó��ò¡°¹ï¿½ï¿½Ú¡ï¿½ï¿½Ëµï¿½ï¿½ï¿½ï¿½ CAboutDlg �Ի��� +// ÓÃÓÚÓ¦ÓóÌÐò¡°¹ØÓÚ¡±²Ëµ¥ÏîµÄ CAboutDlg ¶Ô»°¿ò class CAboutDlg : public CDialogEx { public: CAboutDlg(); - // �Ի������� + // ¶Ô»°¿òÊý¾Ý enum { IDD = IDD_ABOUTBOX }; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV ֧�� + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV Ö§³Ö -// ʵ�� +// ʵÏÖ protected: DECLARE_MESSAGE_MAP() }; @@ -56,7 +56,7 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialogEx) END_MESSAGE_MAP() -// CHuaGoCorrectDlg �Ի��� +// CHuaGoCorrectDlg ¶Ô»°¿ò CHuaGoCorrectDlg::CHuaGoCorrectDlg(CWnd* pParent /*=NULL*/) : CDialogEx(CHuaGoCorrectDlg::IDD, pParent) @@ -110,13 +110,13 @@ BEGIN_MESSAGE_MAP(CHuaGoCorrectDlg, CDialogEx) END_MESSAGE_MAP() -// CHuaGoCorrectDlg ��Ϣ�������� +// CHuaGoCorrectDlg ÏûÏ¢´¦Àí³ÌÐò BOOL CHuaGoCorrectDlg::OnInitDialog() { CDialogEx::OnInitDialog(); - // ��������...���˵������ӵ�ϵͳ�˵��С� - // IDM_ABOUTBOX ������ϵͳ���Χ�ڡ� + // ½«¡°¹ØÓÚ...¡±²Ëµ¥ÏîÌí¼Óµ½ÏµÍ³²Ëµ¥ÖС£ + // IDM_ABOUTBOX ±ØÐëÔÚϵͳÃüÁΧÄÚ¡£ ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); ASSERT(IDM_ABOUTBOX < 0xF000); CMenu* pSysMenu = GetSystemMenu(FALSE); @@ -133,17 +133,17 @@ BOOL CHuaGoCorrectDlg::OnInitDialog() } } - // ���ô˶Ի����ͼ�ꡣ��Ӧ�ó��������ڲ��ǶԻ���ʱ����ܽ��Զ� - // ִ�д˲��� - SetIcon(m_hIcon, TRUE); // ���ô�ͼ�� - SetIcon(m_hIcon, FALSE); // ����Сͼ�� + // ÉèÖô˶Ի°¿òµÄͼ±ê¡£µ±Ó¦ÓóÌÐòÖ÷´°¿Ú²»ÊǶԻ°¿òʱ£¬¿ò¼Ü½«×Ô¶¯ + // Ö´Ðд˲Ù×÷ + SetIcon(m_hIcon, TRUE); // ÉèÖôóͼ±ê + SetIcon(m_hIcon, FALSE); // ÉèÖÃСͼ±ê - // TODO: �ڴ����Ӷ���ij�ʼ������ - m_tab.InsertItem(0, _T("��������")); - m_tab.InsertItem(1, _T("��ʾͼ��")); - m_tab.InsertItem(2, _T("CIS����")); - m_A4Dlg.Create(IDD_A4_DIALOG, &m_tab); // �����ڶ�����ǩҳ - m_VisonDlg.Create(IDD_VISION_DIALOG, &m_tab); //������������ǩҳ + // TODO: ÔÚ´ËÌí¼Ó¶îÍâµÄ³õʼ»¯´úÂë + m_tab.InsertItem(0, _T("²ÎÊýÉèÖÃ")); + m_tab.InsertItem(1, _T("ÏÔʾͼÏñ")); + m_tab.InsertItem(2, _T("CISÉèÖÃ")); + m_A4Dlg.Create(IDD_A4_DIALOG, &m_tab); // ´´½¨µÚ¶þ¸ö±êÇ©Ò³ + m_VisonDlg.Create(IDD_VISION_DIALOG, &m_tab); //´´½¨µÚÈý¸ö±êÇ©Ò³ m_A3dlg.Create(IDD_A3_DIALOG, &m_tab); m_A4Dlg.SetParent(this); m_VisonDlg.SetParent(this); @@ -163,18 +163,18 @@ BOOL CHuaGoCorrectDlg::OnInitDialog() }; m_VisonDlg.SetCallBack(callback); - m_tab.GetClientRect(&tabRect); // ��ȡ��ǩ�ؼ��ͻ���Rect - // ����tabRect��ʹ�串�Ƿ�Χ�ʺϷ��ñ�ǩҳ + m_tab.GetClientRect(&tabRect); // »ñÈ¡±êÇ©¿Ø¼þ¿Í»§ÇøRect + // µ÷ÕûtabRect£¬Ê¹Æ串¸Ç·¶Î§ÊʺϷÅÖñêÇ©Ò³ tabRect.left += 0; tabRect.right -= 0; tabRect.top += 100; tabRect.bottom -= 50; - // ���ݵ����õ�tabRect����m_A3Dlg�ӶԻ��ò£¬²ï¿½ï¿½ï¿½ï¿½ï¿½Îªï¿½ï¿½Ê¾ + // ¸ù¾Ýµ÷ÕûºÃµÄtabRect·ÅÖÃm_A3Dlg×Ó¶Ô»°¿ò£¬²¢ÉèÖÃΪÏÔʾ m_A3dlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_HIDEWINDOW); - // ���ݵ����õ�tabRect����m_A4Dlg�ӶԻ��ò£¬²ï¿½ï¿½ï¿½ï¿½ï¿½Îªï¿½ï¿½ï¿½ï¿½ + // ¸ù¾Ýµ÷ÕûºÃµÄtabRect·ÅÖÃm_A4Dlg×Ó¶Ô»°¿ò£¬²¢ÉèÖÃΪÒþ²Ø m_A4Dlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_SHOWWINDOW); - // ���ݵ����õ�tabRect����m_VisonDlg�ӶԻ��ò£¬²ï¿½ï¿½ï¿½ï¿½ï¿½Îªï¿½ï¿½ï¿½ï¿½ + // ¸ù¾Ýµ÷ÕûºÃµÄtabRect·ÅÖÃm_VisonDlg×Ó¶Ô»°¿ò£¬²¢ÉèÖÃΪÒþ²Ø m_VisonDlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_HIDEWINDOW); m_ComboxDpi.InsertString(0, _T("300")); @@ -198,12 +198,12 @@ BOOL CHuaGoCorrectDlg::OnInitDialog() bool ret = RefreshUSBList(); if (ret) { - m_Usbs.SetCurSel(0);//Ĭ��ѡ���һ���豸 + m_Usbs.SetCurSel(0);//ĬÈÏÑ¡ÔñµÚÒ»¸öÉ豸 OnCbnSelchangeCmbUsbs(); } m_tab.SetCurSel(0); RefreshTabChange(); - return TRUE; // ���ǽ��������õ��ؼ������ò·µ»ï¿½ TRUE + return TRUE; // ³ý·Ç½«½¹µãÉèÖõ½¿Ø¼þ£¬·ñÔò·µ»Ø TRUE } void CHuaGoCorrectDlg::EnableUIItem(bool enbale) @@ -227,7 +227,7 @@ bool CHuaGoCorrectDlg::RefreshUSBList() if (ret.size() <= 0) { EnableUIItem(false); - MessageBox(TEXT("δ�ҵ�ɨ���ǣ�"), TEXT("��ʾ"), MB_OK | MB_ICONWARNING); + MessageBox(TEXT("δÕÒµ½É¨ÃèÒÇ"), TEXT("Ìáʾ"), MB_OK | MB_ICONWARNING); return false; } else @@ -261,19 +261,19 @@ void CHuaGoCorrectDlg::OnSysCommand(UINT nID, LPARAM lParam) } } -// �����Ի���������С����ť������Ҫ����Ĵ��� -// �����Ƹ�ͼ�ꡣ����ʹ���ĵ�/��ͼģ�͵� MFC Ӧ�ó��� -// �⽫�ɿ���Զ���ɡ� +// Èç¹ûÏò¶Ô»°¿òÌí¼Ó×îС»¯°´Å¥£¬ÔòÐèÒªÏÂÃæµÄ´úÂë +// À´»æÖƸÃͼ±ê¡£¶ÔÓÚʹÓÃÎĵµ/ÊÓͼģÐ굀 MFC Ó¦ÓóÌÐò£¬ +// Õ⽫ÓÉ¿ò¼Ü×Ô¶¯Íê³É¡£ void CHuaGoCorrectDlg::OnPaint() { if (IsIconic()) { - CPaintDC dc(this); // ���ڻ��Ƶ��豸������ + CPaintDC dc(this); // ÓÃÓÚ»æÖƵÄÉ豸ÉÏÏÂÎÄ SendMessage(WM_ICONERASEBKGND, reinterpret_cast(dc.GetSafeHdc()), 0); - // ʹͼ���ڹ����������о��� + // ʹͼ±êÔÚ¹¤×÷Çø¾ØÐÎÖоÓÖÐ int cxIcon = GetSystemMetrics(SM_CXICON); int cyIcon = GetSystemMetrics(SM_CYICON); CRect rect; @@ -281,7 +281,7 @@ void CHuaGoCorrectDlg::OnPaint() int x = (rect.Width() - cxIcon + 1) / 2; int y = (rect.Height() - cyIcon + 1) / 2; - // ����ͼ�� + // »æÖÆͼ±ê dc.DrawIcon(x, y, m_hIcon); } else @@ -290,8 +290,8 @@ void CHuaGoCorrectDlg::OnPaint() } } -//���û��϶���С������ʱϵͳ���ô˺���ȡ�ù�� -//��ʾ�� +//µ±Óû§Í϶¯×îС»¯´°¿Úʱϵͳµ÷Óô˺¯ÊýÈ¡µÃ¹â±ê +//ÏÔʾ¡£ HCURSOR CHuaGoCorrectDlg::OnQueryDragIcon() { return static_cast(m_hIcon); @@ -299,16 +299,16 @@ HCURSOR CHuaGoCorrectDlg::OnQueryDragIcon() void CHuaGoCorrectDlg::OnTcnSelChangeTab(NMHDR* pNMHDR, LRESULT* pResult) { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë *pResult = 0; RefreshTabChange(); } void CHuaGoCorrectDlg::RefreshTabChange() { - CRect tabRect; // ��ǩ�ؼ��ͻ�����Rect + CRect tabRect; // ±êÇ©¿Ø¼þ¿Í»§ÇøµÄRect - // ��ȡ��ǩ�ؼ��ͻ���Rect����������������ʺϷ��ñ�ǩҳ + // »ñÈ¡±êÇ©¿Ø¼þ¿Í»§ÇøRect£¬²¢¶ÔÆäµ÷Õû£¬ÒÔÊʺϷÅÖñêÇ©Ò³ m_tab.GetClientRect(&tabRect); tabRect.left += 0; tabRect.right += 10; @@ -340,7 +340,10 @@ void CHuaGoCorrectDlg::RefreshTabChange() void CHuaGoCorrectDlg::Scan() { HGScanConfig config = { 0 }; - if (m_drv->PID == 0x0139 || m_drv->PID == 0x0239 || m_drv->PID == 0x8739 || m_drv->PID == 0x8629) + if (m_drv->PID == 0x0139 || + m_drv->PID == 0x0239 || + m_drv->PID == 0x8739 || + m_drv->PID == 0x8629) { config.g200params.dpi = 1;//only support 200DPI config.g200params.paper = 2; @@ -348,7 +351,7 @@ void CHuaGoCorrectDlg::Scan() config.g200params.color = m_iColorIndex == 1 ? 1 : 0; config.g200params.double_feed_enbale = TRUE; config.g200params.screw_detect_enable = FALSE; - config.g200params.iscorrect_mode = 1;//У��ģʽ + config.g200params.iscorrect_mode = 1;//УÕýģʽ } else { @@ -358,7 +361,7 @@ void CHuaGoCorrectDlg::Scan() config.g400params.isColor = m_iColorIndex == 1 ? 1 : 0; config.g400params.doubleFeeded = TRUE; config.g400params.enableStable = FALSE; - config.g400params.reversed1 = 0;//У��ģʽ + config.g400params.reversed1 = 0;//УÕýģʽ } m_drv->Config_Scanner(config); @@ -381,10 +384,10 @@ void CHuaGoCorrectDlg::Scan() void CHuaGoCorrectDlg::OnBnClickedCheckparamset() { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë if (!m_drv->IsConnected()) { - MessageBox(TEXT("ɨ����δ���ӣ�")); + MessageBox(TEXT("ɨÃèÒÇδÁ¬½Ó")); return; } m_A4Dlg.SendCorrectParam(); @@ -393,10 +396,10 @@ void CHuaGoCorrectDlg::OnBnClickedCheckparamset() void CHuaGoCorrectDlg::OnBnClickedCheckparamread() { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë if (!m_drv->IsConnected()) { - MessageBox(TEXT("ɨ����δ���ӣ�")); + MessageBox(TEXT("ɨÃèÒÇδÁ¬½Ó")); return; } m_tab.SetCurSel(0); @@ -406,11 +409,11 @@ void CHuaGoCorrectDlg::OnBnClickedCheckparamread() void CHuaGoCorrectDlg::OnBnClickedBtnFlat() { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë m_iflatIndex = -2; if (!m_drv->IsConnected()) { - MessageBox(TEXT("ɨ����δ���ӣ�")); + MessageBox(TEXT("ɨÃèÒÇδÁ¬½Ó")); return; } if (GetDlgItem(IDC_CKBCORRECTMODE)->IsWindowVisible()) @@ -427,15 +430,15 @@ void CHuaGoCorrectDlg::OnBnClickedBtnFlat() ((CEdit*)(m_A3dlg.GetDlgItem(IDC_LSTFLATINFO)))->GetWindowText(oldinfo); oldinfo += pWideChar; ((CEdit*)(m_A3dlg.GetDlgItem(IDC_LSTFLATINFO)))->SetWindowText(oldinfo); - auto edit = ((CEdit*)(m_A3dlg.GetDlgItem(IDC_LSTFLATINFO))); - edit->LineScroll(edit->GetLineCount()); + auto edit = ((CEdit*)(m_A3dlg.GetDlgItem(IDC_LSTFLATINFO))); + edit->LineScroll(edit->GetLineCount()); }; m_drv->SetFlatCallback(flatcall); m_drv->StartFlat(((CButton*)GetDlgItem(IDC_CKBCORRECTMODE))->GetCheck()); } else - m_drv->StartFlat(true);//��ɫ + m_drv->StartFlat(true);//²ÊÉ« } void CHuaGoCorrectDlg::WriteLog(CString msg) @@ -460,8 +463,8 @@ void CHuaGoCorrectDlg::WriteLog(CString msg) void CHuaGoCorrectDlg::OnCancel() { - // TODO: �ڴ�����ר�ô����/����û��� - if (IDOK != AfxMessageBox(L"ȷ��Ҫ�˳��˳�����", MB_ICONQUESTION | MB_OKCANCEL)) + // TODO: ÔÚ´ËÌí¼ÓרÓôúÂëºÍ/»òµ÷ÓûùÀà + if (IDOK != AfxMessageBox(L"È·¶¨ÒªÍ˳ö´Ë³ÌÐòÂð£¿", MB_ICONQUESTION | MB_OKCANCEL)) { return; } @@ -480,27 +483,27 @@ void CHuaGoCorrectDlg::InitButton() void CHuaGoCorrectDlg::OnCbnSelChangeDpi() { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë m_iDpiIndex = m_ComboxDpi.GetCurSel(); } void CHuaGoCorrectDlg::OnCbnSelChangeColor() { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë m_iColorIndex = m_ComboxColor.GetCurSel(); //m_drv->set_decompress_pix_type(0 == m_iColorIndex ? TWPT_GRAY : TWPT_RGB); } void CHuaGoCorrectDlg::OnBnClickedStopScan() { - // TODO: �ڴ����ӿؼ�֪ͨ����������� + // TODO: ÔÚ´ËÌí¼Ó¿Ø¼þ֪ͨ´¦Àí³ÌÐò´úÂë } void CHuaGoCorrectDlg::OnTimer(UINT_PTR nIDEvent) { - // TODO: �ڴ�������Ϣ������������/�����Ĭ��ֵ + // TODO: ÔÚ´ËÌí¼ÓÏûÏ¢´¦Àí³ÌÐò´úÂëºÍ/»òµ÷ÓÃĬÈÏÖµ switch (nIDEvent) { case 1: @@ -545,7 +548,7 @@ void CHuaGoCorrectDlg::OnTimer(UINT_PTR nIDEvent) } /// -/// ѡ������ļ� +/// Ñ¡Ôñ¸üÐÂÎļþ /// void CHuaGoCorrectDlg::OnBnClickedBtnSelectfile() { @@ -567,7 +570,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnSelectfile() } /// -/// ��ʼϵͳ���� +/// ¿ªÊ¼ÏµÍ³Éý¼¶ /// void CHuaGoCorrectDlg::OnBnClickedBtnUpdate() { @@ -580,7 +583,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnUpdate() } /// -/// ����ɨ��USB +/// ÖØÐÂɨÃèUSB /// void CHuaGoCorrectDlg::OnBnClickedBtnRefresh() { @@ -588,7 +591,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnRefresh() } /// -/// USB�б�ѡ��仯 +/// USBÁбíÑ¡Ôñ±ä»¯ /// void CHuaGoCorrectDlg::OnCbnSelchangeCmbUsbs() { @@ -607,8 +610,10 @@ void CHuaGoCorrectDlg::OnCbnSelchangeCmbUsbs() { if (j == ret) { - if ((i->vid == 0x3072 && i->pid == 0x0139) || (i->vid == 0x3072 && i->pid == 0x0239) - || (i->vid == 0x31c9 && i->pid == 0x8739) || (i->vid == 0x31c9 && i->pid == 0x8629)) + if ((i->vid == 0x3072 && i->pid == 0x0139) || + (i->vid == 0x3072 && i->pid == 0x0239) || + (i->vid == 0x31c9 && i->pid == 0x8629) || + (i->vid == 0x31c9 && i->pid == 0x8739)) m_drv.reset(new gscan3399()); else { @@ -649,7 +654,7 @@ void CHuaGoCorrectDlg::OnCbnSelchangeCmbUsbs() } /// -/// ��ʼɨ�� +/// ¿ªÊ¼É¨Ãè /// void CHuaGoCorrectDlg::OnBnClickedBtnstart() { @@ -657,7 +662,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnstart() if (!m_drv->IsConnected()) { - MessageBox(L"ɨ����δ���ӣ�"); + MessageBox(L"ɨÃèÒÇδÁ¬½Ó"); return; } m_iColorIndex = m_ComboxColor.GetCurSel(); @@ -673,7 +678,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnstart() /// -/// ֹͣɨ�� +/// ֹͣɨÃè /// void CHuaGoCorrectDlg::OnBnClickedBtnstop() { @@ -708,10 +713,10 @@ void CHuaGoCorrectDlg::updatefunc() }); if (ret == false) { - MessageBox(TEXT("����ʧ�ܣ�"), TEXT("��ʾ"), MB_OK); + MessageBox(TEXT("¸üÐÂʧ°Ü"), TEXT("Ìáʾ"), MB_OK); } else { - MessageBox(TEXT("������ɣ�"), TEXT("��ʾ"), MB_OK | MB_ICONINFORMATION); + MessageBox(TEXT("¸üÐÂÍê³É"), TEXT("Ìáʾ"), MB_OK | MB_ICONINFORMATION); } }