lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

重新定义自定义消息，图像计数消息改用Send方式

This commit is contained in:
gb 2022-10-11 10:05:12 +08:00
parent 426fc2d0ef
commit 7f02d03f5b
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sane/DlgIndicator.cpp
View File

@ -10,10 +10,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// dlg_choose_dev /// dlg_choose_dev
// CDlgIndicator 对话框 // CDlgIndicator 对话框
#define WM_SCAN_WORKING WM_USER + 1 // WPARAM: unused; LPARAM: unsed
#define WM_USB_PACKET_RECEIVED WM_USER + 2 // WPARAM: unused; LPARAM: unsed
#define WM_IMAGE_RECEIVED WM_USER + 3 // WPARAM: unused; LPARAM: unsed
#define WM_SCAN_FINISHED WM_USER + 4 // WPARAM: std::string* msg; LPARAM: boo err
dlg_indicator::dlg_indicator(HWND parent) : dlg_base(parent, IDD_INDICATOR) dlg_indicator::dlg_indicator(HWND parent) : dlg_base(parent, IDD_INDICATOR)
@ -134,7 +130,7 @@ HWND dlg_indicator::parent(void)
} }
void dlg_indicator::notify_data_arrived(bool image) void dlg_indicator::notify_data_arrived(bool image)
{ {
PostMessage(hwnd_, image ? WM_IMAGE_RECEIVED : WM_USB_PACKET_RECEIVED, 0, 0); SendMessage(hwnd_, image ? WM_IMAGE_RECEIVED : WM_USB_PACKET_RECEIVED, 0, 0); // PostMessage 存在消息合并/遗漏的现象，改用Send
} }
void dlg_indicator::notify_scan_over(const char* msg, bool err) void dlg_indicator::notify_scan_over(const char* msg, bool err)
{ {

9
sane/DlgPage.h
View File

@ -10,8 +10,13 @@
// CDlgIndicator 对话框 // CDlgIndicator 对话框
#define RECT_W(r) (r.right - r.left) #define RECT_W(r) (r.right - r.left)
#define RECT_H(r) (r.bottom - r.top) #define RECT_H(r) (r.bottom - r.top)
#define WM_REFRESH_OPTION WM_USER + 111 // WPARAM: source option SN, LPARAM: unused now
#define WM_GET_CONFIG_OBJ WM_USER + 112 // WPARAM: not use, LPARAM: to receive the gb::sane_config* object #define WM_SCAN_WORKING WM_USER + 301 // WPARAM: unused; LPARAM: unsed
#define WM_USB_PACKET_RECEIVED WM_USER + 302
#define WM_IMAGE_RECEIVED WM_USER + 303
#define WM_SCAN_FINISHED WM_USER + 304 // WPARAM: std::string* msg; LPARAM: boo err
#define WM_REFRESH_OPTION WM_USER + 311 // WPARAM: source option SN, LPARAM: unused now
#define WM_GET_CONFIG_OBJ WM_USER + 312 // WPARAM: not use, LPARAM: to receive the gb::sane_config* object
extern HMODULE g_my_inst; extern HMODULE g_my_inst;

3
sane/DlgSetting.cpp
View File

@ -8,9 +8,6 @@
#include "gb_json.h" #include "gb_json.h"
// CDlgIndicator 对话框 // CDlgIndicator 对话框
#define WM_USB_PACKET_RECEIVED WM_USER + 1
#define WM_IMAGE_RECEIVED WM_USER + 2
#define WM_SCAN_FINISHED WM_USER + 3 // WPARAM: std::string* msg; LPARAM: boo err
static IMPLEMENT_OPTION_STRING_COMPARE(cmp_sane_opt); static IMPLEMENT_OPTION_STRING_COMPARE(cmp_sane_opt);