From bea6dff19231df0210fca55c74855878ec9249d0 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 23 Aug 2024 16:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=85=B7=E5=9C=A8?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E7=A1=AE=E8=AE=A4=E9=A1=B9=E9=87=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BB=E5=8F=96=E7=94=B5=E6=9C=BA=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 19367 -> 19390 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 60 ++++++++++--------- app/HGProductionTool/form_maininterface.cpp | 17 +++++- app/HGProductionTool/form_maininterface.h | 1 + 4 files changed, 48 insertions(+), 30 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 315dcf9f830cd54f78237c7a5efd8643093790ec..5f0415843e140e3acf5a51c16e876235273d3653 100644 GIT binary patch delta 1674 zcmXApcTf~(7{;Hy+r7QrD+HsSjiY%Y!T~1&iXvbJdqHE@A)$#Kqe#?9Kp7bYYgXdu zV2KSCJBgzNyMQ>!*sz2kYNBCuEU_f9pyomT*m>^z_Pe+I-e71~G;P1ZJ+;*eToZ zF2wC2fNv?p9Zh3QqTQC5UUy)(F5Z36-?Q;S)F{}wC=eV zQUFVFmO<*9%My1%n!F7#Rzg}91GrAYP_z=T?}E&I6S`l4T)YQxOxA`7!P%Q3ADjdD z&1=@4y_>bqXgG!}06KpK$G#>lM!z7I)5eIgdF zsYnKFWrF2VKft@K5aziUaPt%<4qpp+#S34)8UqAW2y>^s2C_S*37NUX8&oTN-TFAt zCremsB4)i)D4!At^r{zbR<~ndtI+U%BoOsfcra-y3)!Tz25$h|hw5@{-1k_eE4%%O ze4gsg1?7|9bKSL}@jO?rYg`co#Jtk?Z}Sic-=y!~aFyq8>67gnkc{?4`n=LhK-eVx z$3%fv{qJ+qnD{6CokA9%uNA#w76Dy)id|eRq_eLWel7*@St>?GY$fo%;>g4&9QAoI zVm&X%gZ^+kb_cD>Lx&4BJC+S3s_vzkun`y{6(q` z><086CS7~VO2ZqZ+p2^6t2Kw%$tT)s@J}N0mQ~H_8)4`gHJ8VC8$#% zVn{1_33T6Rm}~qK2sIh<2XgSzbwgn>RXu4aNg#jwHN)PEg*1-ca5}w)?e5l&i?-}s zIcDM#Lb@f#JtnkX)8vE$1Nkj1meVphRlzCGxjBxuh?n!zcrN&syxnk&@b}3dTj{CD zRbfQnxFpw{pnY8ZGg^_Sr?Sj?#oFT(ncYBH`=AuQANuoBZR@p#-vhys}K3}O^FqKe~l+5_ zUaDGN?f^{h)yf2goQ|p&j`;&^!_})*R^A#{)Y@p8*DX`6A9a~`TEH+<`~`xHNj4=U zb!4K}rj%{10P}WJ`tZAe|G%d6HBCC*l>S4L9x@f~W1u!uP3syX>GDw1`V*&Fc%rFd z!Qb?#O?zyxwH<6Wlr*(fYxc2n+@>?;fPIYaH&FACZSJM!@t10O#eFb;k;oXXS6ZCx z=W1;}{XyWpnq)qcLAyq^G2i%xAVd3@Undb<&}Q@N^e(j2D~n%&i9f5uQ)kbal0H*QjJB7)4d2`Hf6!yZivR!s delta 1613 zcmX9;Yfuws6g``4cC(w8P&FWgrx8O)01<-7Bj`}AB7y~_YH2|bQQFW7bU<5FMp{9z zup(otjt>M!d{sur2Rb4O;&i5{XcZAlYsZoCRizIsYA@y2$+x>X_uO;OchA=`jdjeo z?xw2%;sHwwVImNiL%0A4`V3&Zfl0eY(XypF&gQ)lP%Ht){XuvEn0gA}=K~Yw5{Co? z?5^H9sbsPWY<&>mdk^e>!igebFTH&MwqfLK1KT))nP5-$(enbZ9mB+E0DG&FO6HBC zh2D>xr`JMZCMlK&P`q18604zDu@6wTL$S#Y1RnsmqYCi24xXN?5PlYX<3Ye!Bh6z1 zOFF?HTMhW_9mVN>qc|f5#(BlS@zZ|Kr2g#9k zqzx(n+eu{i(%G{Q>n<+?^k*2&<5__BOeWNG1EBL{mL_clyo#BR|5*e?n4d8PtA?oG zYNoKX2C%j}EnD$?TI2S6TskzkIgK01)=IeD=c|_mwi3ppT+tIQ`O1y*sx2PfX{I@!nT)O4rG(lpVDmkD{THw z@@HBVTlgpoh%vF7yZeDD`=xs_o6`W>R7Jy!6xpUN3}K*TlrIue*`uY@yYF6Uqddk` zr6|hG2b^n1(PQo?2H6!A+o+_Fs@U8@0}R?OJ(25OPbfMArUKF7ikr_!SXh_hzG$RI zizEX(X-@RtoGF9c9NRI9zUkbQr~>-Dh70K>vgj->^i(b|<_;IJwi|F?!(}^O0^zP) zcGDnX8CRhEjpPqXm8`zxEqCarT5@+b*Xp3JV`{j*$YlDr#0M@+C23dqX)7q{wp`x6 zl+thF`M4+KT4XYxc61KifK_~UADMdfVNkeu>L(d z^U8{pdb)a{%C@54>5^EKFVB$Bs2G9I%_89)f_54S)$|MIh9ny6F=6hkSRmxCu;5n` z95z$P&7^A^RUj1Jp}34YB}k&j0>gL3eS=TadA>8d9M~TMH-oAyI3KouDp&B9w)p* z*i777v2NfXMad){@pwhg$Bd${Sv(R=XXhp2@i7l*MhRj|ixE)05!=%QYJQJ+^|T3a z4HIv4XlWyy6?I<$iNV@ zdMJYovwou Dialog_logIn - + Dialog 登录 - Login - 登录 + 登录 - + station1 - + station2 图像测试工位 - + station3 成品检验工位 - + account: 账户： - + password: 密码： - + device type: 设备类型： - + device config: 设备配置： - + view directory 打开文件目录 - + update connfig 刷新配置 - + remember password Show password 记住密码 - + show password 显示密码 @@ -817,7 +816,7 @@ Pid: %2 压力测试工位 - + Register 注册 @@ -838,7 +837,7 @@ Pid: %2 端口号： - + LOG IN 登录 @@ -1509,10 +1508,15 @@ Pid: %2 设备型号：%1 - + device serial number: 设备序列号： + + + Motor version: + 电机版本号： + Serial number: %1, Test item: %2, Test result: Failed! Reason: %3 Serial number: %1, Test item: %2, Test result: Failed! Reason: %3 @@ -1524,16 +1528,16 @@ Pid: %2 设备序列号: %1, 测试项: %2, 测试结果: 通过! - - + + device history scan count: 设备历史扫描张数： - - - + + + Prompt 提示 @@ -1565,22 +1569,22 @@ Pid: %2 测试员: %1, 测试项: %2, 测试结果: 通过! - + No paper 无纸 - + Device is sleeping 设备处于休眠模式 - + Counting mode 设备处于计数模式 - + Other error 其他错误 @@ -1689,8 +1693,8 @@ Pid: %2 Pid： - - + + device roller count: 设备滚轴张数： diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 3edc556..1945a08 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -760,6 +760,18 @@ QString Form_mainInterface::getDevSn() return QString::fromStdString(serialNum.c_str()); } +QString Form_mainInterface::getDevMotorVersion() +{ + std::string motorNum; + unsigned int motorNumLen = 0; + if(SANE_STATUS_NO_MEM == sane_io_control(m_handle, IO_CTRL_CODE_GET_MOTOR_VERSION, nullptr, &motorNumLen) && motorNumLen) + { + motorNum.resize(motorNumLen); + sane_io_control(m_handle, IO_CTRL_CODE_GET_MOTOR_VERSION, &motorNum[0], &motorNumLen); + } + return QString::fromStdString(motorNum.c_str()); +} + int Form_mainInterface::getRollerNum() { SANE_Int rollCount = 0; @@ -933,8 +945,9 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur } if (name.toStdWString() == HGPDTTOOLDB_NAME_GET_SN) { - QString str(tr("device serial number:") + getDevSn()); - m_textTips->setViewContent(str); + QString snStr(tr("device serial number:") + getDevSn()); + QString motorStr =(tr("Motor version:") + getDevMotorVersion()); + m_textTips->setViewContent(snStr + "\n\n" + motorStr); } } } diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h index 98effdd..af8623f 100644 --- a/app/HGProductionTool/form_maininterface.h +++ b/app/HGProductionTool/form_maininterface.h @@ -98,6 +98,7 @@ private: QString getDevVid(); QString getDevPid(); QString getDevSn(); + QString getDevMotorVersion(); int getRollerNum(); int getHistoryCount(); void getLogInfo(int ret);