This commit is contained in:
parent
7be7e50272
commit
1690223b5c
|
@ -57,6 +57,11 @@ HGResult DeviceUser::Open()
|
|||
return HGTwain_OpenDS(m_twainDS);
|
||||
}
|
||||
|
||||
HGResult DeviceUser::OpenDefault()
|
||||
{
|
||||
return HGTwain_OpenDS(m_twainDS);
|
||||
}
|
||||
|
||||
HGResult DeviceUser::Close()
|
||||
{
|
||||
return HGTwain_CloseDS(m_twainDS);
|
||||
|
@ -218,6 +223,17 @@ HGResult DeviceUser::Open()
|
|||
return HGSane_OpenSelectedDevice(m_source, m_wnd, &m_saneDev);
|
||||
}
|
||||
|
||||
HGResult DeviceUser::OpenDefault()
|
||||
{
|
||||
if (nullptr != m_saneDev)
|
||||
{
|
||||
return HGSANE_ERR_FAIL;
|
||||
}
|
||||
|
||||
HGChar errInfo[256];
|
||||
return HGSane_OpenDevice(m_source, 0, &m_saneDev, errInfo, 256);
|
||||
}
|
||||
|
||||
HGResult DeviceUser::Close()
|
||||
{
|
||||
if (nullptr == m_saneDev)
|
||||
|
|
|
@ -35,6 +35,7 @@ public:
|
|||
~DeviceUser();
|
||||
|
||||
HGResult Open();
|
||||
HGResult OpenDefault();
|
||||
HGResult Close();
|
||||
// 获取设备名字
|
||||
QString GetName();
|
||||
|
@ -98,6 +99,7 @@ public:
|
|||
~DeviceUser();
|
||||
|
||||
HGResult Open();
|
||||
HGResult OpenDefault();
|
||||
HGResult Close();
|
||||
// 获取设备名字
|
||||
QString GetName();
|
||||
|
|
|
@ -360,7 +360,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
|||
m_devUser = m_devUserMgr->OpenDefaultDeviceUser();
|
||||
if (m_devUser != nullptr)
|
||||
{
|
||||
if (HGBASE_ERR_OK == m_devUser->Open())
|
||||
if (HGBASE_ERR_OK == m_devUser->OpenDefault())
|
||||
{
|
||||
m_wndStatusBar->setDeviceStatusInfo(tr("Device %1 is open").arg(m_devUser->GetName()), false);
|
||||
connect(m_devUser, SIGNAL(newImage(void*)), this, SLOT(on_newImage(void*)), Qt::DirectConnection);
|
||||
|
|
Loading…
Reference in New Issue