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 b964a23..83e3445 100644 Binary files a/HuaGoCorrect/HuaGoCorrect.aps and b/HuaGoCorrect/HuaGoCorrect.aps differ diff --git a/HuaGoCorrect/HuaGoCorrect.rc b/HuaGoCorrect/HuaGoCorrect.rc index b89ddb1..0ed5d09 100644 Binary files a/HuaGoCorrect/HuaGoCorrect.rc and b/HuaGoCorrect/HuaGoCorrect.rc differ 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); } }