From 975338cb572747e746dfa31b604f25cca046c26f Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Sat, 29 Jul 2023 16:32:35 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=89=E8=A7=A3=E5=86=B3=E5=9B=BE=E5=83=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202=EF=BC=89=E8=A7=A3=E5=86=B3=E5=9B=BE=E5=83=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8E=EF=BC=8C=E4=B8=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner2/dialog_imgproc_adjust.cpp | 8 ++--- app/scanner2/mainwindow.cpp | 12 +++++++ app/scanner2/widget_imgproc_sidebar.cpp | 44 ++++++++++++++----------- app/scanner2/widget_imgproc_sidebar.h | 1 + 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/app/scanner2/dialog_imgproc_adjust.cpp b/app/scanner2/dialog_imgproc_adjust.cpp index 26cb01b3..4ab1507a 100644 --- a/app/scanner2/dialog_imgproc_adjust.cpp +++ b/app/scanner2/dialog_imgproc_adjust.cpp @@ -20,12 +20,12 @@ Dialog_ImgProc_Adjust::Dialog_ImgProc_Adjust(HGImage img, QWidget *parent) : ui->view_before->addImage(img); ui->view_after->addImage(img); - m_brightness = getCfgValue("adjust", "brightness", 0); + m_brightness = 0;//getCfgValue("adjust", "brightness", 0); m_base_widget->setBrightness(m_brightness); - m_contrast = getCfgValue("adjust", "contrast", 0); + m_contrast = 0;//getCfgValue("adjust", "contrast", 0); m_base_widget->setContrast(m_contrast); - QString gamma = getCfgValue("adjust", "gamma", QString("1.0")); - m_gamma = atof(gamma.toStdString().c_str()); + //QString gamma = getCfgValue("adjust", "gamma", QString("1.0")); + m_gamma = 1.0;//atof(gamma.toStdString().c_str()); m_base_widget->setGamma(m_gamma); ui->cbtn_preview->setChecked(getCfgValue("adjust", "preview", false)); diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 6211922c..2f17235f 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -1357,6 +1357,18 @@ void MainWindow::on_dialog_sideBar_finish(bool ok) m_modify = ok; m_bSideEditing = false; updateActionStatus(); + if (ok) + { + HGImage image = nullptr; + m_view->getImage(&image); + m_widget_sideBar->setImage(image); + + if (auto_save_changes_) + { + on_act_save_triggered(); + } + } + m_widget_sideBar->enableUI(false); emit m_pbtn_push->clicked(); } diff --git a/app/scanner2/widget_imgproc_sidebar.cpp b/app/scanner2/widget_imgproc_sidebar.cpp index 59b0f01a..22c9a037 100644 --- a/app/scanner2/widget_imgproc_sidebar.cpp +++ b/app/scanner2/widget_imgproc_sidebar.cpp @@ -7,6 +7,7 @@ Widget_Imgproc_SideBar::Widget_Imgproc_SideBar(QWidget *parent) : QWidget(parent), ui(new Ui::Widget_Imgproc_SideBar) + , m_applyToImage(true) , m_curImage(NULL) { ui->setupUi(this); @@ -28,6 +29,7 @@ Widget_Imgproc_SideBar::~Widget_Imgproc_SideBar() void Widget_Imgproc_SideBar::setImage(HGImage image) { HGBase_DestroyImage(m_curImage); + m_curImage = nullptr; HGBase_CloneImage(image, 0, 0, &m_curImage); on_pbtn_restoreDefault_clicked(); } @@ -49,29 +51,41 @@ void Widget_Imgproc_SideBar::paintEvent(QPaintEvent *e) void Widget_Imgproc_SideBar::on_spin_brightness_valueChanged(int arg1) { ui->slider_brightness->setValue(arg1); - emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), - ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked()); + if (m_applyToImage) + { + emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), + ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked()); + } } void Widget_Imgproc_SideBar::on_spin_contrast_valueChanged(int arg1) { ui->slider_contrast->setValue(arg1); - emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), + if (m_applyToImage) + { + emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked()); + } } void Widget_Imgproc_SideBar::on_dspin_gamma_valueChanged(double arg1) { ui->slider_gamma->setValue(static_cast(arg1 * 100)); - emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), + if (m_applyToImage) + { + emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked()); + } } void Widget_Imgproc_SideBar::on_slider_gamma_valueChanged(int value) { ui->dspin_gamma->setValue(static_cast(value / 100.0)); - emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), + if (m_applyToImage) + { + emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked()); + } } void Widget_Imgproc_SideBar::on_pbtn_restoreDefault_clicked() @@ -84,22 +98,11 @@ void Widget_Imgproc_SideBar::on_pbtn_restoreDefault_clicked() void Widget_Imgproc_SideBar::on_pbtn_ok_clicked() { - disconnect(ui->spin_brightness, SIGNAL(valueChanged(int)), this, SLOT(on_spin_brightness_valueChanged(int))); - disconnect(ui->spin_contrast, SIGNAL(valueChanged(int)), this, SLOT(on_spin_contrast_valueChanged(int))); - disconnect(ui->dspin_gamma, SIGNAL(valueChanged(double)), this, SLOT(on_dspin_gamma_valueChanged(double))); - disconnect(ui->slider_gamma, SIGNAL(valueChanged(int)), this, SLOT(on_slider_gamma_valueChanged(int))); - + m_applyToImage = false; on_pbtn_restoreDefault_clicked(); - ui->slider_brightness->setValue(0); - ui->slider_contrast->setValue(0); - ui->slider_gamma->setValue(0); + m_applyToImage = true; emit finish(true); - - connect(ui->spin_brightness, SIGNAL(valueChanged(int)), this, SLOT(on_spin_brightness_valueChanged(int))); - connect(ui->spin_contrast, SIGNAL(valueChanged(int)), this, SLOT(on_spin_contrast_valueChanged(int))); - connect(ui->dspin_gamma, SIGNAL(valueChanged(double)), this, SLOT(on_dspin_gamma_valueChanged(double))); - connect(ui->slider_gamma, SIGNAL(valueChanged(int)), this, SLOT(on_slider_gamma_valueChanged(int))); } void Widget_Imgproc_SideBar::on_pbtn_cancel_clicked() @@ -110,6 +113,9 @@ void Widget_Imgproc_SideBar::on_pbtn_cancel_clicked() void Widget_Imgproc_SideBar::on_checkBox_enhanceText_toggled(bool checked) { - emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), + if (m_applyToImage) + { + emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(), ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked()); + } } diff --git a/app/scanner2/widget_imgproc_sidebar.h b/app/scanner2/widget_imgproc_sidebar.h index 2936c206..8011baec 100644 --- a/app/scanner2/widget_imgproc_sidebar.h +++ b/app/scanner2/widget_imgproc_sidebar.h @@ -46,6 +46,7 @@ private slots: private: Ui::Widget_Imgproc_SideBar *ui; + bool m_applyToImage; HGImage m_curImage; };