区域裁切功能调整
This commit is contained in:
parent
ff106104a6
commit
ec76884594
|
@ -599,26 +599,26 @@ void hg_settingdialog::createUI()
|
||||||
if (0 == strcmp(opt->name, "tl-x"))
|
if (0 == strcmp(opt->name, "tl-x"))
|
||||||
{
|
{
|
||||||
m_cutLeftId = i + 1;
|
m_cutLeftId = i + 1;
|
||||||
m_cutLeftValue = m_list_defaultOptions.at(i).second.toInt();
|
m_cutLeftValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||||
if (opt->constraint_type == SANE_CONSTRAINT_RANGE)
|
if (opt->constraint_type == SANE_CONSTRAINT_RANGE)
|
||||||
m_cutWidth = opt->constraint.range->max;
|
m_cutWidth = SANE_UNFIX(opt->constraint.range->max);
|
||||||
}
|
}
|
||||||
else if (0 == strcmp(opt->name, "tl-y"))
|
else if (0 == strcmp(opt->name, "tl-y"))
|
||||||
{
|
{
|
||||||
m_cutTopId = i + 1;
|
m_cutTopId = i + 1;
|
||||||
m_cutTopValue = m_list_defaultOptions.at(i).second.toInt();
|
m_cutTopValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||||
if (opt->constraint_type == SANE_CONSTRAINT_RANGE)
|
if (opt->constraint_type == SANE_CONSTRAINT_RANGE)
|
||||||
m_cutHeight = opt->constraint.range->max;
|
m_cutHeight = SANE_UNFIX(opt->constraint.range->max);
|
||||||
}
|
}
|
||||||
else if (0 == strcmp(opt->name, "br-x"))
|
else if (0 == strcmp(opt->name, "br-x"))
|
||||||
{
|
{
|
||||||
m_cutRightId = i + 1;
|
m_cutRightId = i + 1;
|
||||||
m_cutRightValue = m_list_defaultOptions.at(i).second.toInt();
|
m_cutRightValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||||
}
|
}
|
||||||
else if (0 == strcmp(opt->name, "br-y"))
|
else if (0 == strcmp(opt->name, "br-y"))
|
||||||
{
|
{
|
||||||
m_cutBottomId = i + 1;
|
m_cutBottomId = i + 1;
|
||||||
m_cutBottomValue = m_list_defaultOptions.at(i).second.toInt();
|
m_cutBottomValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Utf8ToStdString(opt->title) == "分辨率")
|
if (Utf8ToStdString(opt->title) == "分辨率")
|
||||||
|
@ -637,13 +637,13 @@ void hg_settingdialog::createUI()
|
||||||
m_colorModeValue = m_list_defaultOptions.at(i).second.toString();
|
m_colorModeValue = m_list_defaultOptions.at(i).second.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Utf8ToStdString(opt->title) == "伽玛")
|
if (Utf8ToStdString(opt->title) == "伽玛" || Utf8ToStdString(opt->title) == "伽玛值")
|
||||||
{
|
{
|
||||||
unsigned int len = sizeof(SANE_Gamma);
|
unsigned int len = sizeof(SANE_Gamma);
|
||||||
sane_io_control(m_handle, IO_CTRL_CODE_GET_CUSTOM_GAMMA, &m_gammaData, &len);
|
sane_io_control(m_handle, IO_CTRL_CODE_GET_CUSTOM_GAMMA, &m_gammaData, &len);
|
||||||
|
|
||||||
QPushButton* pushButton = new QPushButton(this);
|
QPushButton* pushButton = new QPushButton(this);
|
||||||
pushButton->setText(StdStringToUtf8("伽马设置").c_str());
|
pushButton->setText(StdStringToUtf8("自定义色调曲线").c_str());
|
||||||
pushButton->setFixedWidth(120);
|
pushButton->setFixedWidth(120);
|
||||||
widget->layout()->addWidget(pushButton);
|
widget->layout()->addWidget(pushButton);
|
||||||
|
|
||||||
|
@ -967,10 +967,14 @@ void hg_settingdialog::slot_cutButtonClicked()
|
||||||
m_cutBottomValue = rcRet.bottom() / (0.03937 * m_dpiValue);
|
m_cutBottomValue = rcRet.bottom() / (0.03937 * m_dpiValue);
|
||||||
|
|
||||||
SANE_Int info;
|
SANE_Int info;
|
||||||
sane_control_option(m_handle, m_cutLeftId, SANE_ACTION_SET_VALUE, &m_cutLeftValue, &info);
|
SANE_Word value = SANE_FIX(m_cutLeftValue);
|
||||||
sane_control_option(m_handle, m_cutTopId, SANE_ACTION_SET_VALUE, &m_cutTopValue, &info);
|
sane_control_option(m_handle, m_cutLeftId, SANE_ACTION_SET_VALUE, &value, &info);
|
||||||
sane_control_option(m_handle, m_cutRightId, SANE_ACTION_SET_VALUE, &m_cutRightValue, &info);
|
value = SANE_FIX(m_cutTopValue);
|
||||||
sane_control_option(m_handle, m_cutBottomId, SANE_ACTION_SET_VALUE, &m_cutBottomValue, &info);
|
sane_control_option(m_handle, m_cutTopId, SANE_ACTION_SET_VALUE, &value, &info);
|
||||||
|
value = SANE_FIX(m_cutRightValue);
|
||||||
|
sane_control_option(m_handle, m_cutRightId, SANE_ACTION_SET_VALUE, &value, &info);
|
||||||
|
value = SANE_FIX(m_cutBottomValue);
|
||||||
|
sane_control_option(m_handle, m_cutBottomId, SANE_ACTION_SET_VALUE, &value, &info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -117,12 +117,12 @@ private:
|
||||||
int m_cutTopId;
|
int m_cutTopId;
|
||||||
int m_cutRightId;
|
int m_cutRightId;
|
||||||
int m_cutBottomId;
|
int m_cutBottomId;
|
||||||
int m_cutWidth; // 单位是毫米
|
double m_cutWidth; // 单位是毫米
|
||||||
int m_cutHeight; // 单位是毫米
|
double m_cutHeight; // 单位是毫米
|
||||||
int m_cutLeftValue; // 单位是毫米
|
double m_cutLeftValue; // 单位是毫米
|
||||||
int m_cutTopValue; // 单位是毫米
|
double m_cutTopValue; // 单位是毫米
|
||||||
int m_cutRightValue; // 单位是毫米
|
double m_cutRightValue; // 单位是毫米
|
||||||
int m_cutBottomValue; // 单位是毫米
|
double m_cutBottomValue; // 单位是毫米
|
||||||
|
|
||||||
int m_colorModeId;
|
int m_colorModeId;
|
||||||
QString m_colorModeValue;
|
QString m_colorModeValue;
|
||||||
|
|
Loading…
Reference in New Issue