调整show_setting_ui接口,支持扫描功能
This commit is contained in:
parent
38bdfcdc7a
commit
8f242dc071
|
@ -692,7 +692,7 @@ HGResult HGSaneDeviceImpl::ShowSettingDlg(HGWindow parent)
|
||||||
return HGBASE_ERR_FAIL;
|
return HGBASE_ERR_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (-2 == show_setting_ui(&m_sourceImpl->m_saneApi, m_devHandle, m_devName.c_str(), parent))
|
if (-2 == show_setting_ui(&m_sourceImpl->m_saneApi, m_devHandle, m_devName.c_str(), parent, NULL, NULL))
|
||||||
{
|
{
|
||||||
return HGBASE_ERR_NOTSUPPORT;
|
return HGBASE_ERR_NOTSUPPORT;
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,7 +105,8 @@ int show_devlist_ui(const SANEAPI* saneApi, const char **devNames, HGWindow pare
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, HGWindow parent)
|
int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, HGWindow parent,
|
||||||
|
show_scan_ui_image_callback callback, void *callbackParam)
|
||||||
{
|
{
|
||||||
if (nullptr == saneApi || nullptr == handle)
|
if (nullptr == saneApi || nullptr == handle)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -129,7 +130,7 @@ int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devN
|
||||||
translator.load(":translation/SaneUI_zh_CN.qm");
|
translator.load(":translation/SaneUI_zh_CN.qm");
|
||||||
QCoreApplication::installTranslator(&translator);
|
QCoreApplication::installTranslator(&translator);
|
||||||
|
|
||||||
hg_settingdialog dlg(saneApi, handle, devName, qParent);
|
hg_settingdialog dlg(saneApi, handle, devName, callback, callbackParam, qParent);
|
||||||
dlg.exec();
|
dlg.exec();
|
||||||
QCoreApplication::removeTranslator(&translator);
|
QCoreApplication::removeTranslator(&translator);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -14,7 +14,8 @@ HGEXPORT int show_srclist_ui(const char **manuNames, const char **sanePaths, HGW
|
||||||
SANEAPI* saneApi, char *manuName, unsigned int maxLen);
|
SANEAPI* saneApi, char *manuName, unsigned int maxLen);
|
||||||
HGEXPORT int show_devlist_ui(const SANEAPI* saneApi, const char **devNames, HGWindow parent,
|
HGEXPORT int show_devlist_ui(const SANEAPI* saneApi, const char **devNames, HGWindow parent,
|
||||||
SANE_Handle *handle, char *devName, unsigned int maxLen);
|
SANE_Handle *handle, char *devName, unsigned int maxLen);
|
||||||
HGEXPORT int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, HGWindow parent);
|
HGEXPORT int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, HGWindow parent,
|
||||||
|
show_scan_ui_image_callback callback, void *callbackParam);
|
||||||
HGEXPORT int show_scan_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, HGWindow parent,
|
HGEXPORT int show_scan_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, HGWindow parent,
|
||||||
show_scan_ui_image_callback callback, void *callbackParam);
|
show_scan_ui_image_callback callback, void *callbackParam);
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,8 @@
|
||||||
|
|
||||||
std::string hg_settingdialog::property_combox_data_type_ = "combox_value_type";
|
std::string hg_settingdialog::property_combox_data_type_ = "combox_value_type";
|
||||||
|
|
||||||
hg_settingdialog::hg_settingdialog(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, QWidget *parent)
|
hg_settingdialog::hg_settingdialog(const SANEAPI* saneApi, SANE_Handle handle, const char *devName,
|
||||||
|
show_scan_ui_image_callback callback, void *callbackParam, QWidget *parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
, save_(false)
|
, save_(false)
|
||||||
, btn_cut_area_(nullptr), btn_gamma_(nullptr), clicked_gamma_(false)
|
, btn_cut_area_(nullptr), btn_gamma_(nullptr), clicked_gamma_(false)
|
||||||
|
@ -71,6 +72,9 @@ hg_settingdialog::hg_settingdialog(const SANEAPI* saneApi, SANE_Handle handle, c
|
||||||
|
|
||||||
memcpy(&m_saneAPI, saneApi, sizeof(SANEAPI));
|
memcpy(&m_saneAPI, saneApi, sizeof(SANEAPI));
|
||||||
m_devHandle = handle;
|
m_devHandle = handle;
|
||||||
|
m_callback = callback;
|
||||||
|
m_callbackParam = callbackParam;
|
||||||
|
|
||||||
initUi();
|
initUi();
|
||||||
on_current_scheme_changed();
|
on_current_scheme_changed();
|
||||||
getAppVersion();
|
getAppVersion();
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <QtWidgets>
|
#include <QtWidgets>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "sane/sane_ex.h"
|
#include "HGSaneUI.h"
|
||||||
#include "cfg/gb_json.h"
|
#include "cfg/gb_json.h"
|
||||||
#include "device_menu.h"
|
#include "device_menu.h"
|
||||||
|
|
||||||
|
@ -46,7 +46,8 @@ class hg_settingdialog : public QDialog
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit hg_settingdialog(const SANEAPI* saneApi, SANE_Handle handle, const char *devName, QWidget *parent = nullptr);
|
explicit hg_settingdialog(const SANEAPI* saneApi, SANE_Handle handle, const char *devName,
|
||||||
|
show_scan_ui_image_callback callback, void *callbackParam, QWidget *parent = nullptr);
|
||||||
~hg_settingdialog();
|
~hg_settingdialog();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -61,6 +62,8 @@ public:
|
||||||
private:
|
private:
|
||||||
SANEAPI m_saneAPI;
|
SANEAPI m_saneAPI;
|
||||||
SANE_Handle m_devHandle;
|
SANE_Handle m_devHandle;
|
||||||
|
show_scan_ui_image_callback m_callback;
|
||||||
|
void *m_callbackParam;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString m_qstrFileName;
|
QString m_qstrFileName;
|
||||||
|
|
Loading…
Reference in New Issue