更新生产工具翻译,更新测试项
This commit is contained in:
parent
eb837ff167
commit
c231cc8913
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -6,42 +6,164 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>557</width>
|
||||
<height>351</height>
|
||||
<width>728</width>
|
||||
<height>474</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>557</width>
|
||||
<height>351</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>557</width>
|
||||
<height>351</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<widget class="QLineEdit" name="lineEdit_account">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>30</y>
|
||||
<width>191</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab_login">
|
||||
<attribute name="title">
|
||||
<string>Login</string>
|
||||
</attribute>
|
||||
</widget>
|
||||
<widget class="QRadioButton" name="radioButton_station3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>500</x>
|
||||
<y>300</y>
|
||||
<width>151</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>station3</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="checkBox_showPswd">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>470</x>
|
||||
<y>90</y>
|
||||
<width>111</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>show password</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" name="comboBox_deviceType">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>190</x>
|
||||
<y>150</y>
|
||||
<width>271</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="lineEdit_password">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>90</y>
|
||||
<width>191</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_deviceConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>90</x>
|
||||
<y>210</y>
|
||||
<width>91</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>device config:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="pbtn_register">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>400</x>
|
||||
<y>370</y>
|
||||
<width>75</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Register</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton" name="radioButton_station2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>280</x>
|
||||
<y>300</y>
|
||||
<width>141</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>station2</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" name="comboBox_deviceConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>190</x>
|
||||
<y>210</y>
|
||||
<width>271</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_user">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>180</x>
|
||||
<y>30</y>
|
||||
<width>48</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>account:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_deviceType">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>90</x>
|
||||
<y>150</y>
|
||||
<width>81</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>device type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_password">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>180</x>
|
||||
<y>90</y>
|
||||
<width>54</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>password:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton" name="radioButton_station1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>40</x>
|
||||
<y>220</y>
|
||||
<x>100</x>
|
||||
<y>300</y>
|
||||
<width>131</width>
|
||||
<height>20</height>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
|
@ -51,37 +173,50 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton" name="radioButton_station2">
|
||||
<widget class="QPushButton" name="pushButton_viewDirectory">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>190</x>
|
||||
<y>220</y>
|
||||
<width>141</width>
|
||||
<height>21</height>
|
||||
<x>490</x>
|
||||
<y>150</y>
|
||||
<width>151</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>station2</string>
|
||||
<string>view directory</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton" name="radioButton_station3">
|
||||
<widget class="QCheckBox" name="checkBox_rememberPswd">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>340</x>
|
||||
<y>220</y>
|
||||
<width>151</width>
|
||||
<height>21</height>
|
||||
<x>470</x>
|
||||
<y>30</y>
|
||||
<width>131</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>station3</string>
|
||||
<string>remember password</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="pushButton_updateConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>490</x>
|
||||
<y>210</y>
|
||||
<width>151</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>update connfig</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="pbtn_login">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<y>260</y>
|
||||
<x>230</x>
|
||||
<y>370</y>
|
||||
<width>75</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
|
@ -96,167 +231,6 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="pbtn_register">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>280</x>
|
||||
<y>260</y>
|
||||
<width>75</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Register</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="checkBox_showPswd">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>380</x>
|
||||
<y>80</y>
|
||||
<width>111</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>show password</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="lineEdit_account">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>140</x>
|
||||
<y>30</y>
|
||||
<width>191</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="checkBox_rememberPswd">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>380</x>
|
||||
<y>60</y>
|
||||
<width>131</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>remember password</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_user">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>70</x>
|
||||
<y>30</y>
|
||||
<width>48</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>account:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="lineEdit_password">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>140</x>
|
||||
<y>70</y>
|
||||
<width>191</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_password">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>70</x>
|
||||
<y>70</y>
|
||||
<width>54</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>password:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_deviceType">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>50</x>
|
||||
<y>130</y>
|
||||
<width>81</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>device type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" name="comboBox_deviceType">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>140</x>
|
||||
<y>130</y>
|
||||
<width>271</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_deviceConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>40</x>
|
||||
<y>170</y>
|
||||
<width>91</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>device config:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" name="comboBox_deviceConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>140</x>
|
||||
<y>170</y>
|
||||
<width>271</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="pushButton_viewDirectory">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>420</x>
|
||||
<y>150</y>
|
||||
<width>91</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>view directory</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="pushButton_updateConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>420</x>
|
||||
<y>180</y>
|
||||
<width>91</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>update connfig</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
|
|
@ -748,6 +748,18 @@ QString Form_mainInterface::getDevPid()
|
|||
return QString::fromStdString(buf);
|
||||
}
|
||||
|
||||
QString Form_mainInterface::getDevSn()
|
||||
{
|
||||
std::string serialNum;
|
||||
unsigned int serialNumLen = 0;
|
||||
if(SANE_STATUS_NO_MEM == sane_io_control(m_handle, IO_CTRL_CODE_GET_SERIAL, nullptr, &serialNumLen) && serialNumLen)
|
||||
{
|
||||
serialNum.resize(serialNumLen);
|
||||
sane_io_control(m_handle, IO_CTRL_CODE_GET_SERIAL, &serialNum[0], &serialNumLen);
|
||||
}
|
||||
return QString::fromStdString(serialNum.c_str());
|
||||
}
|
||||
|
||||
int Form_mainInterface::getRollerNum()
|
||||
{
|
||||
SANE_Int rollCount = 0;
|
||||
|
@ -919,6 +931,11 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
|
|||
if (!path.isEmpty())
|
||||
m_textTips->insertImg(path);
|
||||
}
|
||||
if (name.toStdWString() == HGPDTTOOLDB_NAME_GET_SN)
|
||||
{
|
||||
QString str(tr("device serial number:") + getDevSn());
|
||||
m_textTips->setViewContent(str);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -97,6 +97,7 @@ private:
|
|||
QString getSleepTime();
|
||||
QString getDevVid();
|
||||
QString getDevPid();
|
||||
QString getDevSn();
|
||||
int getRollerNum();
|
||||
int getHistoryCount();
|
||||
void getLogInfo(int ret);
|
||||
|
|
|
@ -60,7 +60,9 @@ static struct Test_Map
|
|||
{HGPDTTOOLDB_NAME_IMAGE_CORRECTION_RGB_300DPI ,HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_RGB_300DPI},
|
||||
{HGPDTTOOLDB_NAME_IMAGE_CORRECTION_GRAY_300DPI ,HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_GRAY_300DPI},
|
||||
{HGPDTTOOLDB_NAME_IMAGE_CORRECTION_RGB_600DPI ,HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_RGB_600DPI},
|
||||
{HGPDTTOOLDB_NAME_IMAGE_CORRECTION_GRAY_600DPI ,HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_GRAY_600DPI}
|
||||
{HGPDTTOOLDB_NAME_IMAGE_CORRECTION_GRAY_600DPI ,HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_GRAY_600DPI},
|
||||
{HGPDTTOOLDB_NAME_GET_SN ,HGPDTTOOLDB_TITLE_GET_SN},
|
||||
{HGPDTTOOLDB_NAME_KEY_INSPECTION ,HGPDTTOOLDB_TITLE_KEY_INSPECTION}
|
||||
};
|
||||
|
||||
static std::string StringToUtf(std::string strValue)
|
||||
|
@ -619,6 +621,7 @@ void test::init_test_map_()
|
|||
{
|
||||
test_map_[WRITE_CFG_NAME] = &test::set_init_cfg;
|
||||
test_map_[HGPDTTOOLDB_NAME_SET_JSON_SN] = &test::test_set_json_serial_num;
|
||||
test_map_[HGPDTTOOLDB_NAME_GET_SN] = &test::test_get_serial_num;
|
||||
test_map_[HGPDTTOOLDB_NAME_CLEAR_PAPER_PATH] = &test::tset_clear_paper_path;
|
||||
test_map_[HGPDTTOOLDB_NAME_KEY_FUNCTION] = &test::test_key_funtion;
|
||||
test_map_[HGPDTTOOLDB_NAME_COUNTING_MODE] = &test::test_count_mode;
|
||||
|
@ -896,6 +899,11 @@ int test::test_set_json_serial_num(void* data)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int test::test_get_serial_num(void* data)
|
||||
{
|
||||
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, NULL, true);
|
||||
return SCANNER_ERR_OK;
|
||||
}
|
||||
/* 清理纸道功能确认 */
|
||||
int test::tset_clear_paper_path(void* data)
|
||||
{
|
||||
|
@ -1051,7 +1059,7 @@ int test::test_reset(void* data)
|
|||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||
}
|
||||
/* 走纸检查 */
|
||||
int test::test_paper_feed(void* data) //使用单张扫描测试
|
||||
int test::test_paper_feed(void* data)
|
||||
{
|
||||
return helper_->io_control(IO_CTRL_CODE_GET_IMAGE, NULL, NULL);
|
||||
}
|
||||
|
|
|
@ -116,12 +116,18 @@
|
|||
#define HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_RGB_600DPI L"彩色图像扫描校正+600dpi"
|
||||
/*灰度图像扫描校正+600dpi*/
|
||||
#define HGPDTTOOLDB_TITLE_IMAGE_CORRECTION_GRAY_600DPI L"灰度图像扫描校正+600dpi"
|
||||
/*关键项检查*/
|
||||
#define HGPDTTOOLDB_TITLE_KEY_INSPECTION L"关键项检查"
|
||||
/* 获取设备序列号 */
|
||||
#define HGPDTTOOLDB_TITLE_GET_SN L"获取设备序列号"
|
||||
|
||||
//////////////////////////////////////NAME//////////////////////////////////////
|
||||
|
||||
#define WRITE_CFG_NAME L"write-cfg"
|
||||
/* 设置json序列号 */
|
||||
#define HGPDTTOOLDB_NAME_SET_JSON_SN L"SET_JSON_SN"
|
||||
/* 获取设备序列号 */
|
||||
#define HGPDTTOOLDB_NAME_GET_SN L"GET_SN"
|
||||
/* 拨码开关校验 */
|
||||
#define HGPDTTOOLDB_NAME_DIAL_SWITCH L"DIAL_SWITCH"
|
||||
/* 检查船型开关功能 */
|
||||
|
@ -240,6 +246,9 @@
|
|||
#define HGPDTTOOLDB_NAME_IMAGE_CORRECTION_RGB_600DPI L"IMAGE_CORRECTION_RGB_600DPI"
|
||||
/*灰度图像扫描校正+600dpi*/
|
||||
#define HGPDTTOOLDB_NAME_IMAGE_CORRECTION_GRAY_600DPI L"IMAGE_CORRECTION_GRAY_600DPI"
|
||||
/*关键项检查*/
|
||||
#define HGPDTTOOLDB_NAME_KEY_INSPECTION L"KEY_INSPECTION"
|
||||
|
||||
|
||||
#define TEST_DLL
|
||||
#ifdef TEST_DLL
|
||||
|
@ -350,6 +359,7 @@ private:
|
|||
int set_init_cfg(void* data);
|
||||
/*设置序列号*/
|
||||
int test_set_json_serial_num(void* data);
|
||||
int test_get_serial_num(void *data);
|
||||
/* 清理纸道功能确认 */
|
||||
int tset_clear_paper_path(void* data);
|
||||
/* 按键功能检测 */
|
||||
|
|
Loading…
Reference in New Issue