From f0a6eadfff6e0b51d071eb0fe941da77136f57a3 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Sat, 17 Jun 2023 17:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=B8=E5=8F=98=E5=92=8C?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 13578 -> 13917 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 32 +++++++++++++++-- app/HGProductionTool/form_maininterface.cpp | 34 ++++++++++++++++--- code/base/test_base.cpp | 3 +- 4 files changed, 60 insertions(+), 9 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index cb21dfdab7869ca4545fc6c8aa18aea685f0fa56..752ad328416371b989419264f847ca751eaf8602 100644 GIT binary patch delta 1307 zcmY*YdrVbz9RHkq&+DH1I6MU8aW999JTF|r!hFPlZ-V{qrQ#Jtv}8_=lA%2Ki|*i`~5Xn z{95_Zg5=Ktqyb?wgl_@XdxTj)cmZJ!pcDb@2(WPTJX-tOQ`2`FT-r{``#!i2R{;@~5H=kKqHaRiHwZZEv^vHm z#WX=URYS`I+9f8bu@hNosesQ4*gjYci0hbl z9*M~yL z#U=WiHDyH5pud+z`$mP0Pp18l7hLf1Nw?wGK#_5^MzKk#HCi|j}@^#{GRDCFa;__Y~ z*v?;ck5E;I__0^==zfW?Y}0pS?=E50`VUCOxR5%vgVZGnW%b(uCQ)cEqy6x+LKojh zdFF)UE&V`Dw(vtrEpid~R2aFCPIb=+H=cEno&ZtzCCydRYEhP}=%+~ZOKbq5Pl_vd zQ=-@qv2z9Kbp{!7CWt7q+o0{Nqy8;39JuA7xN5DHwb_+3hDW6&*QY`Xw@}@IYor&t zdr5YVRFIuQdbenoSli<04C$op3E-D9j|&o{(>`}ecD3|l7^=5?wWC;ZzYMjYQh)|3tMdByNT7Y z*kl-?-X_>gjxQFGn=VuKW7-cGGZkF9K`$%Uv|;0N8r~z?K`yAV*ECy1wcAdcX5I1R z-4^qbekx8%GZ(D$k`+bfjRz@_{cnYnJ7; z6d##yQEhb3JT#B~)0S560#fmb=*0Qd)mQPhrMZ^YKq(tE9Gr#7ptFA4tE>o)9CEEC+5X~oo)nxn9#OE=Y zzMGZ*#rVCh)|VHnN_mY^Q>m&Riq?E1!+O%~y*heRVAVU@&OK)kU2es*(W83*yJHix z>s_OJgIgXxKR0I9Zc@F9>h-$4+IUp7CPocwe%(=~P|TgEvI5Y9+~6l9SL z7?Tx0RC=v3XSSu;^srH9E!uE3!8*1=>m)P8NlpjL#ne_5Vb6Ady!*W0=lwp<=lOh| z=e@bNv*u{ZidFytATvz(JYai~FbHTb5pDyrRs&odSkjb0o42- zGmq#z<9{~eF1Ya?y0;~PHYS127X|V-w`2ye4;w1A--mAv4H0yAM-v< zZ5`yt%+#(Y#NUz}gh%xugVvHaF07oOVtHqU{4e(c{5c_9_mHf!2;m61kn@JnX#9;V zofZ1W-UZU_!Z&qsB5e{TpCPsUZgI_?ugRryal_6-)ZA^c@O~RL&57XytpMW_JHr&$ zhQ!mtAc^})JlAyza5}|r^Bb@o)_=wL#m!`QOuR9FjK+{^WIv_#@TVD7wU%BgjLE*& z0Y|%W{ShkU{KI&%pbYT-ZrV0QMD|vb-rh(%&~G|1QBQfB^z)o%&+0Ngs3y5dHBy#^ z`nJ9xJsG(`vRzVXaX#q{>i0SADTgL~qWuFT=O-}5D}9!9hh%S(E|-~z^_ny~m`B5V zRr)cT&b~f<9j{ene{McCA=5%WFpo6PlDfalqmfBKT4Wv_B9`2K^VHya5_46?B<%oK zDGL!|b&Iko{vqK**>gUJ+$@rd|E75Aq+ELC2K^|P($GHIq}59K`&31WE7ji-OZpk5_3E2s&3j7s3lN(`XRxuy6V)iou`SnmcIGx_1m&T?-ni5KZT7Mdb52^ Tbl!e})osq7>9Isty4>pj|3nwB 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)