diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index cb21dfd..752ad32 100644 Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index 38f48eb..5664db6 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -927,10 +927,38 @@ - + device history scan count: 设备历史扫描张数: + + + + + + Prompt + 提示 + + + + No paper + 无纸 + + + + Device is sleeping + 设备处于休眠模式 + + + + Counting mode + 设备处于计数模式 + + + + Other error + 其他错误 + device serial number:%1 设备序列号:%1 @@ -993,7 +1021,7 @@ - + device roller count: 设备滚轴张数: diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 55d3c68..fd7b917 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -746,14 +746,38 @@ void Form_mainInterface::on_pbtn_start_clicked() if (m_hg != nullptr) { - updateUiEnabled(false); - m_isTesting = true; - m_mainwnd->addTestingRef(); + int ret = 0; if (buf != nullptr && (dpi > 0 || (correct_value > -1 && correct_value < 7))) - func_test_go(name.toStdWString().c_str(), (const wchar_t*)buf, m_hg); + ret = func_test_go(name.toStdWString().c_str(), (const wchar_t*)buf, m_hg); else - func_test_go(name.toStdWString().c_str(), L"null", m_hg); + ret = func_test_go(name.toStdWString().c_str(), L"null", m_hg); + if (ret == SANE_STATUS_GOOD) + { + updateUiEnabled(false); + m_isTesting = true; + m_mainwnd->addTestingRef(); + } + else if (ret == SANE_STATUS_NO_DOCS) + { + QMessageBox::information(this, tr("Prompt"), tr("No paper")); + return; + } + else if (ret == SCANNER_ERR_DEVICE_SLEEPING) + { + QMessageBox::information(this, tr("Prompt"), tr("Device is sleeping")); + return; + } + else if (ret == SCANNER_ERR_DEVICE_COUNT_MODE) + { + QMessageBox::information(this, tr("Prompt"), tr("Counting mode")); + return; + } + else + { + QMessageBox::information(this, tr("Prompt"), tr("Other error")); + return; + } } if (name == HGPDTTOOLDB_NAME_CLEAR_ROLLER_COUNT) diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp index 2e0a562..555c261 100644 --- a/code/base/test_base.cpp +++ b/code/base/test_base.cpp @@ -1049,9 +1049,8 @@ public: } //先默认设置1 float distortion = 1.0; - int setdistortion = distortion; - ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_DEVS_CHECK_VAL, &setdistortion, &len); + ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_DEVS_CHECK_VAL, &distortion, &len); ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_IMAGE, &type, &len); if (ret != SCANNER_ERR_OK)