lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev

This commit is contained in:
luoliangyi 2023-07-31 13:48:06 +08:00
parent fd58145fff ded3c5e27d
commit 31c358cc1b
4 changed files with 374 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/scanner2/dialog_aquireinto.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>707</width>
<height>398</height>
<width>895</width>
<height>616</height>
</rect>
</property>
<property name="sizePolicy">
@ -28,16 +28,22 @@
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="minimumSize">
<size>
<width>240</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>211</width>
<width>300</width>
<height>16777215</height>
</size>
</property>
<property name="title">
<string>configuration scheme management</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0,0,0,0">
<item>
<widget class="QLabel" name="label">
<property name="text">

2
app/scanner2/dialog_saveas.cpp
View File

@ -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));

13
app/scanner2/mainwindow.cpp
View File

@ -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);

681
app/scanner2/widget_imgproc_sidebar.ui
View File

@ -6,342 +6,361 @@
<rect>
<x>0</x>
<y>0</y>
<width>220</width>
<height>376</height>
<width>255</width>
<height>422</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QPushButton" name="pbtn_ok">
<property name="geometry">
<rect>
<x>60</x>
<y>340</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Ok</string>
</property>
</widget>
<widget class="QPushButton" name="pbtn_cancel">
<property name="geometry">
<rect>
<x>140</x>
<y>340</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>143</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QCheckBox" name="checkBox_enhanceText">
<property name="text">
<string>Enhance Text</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="gbox_brightness">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>201</width>
<height>71</height>
</rect>
</property>
<property name="title">
<string>Brightness</string>
</property>
<widget class="QSlider" name="slider_brightness">
<property name="geometry">
<rect>
<x>10</x>
<y>35</y>
<width>121</width>
<height>27</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>121</width>
<height>27</height>
</size>
</property>
<property name="minimum">
<number>-255</number>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>32</number>
</property>
</widget>
<widget class="QSpinBox" name="spin_brightness">
<property name="geometry">
<rect>
<x>140</x>
<y>40</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>51</width>
<height>20</height>
</size>
</property>
<property name="minimum">
<number>-255</number>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="gbox_gamma">
<property name="geometry">
<rect>
<x>10</x>
<y>170</y>
<width>201</width>
<height>71</height>
</rect>
</property>
<property name="title">
<string>Gamma correction</string>
</property>
<widget class="QSlider" name="slider_gamma">
<property name="geometry">
<rect>
<x>10</x>
<y>35</y>
<width>121</width>
<height>27</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>121</width>
<height>27</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>500</number>
</property>
<property name="value">
<number>100</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>25</number>
</property>
</widget>
<widget class="QDoubleSpinBox" name="dspin_gamma">
<property name="geometry">
<rect>
<x>140</x>
<y>40</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>51</width>
<height>20</height>
</size>
</property>
<property name="minimum">
<double>0.010000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="gbox_contrast">
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<width>201</width>
<height>71</height>
</rect>
</property>
<property name="title">
<string>Contrast</string>
</property>
<widget class="QSlider" name="slider_contrast">
<property name="geometry">
<rect>
<x>10</x>
<y>34</y>
<width>121</width>
<height>27</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>121</width>
<height>27</height>
</size>
</property>
<property name="minimum">
<number>-127</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>16</number>
</property>
</widget>
<widget class="QSpinBox" name="spin_contrast">
<property name="geometry">
<rect>
<x>140</x>
<y>40</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>51</width>
<height>20</height>
</size>
</property>
<property name="minimum">
<number>-127</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</widget>
<widget class="QPushButton" name="pbtn_restoreDefault">
<property name="geometry">
<rect>
<x>10</x>
<y>290</y>
<width>104</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Restore defaults</string>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="gbox_brightness">
<property name="title">
<string>Brightness</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSlider" name="slider_brightness">
<property name="minimumSize">
<size>
<width>121</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>121</width>
<height>27</height>
</size>
</property>
<property name="minimum">
<number>-255</number>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>32</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spin_brightness">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>-255</number>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gbox_contrast">
<property name="title">
<string>Contrast</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QSlider" name="slider_contrast">
<property name="minimumSize">
<size>
<width>121</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>-127</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>16</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spin_contrast">
<property name="minimumSize">
<size>
<width>51</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>-127</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>9</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gbox_gamma">
<property name="title">
<string>Gamma correction</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QSlider" name="slider_gamma">
<property name="minimumSize">
<size>
<width>121</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>500</number>
</property>
<property name="value">
<number>100</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>25</number>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dspin_gamma">
<property name="minimumSize">
<size>
<width>51</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<double>0.010000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>9</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QCheckBox" name="checkBox_enhanceText">
<property name="text">
<string>Enhance Text</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pbtn_restoreDefault">
<property name="text">
<string>Restore defaults</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pbtn_ok">
<property name="text">
<string>Ok</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbtn_cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>