From e6518049921760a63a4843d9c6446b5713fed35e Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 31 Jul 2023 10:05:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E5=88=B0ocr-pdf=E7=9A=84tif=E5=8E=8B=E7=BC=A9=E7=8E=87?=
=?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=9B=BE=E5=83=8F=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/scanner2/mainwindow.cpp | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp
index 2f17235f..ca6b6382 100644
--- a/app/scanner2/mainwindow.cpp
+++ b/app/scanner2/mainwindow.cpp
@@ -1092,6 +1092,13 @@ void MainWindow::on_newImage(void *image)
saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_JPEG;
}
+ if (m_aquireIntoSaveParam.m_isOcr)
+ {
+ saveInfo.jpegQuality = 100;
+ saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_NONE;
+ saveInfo.tiffJpegQuality = 100;
+ }
+
if (HGBASE_ERR_OK == HGImgFmt_SaveImageToWriter(m_scanImgFmtWriter, (HGImage)image, &saveInfo))
{
++m_aquireIntoMultiPageCount;
@@ -1192,7 +1199,13 @@ void MainWindow::on_newImage(void *image)
HGUInt fmtType = 0;
if (m_aquireIntoSaveParam.m_isOcr)
+ {
fmtType = HGIMGFMT_TYPE_TIFF;
+ saveInfo.jpegQuality = 100;
+ saveInfo.tiffCompression = HGIMGFMT_TIFFCOMP_NONE;
+ saveInfo.tiffJpegQuality = 100;
+ }
+
if (HGBASE_ERR_OK == HGImgFmt_SaveImage((HGImage)image, fmtType, &saveInfo, getStdString(m_scanFileName).c_str()))
{
emit post_new_image(m_scanFileName);
From 492bc7fe2c39f75e19fbd30a3343b1354121932e Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 31 Jul 2023 10:58:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E5=88=B0=E5=92=8C=E4=BE=A7=E8=BE=B9=E6=A0=8F=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=A4=A7=E5=B0=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8F=A6=E5=AD=98?=
=?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4pdf=E5=8E=8B=E7=BC=A9=E8=A2=AB?=
=?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/scanner2/dialog_aquireinto.ui | 14 +-
app/scanner2/dialog_saveas.cpp | 2 +-
app/scanner2/widget_imgproc_sidebar.ui | 681 +++++++++++++------------
3 files changed, 361 insertions(+), 336 deletions(-)
diff --git a/app/scanner2/dialog_aquireinto.ui b/app/scanner2/dialog_aquireinto.ui
index 42d016ca..c3fe1876 100644
--- a/app/scanner2/dialog_aquireinto.ui
+++ b/app/scanner2/dialog_aquireinto.ui
@@ -6,8 +6,8 @@
0
0
- 707
- 398
+ 746
+ 413
@@ -28,16 +28,22 @@
-
+
+
+ 250
+ 0
+
+
- 211
+ 300
16777215
configuration scheme management
-
+
-
diff --git a/app/scanner2/dialog_saveas.cpp b/app/scanner2/dialog_saveas.cpp
index 206adf3f..e0e26bda 100644
--- a/app/scanner2/dialog_saveas.cpp
+++ b/app/scanner2/dialog_saveas.cpp
@@ -122,7 +122,7 @@ Dialog_SaveAs::Dialog_SaveAs(bool isSaveAs, QWidget *parent) :
else if (m_suffix < 0)
m_suffix = 0;
ui->fileDialog->selectNameFilter(ui->fileDialog->nameFilters().at(m_suffix));
- ui->btn_option->setEnabled(0 == m_suffix || 6 == m_suffix);
+ ui->btn_option->setEnabled(0 == m_suffix || 6 == m_suffix || 7 == m_suffix);
ui->cbox_subFolder->setChecked(false);
ui->cbox_subFolder->setChecked(getCfgValue("saveAs", "subFolderByTime", false));
diff --git a/app/scanner2/widget_imgproc_sidebar.ui b/app/scanner2/widget_imgproc_sidebar.ui
index a3ef4767..19019db7 100644
--- a/app/scanner2/widget_imgproc_sidebar.ui
+++ b/app/scanner2/widget_imgproc_sidebar.ui
@@ -6,342 +6,361 @@
0
0
- 220
- 376
+ 236
+ 372
Form
-
-
-
- 60
- 340
- 75
- 23
-
-
-
- Ok
-
-
-
-
-
- 140
- 340
- 75
- 23
-
-
-
- Cancel
-
-
-
-
-
- 10
- 250
- 143
- 22
-
-
-
-
-
-
-
- Enhance Text
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
- 10
- 10
- 201
- 71
-
-
-
- Brightness
-
-
-
-
- 10
- 35
- 121
- 27
-
-
-
-
- 121
- 27
-
-
-
- -255
-
-
- 255
-
-
- 0
-
-
- false
-
-
- Qt::Horizontal
-
-
- QSlider::TicksAbove
-
-
- 32
-
-
-
-
-
- 140
- 40
- 51
- 20
-
-
-
-
- 0
- 0
-
-
-
-
- 51
- 20
-
-
-
- -255
-
-
- 255
-
-
- 0
-
-
- 10
-
-
-
-
-
-
- 10
- 170
- 201
- 71
-
-
-
- Gamma correction
-
-
-
-
- 10
- 35
- 121
- 27
-
-
-
-
- 121
- 27
-
-
-
- 1
-
-
- 500
-
-
- 100
-
-
- false
-
-
- Qt::Horizontal
-
-
- QSlider::TicksAbove
-
-
- 25
-
-
-
-
-
- 140
- 40
- 51
- 20
-
-
-
-
- 0
- 0
-
-
-
-
- 51
- 20
-
-
-
- 0.010000000000000
-
-
- 5.000000000000000
-
-
- 0.010000000000000
-
-
- 1.000000000000000
-
-
-
-
-
-
- 10
- 90
- 201
- 71
-
-
-
- Contrast
-
-
-
-
- 10
- 34
- 121
- 27
-
-
-
-
- 121
- 27
-
-
-
- -127
-
-
- 127
-
-
- 0
-
-
- false
-
-
- Qt::Horizontal
-
-
- false
-
-
- false
-
-
- QSlider::TicksAbove
-
-
- 16
-
-
-
-
-
- 140
- 40
- 51
- 20
-
-
-
-
- 0
- 0
-
-
-
-
- 51
- 20
-
-
-
- -127
-
-
- 127
-
-
- 0
-
-
- 10
-
-
-
-
-
-
- 10
- 290
- 104
- 23
-
-
-
- Restore defaults
-
-
+
+ -
+
+
+ Brightness
+
+
+
-
+
+
+
+ 121
+ 0
+
+
+
+
+ 121
+ 27
+
+
+
+ -255
+
+
+ 255
+
+
+ 0
+
+
+ false
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksAbove
+
+
+ 32
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ -255
+
+
+ 255
+
+
+ 0
+
+
+ 10
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 10
+ 20
+
+
+
+
+
+
+
+ -
+
+
+ Contrast
+
+
+
-
+
+
+
+ 121
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ -127
+
+
+ 127
+
+
+ 0
+
+
+ false
+
+
+ Qt::Horizontal
+
+
+ false
+
+
+ false
+
+
+ QSlider::TicksAbove
+
+
+ 16
+
+
+
+ -
+
+
+
+ 51
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ -127
+
+
+ 127
+
+
+ 0
+
+
+ 10
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 9
+ 20
+
+
+
+
+
+
+
+ -
+
+
+ Gamma correction
+
+
+
-
+
+
+
+ 121
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ 1
+
+
+ 500
+
+
+ 100
+
+
+ false
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksAbove
+
+
+ 25
+
+
+
+ -
+
+
+
+ 51
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ 0.010000000000000
+
+
+ 5.000000000000000
+
+
+ 0.010000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 9
+ 20
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Enhance Text
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Restore defaults
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Ok
+
+
+
+ -
+
+
+ Cancel
+
+
+
+
+
+
From ded3c5e27d1b05d865e21bcf80b065e81de1e5bc Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Mon, 31 Jul 2023 11:32:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/scanner2/dialog_aquireinto.ui | 6 +++---
app/scanner2/widget_imgproc_sidebar.ui | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/scanner2/dialog_aquireinto.ui b/app/scanner2/dialog_aquireinto.ui
index c3fe1876..6aa4d1e7 100644
--- a/app/scanner2/dialog_aquireinto.ui
+++ b/app/scanner2/dialog_aquireinto.ui
@@ -6,8 +6,8 @@
0
0
- 746
- 413
+ 895
+ 616
@@ -30,7 +30,7 @@
- 250
+ 240
0
diff --git a/app/scanner2/widget_imgproc_sidebar.ui b/app/scanner2/widget_imgproc_sidebar.ui
index 19019db7..429ab3a9 100644
--- a/app/scanner2/widget_imgproc_sidebar.ui
+++ b/app/scanner2/widget_imgproc_sidebar.ui
@@ -6,8 +6,8 @@
0
0
- 236
- 372
+ 255
+ 422