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; };