HGGitLab
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
app
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
luoliangyi
app
Commits
4bcadf11
Commit
4bcadf11
authored
Apr 21, 2022
by
luoliangyi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitee.com/luoliangyi163/hgproject
parents
1ba26f39
26680c24
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
app/scanner/hg_settingdialog.cpp
app/scanner/hg_settingdialog.cpp
+2
-2
app/scanner/mainwindow.cpp
app/scanner/mainwindow.cpp
+9
-7
app/scanner/mainwindow.h
app/scanner/mainwindow.h
+2
-2
No files found.
app/scanner/hg_settingdialog.cpp
View file @
4bcadf11
...
@@ -799,7 +799,7 @@ void hg_settingdialog::slot_string_list_comboBoxClicked()
...
@@ -799,7 +799,7 @@ void hg_settingdialog::slot_string_list_comboBoxClicked()
{
{
QComboBox
*
comboBox
=
qobject_cast
<
QComboBox
*>
(
sender
());
QComboBox
*
comboBox
=
qobject_cast
<
QComboBox
*>
(
sender
());
SANE_Int
id
=
comboBox
->
property
(
"controls_id"
).
toInt
();
SANE_Int
id
=
comboBox
->
property
(
"controls_id"
).
toInt
();
std
::
string
comboBoxcurrentItem
(
comboBox
->
currentText
().
to
Local8Bit
());
std
::
string
comboBoxcurrentItem
(
comboBox
->
currentText
().
to
Utf8
());
const
SANE_Option_Descriptor
*
opt
=
nullptr
;
const
SANE_Option_Descriptor
*
opt
=
nullptr
;
for
(
int
i
=
0
;
i
<
m_list_getOpt
.
size
();
i
++
)
for
(
int
i
=
0
;
i
<
m_list_getOpt
.
size
();
i
++
)
...
@@ -1065,7 +1065,7 @@ void hg_settingdialog::slot_lineEditInput()
...
@@ -1065,7 +1065,7 @@ void hg_settingdialog::slot_lineEditInput()
{
{
QLineEdit
*
lineEdit
=
qobject_cast
<
QLineEdit
*>
(
sender
());
QLineEdit
*
lineEdit
=
qobject_cast
<
QLineEdit
*>
(
sender
());
int
id
=
lineEdit
->
property
(
"controls_id"
).
toInt
();
int
id
=
lineEdit
->
property
(
"controls_id"
).
toInt
();
std
::
string
lineEditCurrentText
(
lineEdit
->
text
().
to
Local8Bit
());
std
::
string
lineEditCurrentText
(
lineEdit
->
text
().
to
Utf8
());
const
SANE_Option_Descriptor
*
opt
=
nullptr
;
const
SANE_Option_Descriptor
*
opt
=
nullptr
;
for
(
int
i
=
0
;
i
<
m_list_getOpt
.
size
();
i
++
)
for
(
int
i
=
0
;
i
<
m_list_getOpt
.
size
();
i
++
)
...
...
app/scanner/mainwindow.cpp
View file @
4bcadf11
...
@@ -198,6 +198,9 @@ MainWindow::MainWindow(QWidget *parent)
...
@@ -198,6 +198,9 @@ MainWindow::MainWindow(QWidget *parent)
connect
(
this
,
SIGNAL
(
new_image
(
void
*
)),
this
,
SLOT
(
on_new_image
(
void
*
)));
connect
(
this
,
SIGNAL
(
new_image
(
void
*
)),
this
,
SLOT
(
on_new_image
(
void
*
)));
connect
(
this
,
SIGNAL
(
scan_working
(
QString
)),
this
,
SLOT
(
on_scan_working
(
QString
)));
connect
(
this
,
SIGNAL
(
scan_working
(
QString
)),
this
,
SLOT
(
on_scan_working
(
QString
)));
connect
(
this
,
SIGNAL
(
scan_finish
(
QString
,
int
)),
this
,
SLOT
(
on_scan_finish
(
QString
,
int
)));
connect
(
this
,
SIGNAL
(
scan_finish
(
QString
,
int
)),
this
,
SLOT
(
on_scan_finish
(
QString
,
int
)));
connect
(
m_dialog_log
,
SIGNAL
(
continuScan
(
bool
)),
this
,
SLOT
(
on_continuScan
(
bool
)));
connect
(
m_dialog_log
,
SIGNAL
(
continuScan
(
void
)),
this
,
SLOT
(
on_act_acquire_triggered
(
void
)));
connect
(
m_dialog_log
,
SIGNAL
(
invoke_stop
(
void
)),
this
,
SLOT
(
on_act_acquireStop_triggered
(
void
)));
ui
->
menu_device
->
setEnabled
(
false
);
ui
->
menu_device
->
setEnabled
(
false
);
m_twainDSM
=
nullptr
;
m_twainDSM
=
nullptr
;
...
@@ -722,12 +725,8 @@ void MainWindow::on_sane_dev_remove(QString devName)
...
@@ -722,12 +725,8 @@ void MainWindow::on_sane_dev_remove(QString devName)
void
MainWindow
::
on_sane_dev_error
(
QString
errorInfo
)
void
MainWindow
::
on_sane_dev_error
(
QString
errorInfo
)
{
{
// m_isScanning = false;
//Error codes operate in slot function: on_scan_finish(QString finishInfo, int err).
// m_wndStatusBar->setDeviceStatusInfo(errorInfo);
(
void
)
errorInfo
;
// m_dialog_log->add_log(errorInfo, true);
// m_dialog_log->setScanStatus(m_isScanning);
// m_dialog_log->updateWigetStaus();
// set_actions_enabled(!m_isScanning);
}
}
bool
MainWindow
::
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
bool
MainWindow
::
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
...
@@ -824,10 +823,10 @@ void MainWindow::on_scan_working(QString workingInfo)
...
@@ -824,10 +823,10 @@ void MainWindow::on_scan_working(QString workingInfo)
#else
#else
m_wndStatusBar
->
setDeviceStatusInfo
(
workingInfo
);
m_wndStatusBar
->
setDeviceStatusInfo
(
workingInfo
);
m_dialog_log
->
add_log
(
workingInfo
,
false
);
m_dialog_log
->
add_log
(
workingInfo
,
false
);
#endif
m_dialog_log
->
setScanStatus
(
m_isScanning
);
m_dialog_log
->
setScanStatus
(
m_isScanning
);
m_dialog_log
->
updateWigetStaus
();
m_dialog_log
->
updateWigetStaus
();
m_dialog_log
->
show
();
m_dialog_log
->
show
();
#endif
set_actions_enabled
(
!
m_isScanning
);
set_actions_enabled
(
!
m_isScanning
);
}
}
...
@@ -841,6 +840,7 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
...
@@ -841,6 +840,7 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
#else
#else
if
(
err
!=
SANE_STATUS_GOOD
)
if
(
err
!=
SANE_STATUS_GOOD
)
scanFail
=
true
;
scanFail
=
true
;
m_wndStatusBar
->
setDeviceStatusInfo
(
finishInfo
);
m_dialog_log
->
add_log
(
finishInfo
,
scanFail
);
m_dialog_log
->
add_log
(
finishInfo
,
scanFail
);
m_dialog_log
->
setScanStatus
(
m_isScanning
);
m_dialog_log
->
setScanStatus
(
m_isScanning
);
m_dialog_log
->
updateWigetStaus
();
m_dialog_log
->
updateWigetStaus
();
...
@@ -852,6 +852,8 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
...
@@ -852,6 +852,8 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
m_thumb
->
addItem
(
m_scanFileName
);
m_thumb
->
addItem
(
m_scanFileName
);
m_scanFileName
.
clear
();
m_scanFileName
.
clear
();
}
}
m_dialog_log
->
setScanStatus
(
m_isScanning
);
m_dialog_log
->
updateWigetStaus
();
set_actions_enabled
(
!
m_isScanning
);
set_actions_enabled
(
!
m_isScanning
);
}
}
...
...
app/scanner/mainwindow.h
View file @
4bcadf11
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
#else
#else
#include "sane_ex/sane_ex.h"
#include "sane_ex/sane_ex.h"
#include "config.h"
#include "config.h"
#include "dialog_log.h"
#endif
#endif
#include "dialog_log.h"
#include "dialog_aquireinto.h"
#include "dialog_aquireinto.h"
#include "imgfmt/HGImgFmt.h"
#include "imgfmt/HGImgFmt.h"
...
@@ -220,6 +220,7 @@ private:
...
@@ -220,6 +220,7 @@ private:
HGImgView
*
m_view
;
HGImgView
*
m_view
;
HGImgThumb
*
m_thumb
;
HGImgThumb
*
m_thumb
;
QMenu
*
m_thumbMenu
;
QMenu
*
m_thumbMenu
;
dialog_log
*
m_dialog_log
;
#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
HGTwainDSM
m_twainDSM
;
HGTwainDSM
m_twainDSM
;
HGTwainDS
m_twainDS
;
HGTwainDS
m_twainDS
;
...
@@ -230,7 +231,6 @@ private:
...
@@ -230,7 +231,6 @@ private:
config
m_config
;
config
m_config
;
std
::
vector
<
DEVCFG
>
dev_schemes_
;
std
::
vector
<
DEVCFG
>
dev_schemes_
;
dialog_log
*
m_dialog_log
;
#endif
#endif
QString
m_currFilePath
;
QString
m_currFilePath
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment