Compare commits
3 Commits
c7cb29b001
...
52de3e1a64
Author | SHA1 | Date |
---|---|---|
yangjiaxuan | 52de3e1a64 | |
13038267101 | 3e58dbcd0d | |
13038267101 | b596bcdb43 |
|
@ -36,6 +36,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
|
||||||
, m_curDpi(0)
|
, m_curDpi(0)
|
||||||
, m_distortion_200dpi(0.0)
|
, m_distortion_200dpi(0.0)
|
||||||
, m_distortion_300dpi(0.0)
|
, m_distortion_300dpi(0.0)
|
||||||
|
, m_distortion_600dpi(0.0)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
@ -198,7 +199,8 @@ void Form_mainInterface::on_testDistortion(SANE_DISTORTION_VAL data)
|
||||||
ui->label_destortionInfo_200dpi->setVisible(true);
|
ui->label_destortionInfo_200dpi->setVisible(true);
|
||||||
ui->label_destortionInfo_300dpi->setVisible(true);
|
ui->label_destortionInfo_300dpi->setVisible(true);
|
||||||
|
|
||||||
ui->label_imgInfo->setText(tr("image pixel: ") + QString::number(data.w > 0 ? data.w : 0.0, 'f') + " * " + QString::number(data.h > 0 ? data.h : 0.0, 'f'));
|
ui->label_imgInfo->setText(tr("image pixel: ") + QString::number((data.w > 0 && data.w < 9999) ? data.w : 0.0, 'f') +
|
||||||
|
" * " + QString::number((data.h > 0 && data.h < 9999) ? data.h : 0.0, 'f'));
|
||||||
if (200 == m_curDpi)
|
if (200 == m_curDpi)
|
||||||
{
|
{
|
||||||
m_distortion_200dpi = data.scaleXY > 0 ? data.scaleXY : 0;
|
m_distortion_200dpi = data.scaleXY > 0 ? data.scaleXY : 0;
|
||||||
|
@ -219,6 +221,16 @@ void Form_mainInterface::on_testDistortion(SANE_DISTORTION_VAL data)
|
||||||
m_hg->setDistortValue(m_distortion_300dpi);
|
m_hg->setDistortValue(m_distortion_300dpi);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (600 == m_curDpi)
|
||||||
|
{
|
||||||
|
m_distortion_600dpi = data.scaleXY > 0 ? data.scaleXY : 0;
|
||||||
|
ui->label_destortionInfo_600dpi->setText(" 600dpi" + tr("destortion value: ") + QString::number(m_distortion_600dpi, 'f'));
|
||||||
|
|
||||||
|
if (m_hg != nullptr)
|
||||||
|
{
|
||||||
|
m_hg->setDistortValue(m_distortion_600dpi);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// updateImgPixelInfo();
|
// updateImgPixelInfo();
|
||||||
|
|
||||||
|
|
|
@ -126,6 +126,7 @@ private:
|
||||||
int m_curDpi;
|
int m_curDpi;
|
||||||
double m_distortion_200dpi;
|
double m_distortion_200dpi;
|
||||||
double m_distortion_300dpi;
|
double m_distortion_300dpi;
|
||||||
|
double m_distortion_600dpi;
|
||||||
QStringList m_list_images;
|
QStringList m_list_images;
|
||||||
|
|
||||||
QMap<QString, AnalysisJson::json_node> m_map_title_name;
|
QMap<QString, AnalysisJson::json_node> m_map_title_name;
|
||||||
|
|
|
@ -210,6 +210,13 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label_destortionInfo_600dpi">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_4">
|
<spacer name="horizontalSpacer_4">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|
|
@ -510,19 +510,6 @@ public:
|
||||||
{
|
{
|
||||||
helper->register_sane_callback(sane_ex_callback, NULL);
|
helper->register_sane_callback(sane_ex_callback, NULL);
|
||||||
init_test_map_();
|
init_test_map_();
|
||||||
std::string fw1(get_firmware_version());
|
|
||||||
if (fw1.size() > 5)
|
|
||||||
{
|
|
||||||
if ("G1" == fw1.substr(0, 2))
|
|
||||||
fw_ = 1;
|
|
||||||
else if ("G2" == fw1.substr(0, 2))
|
|
||||||
fw_ = 2;
|
|
||||||
else if ("G3" == fw1.substr(0, 2))
|
|
||||||
fw_ = 3;
|
|
||||||
else if ("G4" == fw1.substr(0, 2))
|
|
||||||
fw_ = 4;
|
|
||||||
}
|
|
||||||
int a = 0;
|
|
||||||
}
|
}
|
||||||
~test()
|
~test()
|
||||||
{}
|
{}
|
||||||
|
@ -574,6 +561,23 @@ public:
|
||||||
int set_test(const wchar_t* name,const wchar_t* oper)
|
int set_test(const wchar_t* name,const wchar_t* oper)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if (wcscmp(name, HGPDTTOOLDB_NAME_SET_JSON_SN) == 0
|
||||||
|
|| wcscmp(name, HGPDTTOOLDB_NAME_GET_DEVICE_CONFIG) == 0
|
||||||
|
|| wcscmp(name, HGPDTTOOLDB_NAME_CONFIGURE_SPEED_MODE) == 0)
|
||||||
|
{
|
||||||
|
std::string fw1(get_firmware_version());
|
||||||
|
if (fw1.empty())
|
||||||
|
{
|
||||||
|
if ("G1" == fw1.substr(0, 2))
|
||||||
|
fw_ = 1;
|
||||||
|
else if ("G2" == fw1.substr(0, 2))
|
||||||
|
fw_ = 2;
|
||||||
|
else if ("G3" == fw1.substr(0, 2))
|
||||||
|
fw_ = 3;
|
||||||
|
else if ("G4" == fw1.substr(0, 2))
|
||||||
|
fw_ = 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!name)
|
if (!name)
|
||||||
return SCANNER_ERR_NO_DATA;
|
return SCANNER_ERR_NO_DATA;
|
||||||
set_test_name_ = name;
|
set_test_name_ = name;
|
||||||
|
@ -988,24 +992,24 @@ public:
|
||||||
SANE_DISTORTION_VAL dis = { 0 };
|
SANE_DISTORTION_VAL dis = { 0 };
|
||||||
while (ret == SCANNER_ERR_OK)
|
while (ret == SCANNER_ERR_OK)
|
||||||
{
|
{
|
||||||
if (is_distortion_get_image )
|
if (is_distortion_get_image)
|
||||||
{
|
{
|
||||||
ret = helper_->io_control(IO_CTRL_CODE_GET_DISTORTION_CHECK_VAL, &dis, &llen);
|
ret = helper_->io_control(IO_CTRL_CODE_GET_DISTORTION_CHECK_VAL, &dis, &llen);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (cnt == 10)
|
else if (cnt == 30)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
Sleep(1000);
|
Sleep(1000);
|
||||||
cnt++;
|
cnt++;
|
||||||
}
|
}
|
||||||
if (dis.h > 0)
|
if (dis.h > 0 && dis.scaleXY < 10)
|
||||||
{
|
{
|
||||||
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_DISTORTION_VAL, (void *)&dis, true);
|
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_DISTORTION_VAL, (void *)&dis, true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_DISTORTION_VAL,(void*)L"自动计算畸变值获取失败", false);
|
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT,(void*)L"自动计算畸变值获取失败", false);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue