lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加600dpi畸变测试项

This commit is contained in:
yangjiaxuan 2023-02-28 15:07:31 +08:00
parent 3e58dbcd0d
commit 52de3e1a64
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/HGProductionTool/form_maininterface.cpp
View File

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

1
app/HGProductionTool/form_maininterface.h
View File

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

7
app/HGProductionTool/form_maininterface.ui
View File

@ -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">

4
code/base/test_base.cpp
View File

@ -1003,13 +1003,13 @@ public:
Sleep(1000); Sleep(1000);
cnt++; cnt++;
} }
if (dis.h > 0 && dis.h < 10) 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;
} }