lmh188
/
huago-corrcet_tools
mirror of http://192.168.1.51:8099/lmh188/huago-corrcet_-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并调整sp后代码

This commit is contained in:
masayume 2021-12-17 13:52:10 +08:00
parent 4cb327198c f75354868b
commit 47e29b49ee
17 changed files with 90 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HuaGoCorrect/.vs/HuaGoCorrect/v16/.suo
View File

Binary file not shown.

BIN
HuaGoCorrect/.vs/HuaGoCorrect/v16/Browse.VC.db
View File

Binary file not shown.

BIN
HuaGoCorrect/.vs/HuaGoCorrect/v16/ipch/4fe8559b30691373.ipch
View File

Binary file not shown.

BIN
HuaGoCorrect/.vs/HuaGoCorrect/v16/ipch/b04f0a6160ad075b.ipch
View File

Binary file not shown.

7
HuaGoCorrect/A3.cpp
View File

@ -298,7 +298,9 @@ void CA3::updatespeedmode(bool get)
bool bfound = false; bool bfound = false;
for (size_t i = 0; i < speedmodeMap.size(); i++) for (size_t i = 0; i < speedmodeMap.size(); i++)
{ {
if (parent->m_drv->PID == 0x0139 || parent->m_drv->PID == 0x0239) if (parent->m_drv->PID == 0x0139 || parent->m_drv->PID == 0x0239
|| parent->m_drv->PID == 0x8739
|| parent->m_drv->PID == 0x8629)
{ {
if((parent->m_drv->PID == 0x239) && (i<4)) if((parent->m_drv->PID == 0x239) && (i<4))
continue; continue;
@ -330,7 +332,8 @@ void CA3::updatespeedmode(bool get)
if (cmbindex != -1) if (cmbindex != -1)
{ {
auto t_speedmode = speedmodeMap[cmbindex]; auto t_speedmode = speedmodeMap[cmbindex];
if (parent->m_drv->PID == 0x0139 || parent->m_drv->PID == 0x0239) if (parent->m_drv->PID == 0x0139 || parent->m_drv->PID == 0x0239 ||
parent->m_drv->PID == 0x8739 || parent->m_drv->PID == 0x8629)
{ {
parent->m_drv->GetSpeedMode(t_speedmode.Speedmode, false); parent->m_drv->GetSpeedMode(t_speedmode.Speedmode, false);
parent->m_drv->SetSptime(0, t_speedmode.GraySp); parent->m_drv->SetSptime(0, t_speedmode.GraySp);

BIN
HuaGoCorrect/HuaGoCorrect.aps Normal file
View File

Binary file not shown.

1
HuaGoCorrect/HuaGoCorrect.h
View File

@ -34,4 +34,3 @@ public:
}; };
extern CHuaGoCorrectApp *GetMainApp(); extern CHuaGoCorrectApp *GetMainApp();
//extern CHuaGoCorrectApp theApp;

BIN
HuaGoCorrect/HuaGoCorrect.rar Normal file
View File

Binary file not shown.

BIN
HuaGoCorrect/HuaGoCorrect.rc
View File

Binary file not shown.

2
HuaGoCorrect/HuaGoCorrect.vcxproj
View File

@ -239,6 +239,7 @@ opencv_imgproc2410d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ClInclude Include="stdafx.h" /> <ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" /> <ClInclude Include="targetver.h" />
<ClInclude Include="ThreadPool.h" /> <ClInclude Include="ThreadPool.h" />
<ClInclude Include="vendorconfig.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="A3.cpp" /> <ClCompile Include="A3.cpp" />
@ -262,6 +263,7 @@ opencv_imgproc2410d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="vendorconfig.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="HuaGoCorrect.rc" /> <ResourceCompile Include="HuaGoCorrect.rc" />

6
HuaGoCorrect/HuaGoCorrect.vcxproj.filters
View File

@ -120,6 +120,9 @@
<ClInclude Include="ThreadPool.h"> <ClInclude Include="ThreadPool.h">
<Filter>头文件</Filter> <Filter>头文件</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="vendorconfig.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="HuaGoCorrect.cpp"> <ClCompile Include="HuaGoCorrect.cpp">
@ -170,6 +173,9 @@
<ClCompile Include="gscan3399.cpp"> <ClCompile Include="gscan3399.cpp">
<Filter>源文件\USB通信</Filter> <Filter>源文件\USB通信</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="vendorconfig.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="HuaGoCorrect.rc"> <ResourceCompile Include="HuaGoCorrect.rc">

136
HuaGoCorrect/HuaGoCorrectDlg.cpp
View File

@ -1,5 +1,5 @@
// HuaGoCorrectDlg.cpp : 实现文件 // HuaGoCorrectDlg.cpp : ʵ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
// //
#include "stdafx.h" #include "stdafx.h"
@ -20,25 +20,25 @@ using namespace std;
#define new DEBUG_NEW #define new DEBUG_NEW
#endif #endif
#define N_TIME_SEC 1000 //一秒时间间隔 #define N_TIME_SEC 1000 //һ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define N_TIME_SHOW 300 //0.2s刷新显示 #define N_TIME_SHOW 300 //0.2sˢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ
#define N_TIMER_SEC 1 #define N_TIMER_SEC 1
#define N_TIMER_SHOW 2 #define N_TIMER_SHOW 2
// 用于应用程序“关于”菜单项的 CAboutDlg 对话框 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>ó<EFBFBD><EFBFBD>򡰹<EFBFBD><EFBFBD>ڡ<EFBFBD><EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD> CAboutDlg <20>Ի<EFBFBD><D4BB><EFBFBD>
class CAboutDlg : public CDialogEx class CAboutDlg : public CDialogEx
{ {
public: public:
CAboutDlg(); CAboutDlg();
// 对话框数据 // <EFBFBD>Ի<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
enum { IDD = IDD_ABOUTBOX }; enum { IDD = IDD_ABOUTBOX };
protected: protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV ֧<EFBFBD><EFBFBD>
// 实现 // ʵ<EFBFBD><EFBFBD>
protected: protected:
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
}; };
@ -56,7 +56,7 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialogEx)
END_MESSAGE_MAP() END_MESSAGE_MAP()
// CHuaGoCorrectDlg 对话框 // CHuaGoCorrectDlg <EFBFBD>Ի<EFBFBD><EFBFBD><EFBFBD>
CHuaGoCorrectDlg::CHuaGoCorrectDlg(CWnd* pParent /*=NULL*/) CHuaGoCorrectDlg::CHuaGoCorrectDlg(CWnd* pParent /*=NULL*/)
: CDialogEx(CHuaGoCorrectDlg::IDD, pParent) : CDialogEx(CHuaGoCorrectDlg::IDD, pParent)
@ -110,13 +110,13 @@ BEGIN_MESSAGE_MAP(CHuaGoCorrectDlg, CDialogEx)
END_MESSAGE_MAP() END_MESSAGE_MAP()
// CHuaGoCorrectDlg 消息处理程序 // CHuaGoCorrectDlg <EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
BOOL CHuaGoCorrectDlg::OnInitDialog() BOOL CHuaGoCorrectDlg::OnInitDialog()
{ {
CDialogEx::OnInitDialog(); CDialogEx::OnInitDialog();
// 将“关于...”菜单项添加到系统菜单中。 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...<2E><><EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD>ϵͳ<CFB5>˵<EFBFBD><CBB5>С<EFBFBD>
// IDM_ABOUTBOX 必须在系统命令范围内。 // IDM_ABOUTBOX <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD>Χ<EFBFBD>ڡ<EFBFBD>
ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
ASSERT(IDM_ABOUTBOX < 0xF000); ASSERT(IDM_ABOUTBOX < 0xF000);
CMenu* pSysMenu = GetSystemMenu(FALSE); CMenu* pSysMenu = GetSystemMenu(FALSE);
@ -133,17 +133,17 @@ BOOL CHuaGoCorrectDlg::OnInitDialog()
} }
} }
// 设置此对话框的图标。当应用程序主窗口不是对话框时，框架将自动 // <EFBFBD><EFBFBD><EFBFBD>ô˶Ի<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD>ꡣ<EFBFBD><EFBFBD>Ӧ<EFBFBD>ó<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><EFBFBD>ǶԻ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܽ<EFBFBD><EFBFBD>Զ<EFBFBD>
// 执行此操作 // ִ<EFBFBD>д˲<EFBFBD><EFBFBD><EFBFBD>
SetIcon(m_hIcon, TRUE); // 设置大图标 SetIcon(m_hIcon, TRUE); // <EFBFBD><EFBFBD><EFBFBD>ô<EFBFBD>ͼ<EFBFBD><EFBFBD>
SetIcon(m_hIcon, FALSE); // 设置小图标 SetIcon(m_hIcon, FALSE); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Сͼ<EFBFBD><EFBFBD>
// TODO: 在此添加额外的初始化代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӷ<EFBFBD><EFBFBD><EFBFBD>ij<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
m_tab.InsertItem(0, _T("参数设置")); m_tab.InsertItem(0, _T("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"));
m_tab.InsertItem(1, _T("显示图像")); m_tab.InsertItem(1, _T("<EFBFBD><EFBFBD>ʾͼ<EFBFBD><EFBFBD>"));
m_tab.InsertItem(2, _T("CIS设置")); m_tab.InsertItem(2, _T("CIS<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"));
m_A4Dlg.Create(IDD_A4_DIALOG, &m_tab); // 创建第二个标签页 m_A4Dlg.Create(IDD_A4_DIALOG, &m_tab); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǩҳ
m_VisonDlg.Create(IDD_VISION_DIALOG, &m_tab); //创建第三个标签页 m_VisonDlg.Create(IDD_VISION_DIALOG, &m_tab); //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǩҳ
m_A3dlg.Create(IDD_A3_DIALOG, &m_tab); m_A3dlg.Create(IDD_A3_DIALOG, &m_tab);
m_A4Dlg.SetParent(this); m_A4Dlg.SetParent(this);
m_VisonDlg.SetParent(this); m_VisonDlg.SetParent(this);
@ -163,18 +163,18 @@ BOOL CHuaGoCorrectDlg::OnInitDialog()
}; };
m_VisonDlg.SetCallBack(callback); m_VisonDlg.SetCallBack(callback);
m_tab.GetClientRect(&tabRect); // 获取标签控件客户区Rect m_tab.GetClientRect(&tabRect); // <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǩ<EFBFBD>ؼ<EFBFBD><EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD>Rect
// 调整tabRect，使其覆盖范围适合放置标签页 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>tabRect<EFBFBD><EFBFBD>ʹ<EFBFBD>串<EFBFBD>Ƿ<EFBFBD>Χ<EFBFBD>ʺϷ<EFBFBD><EFBFBD>ñ<EFBFBD>ǩҳ
tabRect.left += 0; tabRect.left += 0;
tabRect.right -= 0; tabRect.right -= 0;
tabRect.top += 100; tabRect.top += 100;
tabRect.bottom -= 50; tabRect.bottom -= 50;
// 根据调整好的tabRect放置m_A3Dlg子对话框，并设置为显示 // <EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD>tabRect<EFBFBD><EFBFBD><EFBFBD><EFBFBD>m_A3Dlg<EFBFBD>ӶԻ<EFBFBD><EFBFBD>򣬲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>ʾ
m_A3dlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_HIDEWINDOW); m_A3dlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_HIDEWINDOW);
// 根据调整好的tabRect放置m_A4Dlg子对话框，并设置为隐藏 // <EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD>tabRect<EFBFBD><EFBFBD><EFBFBD><EFBFBD>m_A4Dlg<EFBFBD>ӶԻ<EFBFBD><EFBFBD>򣬲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
m_A4Dlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_SHOWWINDOW); m_A4Dlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_SHOWWINDOW);
// 根据调整好的tabRect放置m_VisonDlg子对话框，并设置为隐藏 // <EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD>tabRect<EFBFBD><EFBFBD><EFBFBD><EFBFBD>m_VisonDlg<EFBFBD>ӶԻ<EFBFBD><EFBFBD>򣬲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
m_VisonDlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_HIDEWINDOW); m_VisonDlg.SetWindowPos(NULL, tabRect.left, tabRect.top, tabRect.Width(), tabRect.Height(), SWP_HIDEWINDOW);
m_ComboxDpi.InsertString(0, _T("300")); m_ComboxDpi.InsertString(0, _T("300"));
@ -198,12 +198,12 @@ BOOL CHuaGoCorrectDlg::OnInitDialog()
bool ret = RefreshUSBList(); bool ret = RefreshUSBList();
if (ret) if (ret)
{ {
m_Usbs.SetCurSel(0);//默认选择第一个设备 m_Usbs.SetCurSel(0);//Ĭ<EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>豸
OnCbnSelchangeCmbUsbs(); OnCbnSelchangeCmbUsbs();
} }
m_tab.SetCurSel(0); m_tab.SetCurSel(0);
RefreshTabChange(); RefreshTabChange();
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE return TRUE; // <EFBFBD><EFBFBD><EFBFBD>ǽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD><EFBFBD>ؼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򷵻<EFBFBD> TRUE
} }
void CHuaGoCorrectDlg::EnableUIItem(bool enbale) void CHuaGoCorrectDlg::EnableUIItem(bool enbale)
@ -227,7 +227,7 @@ bool CHuaGoCorrectDlg::RefreshUSBList()
if (ret.size() <= 0) if (ret.size() <= 0)
{ {
EnableUIItem(false); EnableUIItem(false);
MessageBox(TEXT("未找到扫描仪！"), TEXT("提示"), MB_OK | MB_ICONWARNING); MessageBox(TEXT("δ<EFBFBD>ҵ<EFBFBD>ɨ<EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD>"), TEXT("<EFBFBD><EFBFBD>ʾ"), MB_OK | MB_ICONWARNING);
return false; return false;
} }
else else
@ -261,19 +261,19 @@ void CHuaGoCorrectDlg::OnSysCommand(UINT nID, LPARAM lParam)
} }
} }
// 如果向对话框添加最小化按钮，则需要下面的代码 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ի<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ť<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD><EFBFBD>
// 来绘制该图标。对于使用文档/视图模型的 MFC 应用程序， // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƹ<EFBFBD>ͼ<EFBFBD>ꡣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD>/<2F><>ͼģ<CDBC>͵<EFBFBD> MFC Ӧ<>ó<EFBFBD><C3B3><EFBFBD>
// 这将由框架自动完成。 // <EFBFBD>⽫<EFBFBD>ɿ<EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD>ɡ<EFBFBD>
void CHuaGoCorrectDlg::OnPaint() void CHuaGoCorrectDlg::OnPaint()
{ {
if (IsIconic()) if (IsIconic())
{ {
CPaintDC dc(this); // 用于绘制的设备上下文 CPaintDC dc(this); // <EFBFBD><EFBFBD><EFBFBD>ڻ<EFBFBD><EFBFBD>Ƶ<EFBFBD><EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0); SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
// 使图标在工作区矩形中居中 // ʹͼ<EFBFBD><EFBFBD><EFBFBD>ڹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>о<EFBFBD><EFBFBD><EFBFBD>
int cxIcon = GetSystemMetrics(SM_CXICON); int cxIcon = GetSystemMetrics(SM_CXICON);
int cyIcon = GetSystemMetrics(SM_CYICON); int cyIcon = GetSystemMetrics(SM_CYICON);
CRect rect; CRect rect;
@ -281,7 +281,7 @@ void CHuaGoCorrectDlg::OnPaint()
int x = (rect.Width() - cxIcon + 1) / 2; int x = (rect.Width() - cxIcon + 1) / 2;
int y = (rect.Height() - cyIcon + 1) / 2; int y = (rect.Height() - cyIcon + 1) / 2;
// 绘制图标 // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD><EFBFBD>
dc.DrawIcon(x, y, m_hIcon); dc.DrawIcon(x, y, m_hIcon);
} }
else else
@ -290,8 +290,8 @@ void CHuaGoCorrectDlg::OnPaint()
} }
} }
//当用户拖动最小化窗口时系统调用此函数取得光标 //<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD>϶<EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱϵͳ<EFBFBD><EFBFBD><EFBFBD>ô˺<EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD>ù<EFBFBD><EFBFBD>
//显示。 //<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>
HCURSOR CHuaGoCorrectDlg::OnQueryDragIcon() HCURSOR CHuaGoCorrectDlg::OnQueryDragIcon()
{ {
return static_cast<HCURSOR>(m_hIcon); return static_cast<HCURSOR>(m_hIcon);
@ -299,21 +299,21 @@ HCURSOR CHuaGoCorrectDlg::OnQueryDragIcon()
void CHuaGoCorrectDlg::OnTcnSelChangeTab(NMHDR* pNMHDR, LRESULT* pResult) void CHuaGoCorrectDlg::OnTcnSelChangeTab(NMHDR* pNMHDR, LRESULT* pResult)
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
*pResult = 0; *pResult = 0;
RefreshTabChange(); RefreshTabChange();
} }
void CHuaGoCorrectDlg::RefreshTabChange() void CHuaGoCorrectDlg::RefreshTabChange()
{ {
CRect tabRect; // 标签控件客户区的Rect CRect tabRect; // <EFBFBD><EFBFBD>ǩ<EFBFBD>ؼ<EFBFBD><EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Rect
// 获取标签控件客户区Rect，并对其调整，以适合放置标签页 // <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǩ<EFBFBD>ؼ<EFBFBD><EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD>Rect<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʺϷ<EFBFBD><EFBFBD>ñ<EFBFBD>ǩҳ
m_tab.GetClientRect(&tabRect); m_tab.GetClientRect(&tabRect);
tabRect.left += 0; tabRect.left += 0;
tabRect.right += 0; tabRect.right += 10;
tabRect.top += 25; tabRect.top += 35;
tabRect.bottom += 2; tabRect.bottom += 10;
switch (m_tab.GetCurSel()) switch (m_tab.GetCurSel())
{ {
@ -343,12 +343,12 @@ void CHuaGoCorrectDlg::Scan()
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.dpi = 1;//only support 200DPI
config.g200params.paper = 0; config.g200params.paper = 2;
config.g200params.pc_correct = ((CButton*)GetDlgItem(IDC_CKBORGINIMG))->GetCheck(); config.g200params.pc_correct = ((CButton*)GetDlgItem(IDC_CKBORGINIMG))->GetCheck();
config.g200params.color = m_iColorIndex == 1 ? 1 : 0; config.g200params.color = m_iColorIndex == 1 ? 1 : 0;
config.g200params.double_feed_enbale = TRUE; config.g200params.double_feed_enbale = TRUE;
config.g200params.screw_detect_enable = FALSE; config.g200params.screw_detect_enable = FALSE;
config.g200params.iscorrect_mode = 1;//校正模式 config.g200params.iscorrect_mode = 1;//У<EFBFBD><EFBFBD>ģʽ
} }
else else
{ {
@ -358,7 +358,7 @@ void CHuaGoCorrectDlg::Scan()
config.g400params.isColor = m_iColorIndex == 1 ? 1 : 0; config.g400params.isColor = m_iColorIndex == 1 ? 1 : 0;
config.g400params.doubleFeeded = TRUE; config.g400params.doubleFeeded = TRUE;
config.g400params.enableStable = FALSE; config.g400params.enableStable = FALSE;
config.g400params.reversed1 = 0;//校正模式 config.g400params.reversed1 = 0;//У<EFBFBD><EFBFBD>ģʽ
} }
m_drv->Config_Scanner(config); m_drv->Config_Scanner(config);
@ -381,10 +381,10 @@ void CHuaGoCorrectDlg::Scan()
void CHuaGoCorrectDlg::OnBnClickedCheckparamset() void CHuaGoCorrectDlg::OnBnClickedCheckparamset()
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (!m_drv->IsConnected()) if (!m_drv->IsConnected())
{ {
MessageBox(TEXT("扫描仪未连接！")); MessageBox(TEXT("ɨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD>"));
return; return;
} }
m_A4Dlg.SendCorrectParam(); m_A4Dlg.SendCorrectParam();
@ -393,10 +393,10 @@ void CHuaGoCorrectDlg::OnBnClickedCheckparamset()
void CHuaGoCorrectDlg::OnBnClickedCheckparamread() void CHuaGoCorrectDlg::OnBnClickedCheckparamread()
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (!m_drv->IsConnected()) if (!m_drv->IsConnected())
{ {
MessageBox(TEXT("扫描仪未连接！")); MessageBox(TEXT("ɨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD>"));
return; return;
} }
m_tab.SetCurSel(0); m_tab.SetCurSel(0);
@ -406,11 +406,11 @@ void CHuaGoCorrectDlg::OnBnClickedCheckparamread()
void CHuaGoCorrectDlg::OnBnClickedBtnFlat() void CHuaGoCorrectDlg::OnBnClickedBtnFlat()
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
m_iflatIndex = -2; m_iflatIndex = -2;
if (!m_drv->IsConnected()) if (!m_drv->IsConnected())
{ {
MessageBox(TEXT("扫描仪未连接！")); MessageBox(TEXT("ɨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD>"));
return; return;
} }
if (GetDlgItem(IDC_CKBCORRECTMODE)->IsWindowVisible()) if (GetDlgItem(IDC_CKBCORRECTMODE)->IsWindowVisible())
@ -435,7 +435,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnFlat()
} }
else else
m_drv->StartFlat(true);//彩色 m_drv->StartFlat(true);//<EFBFBD><EFBFBD>ɫ
} }
void CHuaGoCorrectDlg::WriteLog(CString msg) void CHuaGoCorrectDlg::WriteLog(CString msg)
@ -460,8 +460,8 @@ void CHuaGoCorrectDlg::WriteLog(CString msg)
void CHuaGoCorrectDlg::OnCancel() void CHuaGoCorrectDlg::OnCancel()
{ {
// TODO: 在此添加专用代码和/或调用基类 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ר<EFBFBD>ô<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>
if (IDOK != AfxMessageBox(L"确定要退出此程序吗？", MB_ICONQUESTION | MB_OKCANCEL)) if (IDOK != AfxMessageBox(L"ȷ<EFBFBD><EFBFBD>Ҫ<EFBFBD>˳<EFBFBD><EFBFBD>˳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", MB_ICONQUESTION | MB_OKCANCEL))
{ {
return; return;
} }
@ -480,27 +480,27 @@ void CHuaGoCorrectDlg::InitButton()
void CHuaGoCorrectDlg::OnCbnSelChangeDpi() void CHuaGoCorrectDlg::OnCbnSelChangeDpi()
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
m_iDpiIndex = m_ComboxDpi.GetCurSel(); m_iDpiIndex = m_ComboxDpi.GetCurSel();
} }
void CHuaGoCorrectDlg::OnCbnSelChangeColor() void CHuaGoCorrectDlg::OnCbnSelChangeColor()
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
m_iColorIndex = m_ComboxColor.GetCurSel(); m_iColorIndex = m_ComboxColor.GetCurSel();
//m_drv->set_decompress_pix_type(0 == m_iColorIndex ? TWPT_GRAY : TWPT_RGB); //m_drv->set_decompress_pix_type(0 == m_iColorIndex ? TWPT_GRAY : TWPT_RGB);
} }
void CHuaGoCorrectDlg::OnBnClickedStopScan() void CHuaGoCorrectDlg::OnBnClickedStopScan()
{ {
// TODO: 在此添加控件通知处理程序代码 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿؼ<EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
} }
void CHuaGoCorrectDlg::OnTimer(UINT_PTR nIDEvent) void CHuaGoCorrectDlg::OnTimer(UINT_PTR nIDEvent)
{ {
// TODO: 在此添加消息处理程序代码和/或调用默认值 // TODO: <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><C4AC>ֵ
switch (nIDEvent) switch (nIDEvent)
{ {
case 1: case 1:
@ -545,7 +545,7 @@ void CHuaGoCorrectDlg::OnTimer(UINT_PTR nIDEvent)
} }
/// <summary> /// <summary>
/// 选择更新文件 /// ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
/// </summary> /// </summary>
void CHuaGoCorrectDlg::OnBnClickedBtnSelectfile() void CHuaGoCorrectDlg::OnBnClickedBtnSelectfile()
{ {
@ -567,7 +567,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnSelectfile()
} }
/// <summary> /// <summary>
/// 开始系统升级 /// <EFBFBD><EFBFBD>ʼϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary> /// </summary>
void CHuaGoCorrectDlg::OnBnClickedBtnUpdate() void CHuaGoCorrectDlg::OnBnClickedBtnUpdate()
{ {
@ -580,7 +580,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnUpdate()
} }
/// <summary> /// <summary>
/// 重新扫描USB /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɨ<EFBFBD><EFBFBD>USB
/// </summary> /// </summary>
void CHuaGoCorrectDlg::OnBnClickedBtnRefresh() void CHuaGoCorrectDlg::OnBnClickedBtnRefresh()
{ {
@ -588,7 +588,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnRefresh()
} }
/// <summary> /// <summary>
/// USB列表选择变化 /// USB<EFBFBD>б<EFBFBD>ѡ<EFBFBD><EFBFBD>仯
/// </summary> /// </summary>
void CHuaGoCorrectDlg::OnCbnSelchangeCmbUsbs() void CHuaGoCorrectDlg::OnCbnSelchangeCmbUsbs()
{ {
@ -649,7 +649,7 @@ void CHuaGoCorrectDlg::OnCbnSelchangeCmbUsbs()
} }
/// <summary> /// <summary>
/// 开始扫描 /// <EFBFBD><EFBFBD>ʼɨ<EFBFBD><EFBFBD>
/// </summary> /// </summary>
void CHuaGoCorrectDlg::OnBnClickedBtnstart() void CHuaGoCorrectDlg::OnBnClickedBtnstart()
{ {
@ -657,7 +657,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnstart()
if (!m_drv->IsConnected()) if (!m_drv->IsConnected())
{ {
MessageBox(L"扫描仪未连接！"); MessageBox(L"ɨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD>");
return; return;
} }
m_iColorIndex = m_ComboxColor.GetCurSel(); m_iColorIndex = m_ComboxColor.GetCurSel();
@ -673,7 +673,7 @@ void CHuaGoCorrectDlg::OnBnClickedBtnstart()
/// <summary> /// <summary>
/// 停止扫描 /// ֹͣɨ<EFBFBD><EFBFBD>
/// </summary> /// </summary>
void CHuaGoCorrectDlg::OnBnClickedBtnstop() void CHuaGoCorrectDlg::OnBnClickedBtnstop()
{ {
@ -708,10 +708,10 @@ void CHuaGoCorrectDlg::updatefunc()
}); });
if (ret == false) if (ret == false)
{ {
MessageBox(TEXT("更新失败！"), TEXT("提示"), MB_OK); MessageBox(TEXT("<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>"), TEXT("<EFBFBD><EFBFBD>ʾ"), MB_OK);
} }
else else
{ {
MessageBox(TEXT("更新完成！"), TEXT("提示"), MB_OK | MB_ICONINFORMATION); MessageBox(TEXT("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD>"), TEXT("<EFBFBD><EFBFBD>ʾ"), MB_OK | MB_ICONINFORMATION);
} }
} }

2
HuaGoCorrect/commondef.h
View File

@ -343,6 +343,8 @@ enum Scanner_Reg_Defs
SR_GET_IPADDR, SR_GET_IPADDR,
SR_GET_MBVERSION_LENGHT, SR_GET_MBVERSION_LENGHT,
SR_GET_MBVERSION, SR_GET_MBVERSION,
SR_GET_USBVIDPID,
SR_SET_USBVIDPID
}; };
enum Scanner_Cmd_Defs enum Scanner_Cmd_Defs

8
HuaGoCorrect/gscan3399.cpp
View File

@ -523,7 +523,13 @@ void gscan3399::GetSpeedMode(int& speedmode, bool get)
void gscan3399::GetOrSetVIDPID(int& value, bool get) void gscan3399::GetOrSetVIDPID(int& value, bool get)
{ {
if (m_usb.get() && m_usb->is_connected())
{
if (get)
value = scanner_read_reg(m_usb, SR_GET_USBVIDPID);
else
scanner_write_reg(m_usb, SR_SET_USBVIDPID, value);
}
} }
void gscan3399::usbcallback(bool isleft, void* usrdata) void gscan3399::usbcallback(bool isleft, void* usrdata)

BIN
HuaGoCorrect/img.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
HuaGoCorrect/inmg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 MiB

BIN
HuaGoCorrect/pub/opencv/bin/turbojpeg.dll Normal file
View File

Binary file not shown.