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
6f280095
Commit
6f280095
authored
Apr 19, 2022
by
yangjiaxuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整扫描开始和结束部分的宏定义
parent
9dbdf178
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
app/scanner/dialog_log.cpp
app/scanner/dialog_log.cpp
+1
-0
app/scanner/mainwindow.cpp
app/scanner/mainwindow.cpp
+11
-3
No files found.
app/scanner/dialog_log.cpp
View file @
6f280095
...
...
@@ -146,6 +146,7 @@ void dialog_log::on_flag_changed(void)
void
dialog_log
::
closeEvent
(
QCloseEvent
*
event
)
{
flag_
=
0
;
slot_stop
();
}
void
dialog_log
::
slot_stop
(
void
)
{
...
...
app/scanner/mainwindow.cpp
View file @
6f280095
...
...
@@ -791,15 +791,25 @@ void MainWindow::on_new_image(void *img)
void
MainWindow
::
on_scan_working
()
{
m_wndStatusBar
->
setDeviceStatusInfo
(
tr
(
"scan starting..."
));
#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
//
#else
m_dialog_log
->
add_log
(
tr
(
"scan starting..."
),
false
);
m_dialog_log
->
add_flag
(
INFO_DLG_FLAG_PROGRESS
);
m_dialog_log
->
show
();
#endif
m_wndStatusBar
->
setDeviceStatusInfo
(
tr
(
"scan starting..."
));
set_actions_enabled
(
false
);
}
void
MainWindow
::
on_scan_finish
()
{
#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
//
#else
m_dialog_log
->
add_log
(
tr
(
"scan finished"
),
false
);
m_dialog_log
->
remove_flag
(
INFO_DLG_FLAG_PROGRESS
);
#endif
if
(
nullptr
!=
m_scanImgFmtWriter
)
{
HGImgFmt_CloseImageWriter
(
m_scanImgFmtWriter
);
...
...
@@ -808,8 +818,6 @@ void MainWindow::on_scan_finish()
m_scanFileName
.
clear
();
}
m_wndStatusBar
->
setDeviceStatusInfo
(
tr
(
"scan finished"
));
m_dialog_log
->
add_log
(
tr
(
"scan finished"
),
false
);
m_dialog_log
->
remove_flag
(
INFO_DLG_FLAG_PROGRESS
);
set_actions_enabled
(
true
);
}
...
...
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