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

1）解决图像编辑侧边栏文本增强不生效的问题 

2）解决图像编辑后，不自动保存的问题
This commit is contained in:
luoliangyi 2023-07-29 16:32:35 +08:00
parent 26c59eb32d
commit 975338cb57
4 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scanner2/dialog_imgproc_adjust.cpp
View File

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

12
app/scanner2/mainwindow.cpp
View File

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

32
app/scanner2/widget_imgproc_sidebar.cpp
View File

@ -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);
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);
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<int>(arg1 * 100));
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<double>(value / 100.0));
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)
{
if (m_applyToImage)
{
emit applyToImage(m_curImage, ui->spin_brightness->value(), ui->spin_contrast->value(),
ui->dspin_gamma->value(), ui->checkBox_enhanceText->isChecked());
}
}

1
app/scanner2/widget_imgproc_sidebar.h
View File

@ -46,6 +46,7 @@ private slots:
private:
Ui::Widget_Imgproc_SideBar *ui;
bool m_applyToImage;
HGImage m_curImage;
};