From 7117b9317d7565a5c29978deac09ab69415a23c2 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 28 Jun 2023 14:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/twainui/hg_settingdialog.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp index 4ad4b75e..1443604f 100644 --- a/modules/twainui/hg_settingdialog.cpp +++ b/modules/twainui/hg_settingdialog.cpp @@ -1380,15 +1380,18 @@ void hg_settingdialog::slot_gammaButtonClicked() dev_que::set_custom_gamma(&m_saneAPI, m_devHandle, &m_gammaData); cur_scheme_->config_changed(SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA, (char*)&m_gammaData, sizeof(m_gammaData), true); - HGSize length = 0; - HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), NULL, &length); - HGByte* base64Str = new HGByte[length + 1]; - HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), base64Str, &length); - base64Str[length] = 0; + if (comb_->currentIndex() == 0) + { + HGSize length = 0; + HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), NULL, &length); + HGByte* base64Str = new HGByte[length + 1]; + HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), base64Str, &length); + base64Str[length] = 0; - QString value = QString::fromStdString((char*)base64Str); - saveDefaultCfgValue("default", "gamma", value); - delete[] base64Str; + QString value = QString::fromStdString((const char*)base64Str); + saveDefaultCfgValue("default", "curves", value); + delete[] base64Str; + } } } @@ -2342,9 +2345,9 @@ void hg_settingdialog::updateDefaultScheme() double value = getDefaultCfgValue("default", "cutBottomvalue", QString("")).toDouble(); m_cutBottomValue = value; } - if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA) && searchKeyName("default", "gamma")) + if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA) && searchKeyName("default", "curves")) { - QString value = getDefaultCfgValue("default", "gamma", QString("")); + QString value = getDefaultCfgValue("default", "curves", QString("")); if (!value.isEmpty()) { HGSize length = 0;