From e3d48d0d4255080d669ef63ad87dc48b26ae105d Mon Sep 17 00:00:00 2001 From: lovelyyoung <1002639516@qq.com> Date: Tue, 17 Mar 2020 21:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E4=BA=8E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=AF=BB=E5=8F=96=E5=BA=8F=E5=88=97=E5=8F=B7=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=9B=BA=E4=BB=B6=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- huagao/CAboutDlg.cpp | 19 +++++++++++++++++-- huagao/CAboutDlg.h | 8 ++++++-- huagao/CBasicPage.cpp | 14 ++++++++++---- huagao/CBasicPage.h | 4 ++++ huagao/CTwainUI.cpp | 9 +++++++-- huagao/CTwainUI.h | 6 +++++- huagao/huagaods.cpp | 9 +++++---- huagao/resource.h | Bin 10618 -> 10618 bytes huagao/stdafx.h | Bin 4750 -> 4744 bytes 9 files changed, 54 insertions(+), 15 deletions(-) diff --git a/huagao/CAboutDlg.cpp b/huagao/CAboutDlg.cpp index d7bfd205..7bea8dbe 100644 --- a/huagao/CAboutDlg.cpp +++ b/huagao/CAboutDlg.cpp @@ -11,8 +11,10 @@ IMPLEMENT_DYNAMIC(CAboutDlg, CDialogEx) -CAboutDlg::CAboutDlg(CWnd* pParent /*=nullptr*/) +CAboutDlg::CAboutDlg(std::string hardwareversion, std::string serialnum,CWnd* pParent /*=nullptr*/) : CDialogEx(IDD_ABOUT, pParent) + ,m_hardwareversion(hardwareversion) + ,m_serialnum(serialnum) { } @@ -28,6 +30,7 @@ void CAboutDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CAboutDlg, CDialogEx) + ON_BN_CLICKED(IDOK, &CAboutDlg::OnBnClickedOk) END_MESSAGE_MAP() @@ -39,8 +42,20 @@ BOOL CAboutDlg::OnInitDialog() CDialogEx::OnInitDialog(); // TODO: 在此添加额外的初始化 - + CString hardwareversion(m_hardwareversion.c_str()); + CString serialnum(m_serialnum.c_str()); + SetDlgItemText(IDC_LBSCANNERNAMEVALUE, SCANNERNAME); + SetDlgItemText(IDC_LBHARDWAREVALUE, hardwareversion); + SetDlgItemText(IDC_LBSERIALNUMVALUE, serialnum); + SetDlgItemText(IDC_LBDERIVERVERSON, HG_VERSION_INFO); return TRUE; // return TRUE unless you set the focus to a control // 异常: OCX 属性页应返回 FALSE } + + +void CAboutDlg::OnBnClickedOk() +{ + // TODO: 在此添加控件通知处理程序代码 + CDialogEx::OnOK(); +} diff --git a/huagao/CAboutDlg.h b/huagao/CAboutDlg.h index 31e65aea..41594548 100644 --- a/huagao/CAboutDlg.h +++ b/huagao/CAboutDlg.h @@ -1,5 +1,5 @@ #pragma once - +#include // CAboutDlg 对话框 @@ -8,7 +8,7 @@ class CAboutDlg : public CDialogEx DECLARE_DYNAMIC(CAboutDlg) public: - CAboutDlg(CWnd* pParent = nullptr); // 标准构造函数 + CAboutDlg(std::string hardwareversion,std::string serialnum, CWnd* pParent = nullptr); // 标准构造函数 virtual ~CAboutDlg(); // 对话框数据 @@ -22,4 +22,8 @@ protected: DECLARE_MESSAGE_MAP() public: virtual BOOL OnInitDialog(); + afx_msg void OnBnClickedOk(); +private: + std::string m_hardwareversion; + std::string m_serialnum; }; diff --git a/huagao/CBasicPage.cpp b/huagao/CBasicPage.cpp index 8aeffe78..4993eeb0 100644 --- a/huagao/CBasicPage.cpp +++ b/huagao/CBasicPage.cpp @@ -6,11 +6,12 @@ #include "afxdialogex.h" #include "resource.h" #include "CAboutDlg.h" +#include "CTwainUI.h" #include "CDiscardBlankSetting.h" #include "Device/JsonConfig.h" #include -static std::vector colorModes = { +static std::vector color_Modes = { _T("24位彩色"), _T("256级灰度"), _T("黑白") @@ -85,7 +86,7 @@ BOOL CBasicPage::OnInitDialog() m_cmBoxResultion = (CComboBox*)GetDlgItem(IDC_CMBRESLUTION); m_cmBoxDuplex = (CComboBox*)GetDlgItem(IDC_CMBDUPLEX); - for (const CString& colorMode : colorModes) + for (const CString& colorMode : color_Modes) m_cmBoxColorMode->AddString(colorMode); @@ -123,8 +124,7 @@ END_MESSAGE_MAP() void CBasicPage::OnBnClickedBtnabout() { - // TODO: 在此添加控件通知处理程序代码 - CAboutDlg dlg; + CAboutDlg dlg(m_hdVersion, m_serialNum,this); dlg.DoModal(); } @@ -179,3 +179,9 @@ void CBasicPage::OnClickedBtndiscardsetting() // dbs.GetParams(AreaNum, DevnMax); //} } + +void CBasicPage::SetScannerInfo(std::string hdVersion, std::string serialNum) +{ + m_hdVersion = hdVersion; + m_serialNum = serialNum; +} diff --git a/huagao/CBasicPage.h b/huagao/CBasicPage.h index 33f0c710..936f7f40 100644 --- a/huagao/CBasicPage.h +++ b/huagao/CBasicPage.h @@ -42,4 +42,8 @@ protected: std::function m_dataChange; public: afx_msg void OnClickedBtndiscardsetting(); + void SetScannerInfo(std::string hdVersion, std::string serialNum); +private: + std::string m_hdVersion; + std::string m_serialNum; }; diff --git a/huagao/CTwainUI.cpp b/huagao/CTwainUI.cpp index 38920195..b4005702 100644 --- a/huagao/CTwainUI.cpp +++ b/huagao/CTwainUI.cpp @@ -16,7 +16,7 @@ IMPLEMENT_DYNAMIC(CTwainUI, CDialogEx) -CTwainUI::CTwainUI(TwGlue glue, CWnd* pParent /*=nullptr*/) +CTwainUI::CTwainUI(TwGlue glue,std::string confirmtitle, std::string hardwareversion, std::string serialnum, CWnd* pParent /*=nullptr*/) : CDialogEx(IDD_TWAINUI, pParent) , m_tabCtrl(new CTabCtrlSSL()) , m_pageBrightness(new CBrightnessPage) @@ -24,7 +24,10 @@ CTwainUI::CTwainUI(TwGlue glue, CWnd* pParent /*=nullptr*/) , m_pageImageProc(new CImageProcPage) , m_glue(glue) , settings(new GScanCap) + , m_confirmtitle(confirmtitle) { + m_hardwareVersion = hardwareversion; + m_serialnum = serialnum; memset(settings.get(), 0, sizeof(GScanCap)); } @@ -54,6 +57,7 @@ BOOL CTwainUI::OnInitDialog() m_pageBasic.reset(new CBasicPage(dataChangeFunction)); m_pageBasic->Create(IDD_PAGEBASIC, this); + m_pageBasic->SetScannerInfo(m_hardwareVersion, m_serialnum); m_tabCtrl->AddSSLPage(_T("基本"), nPageID++, m_pageBasic.get()); m_pageBrightness->Create(IDD_PAGEBRIGHTNESS, this); m_tabCtrl->AddSSLPage(_T("亮度"), nPageID++, m_pageBrightness.get()); @@ -61,7 +65,8 @@ BOOL CTwainUI::OnInitDialog() m_tabCtrl->AddSSLPage(_T("图像处理"), nPageID++, m_pageImageProc.get()); m_pageFeedPaper->Create(IDD_PAGEFEEDPAPER, this); m_tabCtrl->AddSSLPage(_T("送纸"), nPageID++, m_pageFeedPaper.get()); - + CString title(m_confirmtitle.c_str()); + this->GetDlgItem(IDC_CONFIRM)->SetWindowTextW(title); JsonConfig cfg; CONFIGPARAMS configParams = cfg.ReadDefaultConfig(); UpdateUI(configParams); diff --git a/huagao/CTwainUI.h b/huagao/CTwainUI.h index 34c13929..e16eb8ac 100644 --- a/huagao/CTwainUI.h +++ b/huagao/CTwainUI.h @@ -118,7 +118,7 @@ class CTwainUI : public CDialogEx DECLARE_DYNAMIC(CTwainUI) public: - CTwainUI(TwGlue glue, CWnd* pParent = nullptr); // 标准构造函数 + CTwainUI(TwGlue glue,std::string confirmtitle,std::string hardwareversion,std::string serialnum, CWnd* pParent = nullptr); // 标准构造函数 virtual ~CTwainUI(); void UpdateUI(CONFIGPARAMS configParams); @@ -132,6 +132,9 @@ public: #ifdef AFX_DESIGN_TIME enum { IDD = IDD_TWAINUI }; #endif +public: + std::string m_hardwareVersion; + std::string m_serialnum; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 @@ -161,4 +164,5 @@ protected: int getColorModelIndex(int pixtype); std::vector getConfigFiles(); std::unique_ptr settings; + std::string m_confirmtitle; }; diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp index f1d018bb..83b32b2f 100644 --- a/huagao/huagaods.cpp +++ b/huagao/huagaods.cpp @@ -1699,10 +1699,11 @@ Twpp::Result HuagaoDs::showTwainUI(Twpp::UserInterface& ui, bool bUiOnly) TwGlue glue = {scanFunction, cancelFunction }; TwGlue glueUiOnly = {confirmFunction, cancelFunction }; - guiTwain.reset(new CTwainUI(bUiOnly ? glueUiOnly : glue)); - guiTwain->Create(IDD_TWAINUI, parent); - guiTwain->SetDlgItemText(IDC_CONFIRM, bUiOnly ? _T("ȷ") : _T("ɨ")); - guiTwain->ShowWindow(SW_SHOWNORMAL); + std::string serialnum = scanner->GetSerialNum(); + std::string hardwareversion = scanner->GetFWVersion(); + guiTwain.reset(new CTwainUI(bUiOnly ? glueUiOnly : glue, bUiOnly?"ȷ":"ɨ", hardwareversion, serialnum)); + guiTwain->Create(IDD_TWAINUI, parent); + guiTwain->ShowWindow(SW_SHOWNORMAL); return success(); } diff --git a/huagao/resource.h b/huagao/resource.h index 6b33a7a60807738aefa59551099034fd412d2d7f..0a8a3897bdc1ffbc119685f354aa98d4640f5127 100644 GIT binary patch delta 28 kcmewr^ebpX6Vv2-Oa~_GF|kdaz~nbMkC9{ZJmx#90K5bXn*aa+ delta 24 gcmewr^ebpX6Vv28M!v}&%zl%bm=0{7$9zW>0Efm3H2?qr diff --git a/huagao/stdafx.h b/huagao/stdafx.h index a82a51808ff4f39f26fdf97e5a4bcd590635e83b..bba214790a126924bc2df26e848789fe8f3555c1 100644 GIT binary patch delta 44 zcmeBE?NHtDk5kZxL5abGA(KIu!IZ&}!GOVFav_)aWCN}PtR@UW49=TBa?NE20QCe5 A4FCWD delta 54 zcmeBB?NiA`Zkx6tj I6L%Xs07T#mRsaA1