diff --git a/app/scanner2/dialog_imgproc_adjust.cpp b/app/scanner2/dialog_imgproc_adjust.cpp index df1c4f22..26cb01b3 100644 --- a/app/scanner2/dialog_imgproc_adjust.cpp +++ b/app/scanner2/dialog_imgproc_adjust.cpp @@ -138,9 +138,9 @@ void Dialog_ImgProc_Adjust::on_buttonBox_accepted() saveCfgValue("adjust", "preview", ui->cbtn_preview->isChecked()); saveCfgValue("adjust", "applyImg", ui->cbtn_applyImg->isChecked()); - saveCfgValue("adjust", "brightness", m_brightness); - saveCfgValue("adjust", "contrast", m_contrast); - char gamma[32]; - sprintf(gamma, "%f", m_gamma); - saveCfgValue("adjust", "gamma", QString(gamma)); +// saveCfgValue("adjust", "brightness", m_brightness); +// saveCfgValue("adjust", "contrast", m_contrast); +// char gamma[32]; +// sprintf(gamma, "%f", m_gamma); +// saveCfgValue("adjust", "gamma", QString(gamma)); } diff --git a/app/scanner2/widget_imgproc_sidebar.cpp b/app/scanner2/widget_imgproc_sidebar.cpp index cae27b6e..59b0f01a 100644 --- a/app/scanner2/widget_imgproc_sidebar.cpp +++ b/app/scanner2/widget_imgproc_sidebar.cpp @@ -84,7 +84,22 @@ 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))); + + on_pbtn_restoreDefault_clicked(); + ui->slider_brightness->setValue(0); + ui->slider_contrast->setValue(0); + ui->slider_gamma->setValue(0); + 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() diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp index 4df22359..70fbeda0 100644 --- a/modules/twainui/hg_settingdialog.cpp +++ b/modules/twainui/hg_settingdialog.cpp @@ -2785,7 +2785,6 @@ void hg_settingdialog::updateSchemeFromUi(gb::sane_config_schm* schm) SANE_Fixed init = 0; m_saneAPI.sane_control_option_api(m_devHandle, i, SANE_ACTION_GET_VALUE, &init, &method); - float vv = SANE_UNFIX(init); schm->config_changed(i, (char*)&init, sizeof(init)); } else if (opt->type == SANE_TYPE_BOOL)