From ee68af887d054702b6afcbf84b2993619f2374d5 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 9 Jan 2023 18:48:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=B8=E5=8F=98?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 12303 -> 12305 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 4 +-- app/HGProductionTool/form_maininterface.cpp | 28 ++++++++++++++----- app/HGProductionTool/form_maininterface.h | 4 +-- app/HGProductionTool/hgscanner.cpp | 9 +++++- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index ad918f5be6a1b8fc3dd5fb919ededb7c4da7ea88..e4436ec4704b1e125e30aea44676743980dcdefc 100644 GIT binary patch delta 466 zcmWMiT}YE*6n@@s-}`=hKj&hgjwt)I`kDjL!i^dsUX3n?Fo-NeNZCS%lUijF8PQEY z+Bys()FL9G9}vVS!wZoGdErDXii|G07!87;x+pR`H|K$Kp7WgNIb%Kfo?E9yGM}3g zX{r}N{T9}pBGB}K+C@UgU`?L_!k~gU6q~?E@dRM)6xqF3fd+_N|8Jn?h&Wp}&#bgq zPMW~3SyBEz4cHM;{+9%HcTuh3=oRDd%@!auOznmv64cFgm@XQZ#1w59PIyU<_e}!E zJ^6gjU|y4a(;VULIa#V=)jdV|*>)NKP~79hYE;{LFHg%V`eFbuhg53t2YYH$sV6@f z@2i~m3$SBIJuMZ0;8(RUxCXehG~o$tl~(G^2!L1CwG=1We%pF{eGzCh>66C^Kk{~r zakp{QJ9+Rp|Kftqe0<2c&S|=m1GX*b@%1d{T_xAtAIRHXol$l&YWJ>uV}JW7W3~p; z_R`BR;Emd=4Vt+jdS)g>g*MEfj{Ef517>zpy-bJ$l##)JTYaO#DQkaKZ(feG&k7Y} xt9VC6+2PM_DIMecb&-=Sv`H;Kmwc9gCa#*DDu3GQe0^9Qoxl5j=Db_5{{zJ_h5Y~k delta 464 zcmbQ3(4R1&gfVDh>2k)j$+C>%oR=BcXB=f<(6~O?meHTnoPm8qF_8Cf@>E85%h?PK zN0S*C*p(Oy3|bi&$~Jf0^VpPq5BOoyWkyG@o_b zE+(KlHP(|lCP3XgSkH3#Earm!Tv36hK$rAzrCfLmbf5m@To!%7G_F%SH5nKGn!4#Wfd1x=Iwa}^rh%m-v5oRKzF{FJe5_S@yg_* xtoD3){O4nU_KTTh0uA~*S&v6`G7mf7W>+>Hc}||Ne*xzM&etkzu2G%J1puLmhg|>w diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index e44b311..ca61f36 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -851,7 +851,7 @@ image pixel: - 图像像素： + 标准圆宽高： @@ -1004,7 +1004,7 @@ Confirm whether the device is reset Are you sure to connect the new device - 检测到设备，请先确认是否已经复位 + 检测到设备，请先确认是否已经复位 yes diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 930efd7..b29673e 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -48,7 +48,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn:: connect(this, SIGNAL(testResult(QString)), this, SLOT(on_testResult(QString)), Qt::QueuedConnection); connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection); - connect(this, SIGNAL(testDistortion(void*)), this, SLOT(on_testDistortion(void*)), Qt::QueuedConnection); + connect(this, &Form_mainInterface::testDistortion, this, &Form_mainInterface::on_testDistortion); connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection); QString str; @@ -194,11 +194,19 @@ void Form_mainInterface::on_testResultImg(void *img) HGBase_DestroyImage(image); } -void Form_mainInterface::on_testDistortion(void *data) +void Form_mainInterface::on_testDistortion(SANE_DISTORTION_VAL data) { - SANE_DISTORTION_VAL val = *(SANE_DISTORTION_VAL*)data; - ui->label_imgInfo->setText(tr("image pixel: ") + QString::number(val.w, 'f') + " * " + QString::number(val.h, 'f')); - ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(val.scaleXY, 'f')); + ui->label_imgInfo->setVisible(true); + ui->label_destortionInfo->setVisible(true); + +// SANE_DISTORTION_VAL* val = (SANE_DISTORTION_VAL*)data; + +// double width = val->w; +// double height = val->h; +// double scaleXY = val->scaleXY; + + ui->label_imgInfo->setText(tr("image pixel: ") + QString::number(data.w, 'f') + " * " + QString::number(data.h, 'f')); + ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(data.scaleXY, 'f')); // updateImgPixelInfo(); @@ -590,14 +598,20 @@ void Form_mainInterface::on_pbtn_start_clicked() QString title = item->text(); QString name = m_map_title_name.value(title).name; int dpi = m_map_title_name.value(title).resolution; + wchar_t buf[5] = {0}; + if (dpi > 0) + { + swprintf(buf, L"%d", dpi); + } + if (m_hg != nullptr) { updateUiEnabled(false); m_isTesting = true; m_mainwnd->addTestingRef(); - if (dpi > 0) - func_test_go(name.toStdWString().c_str(), (const wchar_t*)&dpi, m_hg); + if (buf != nullptr && dpi > 0) + 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); } diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h index ff09d8a..61681ee 100644 --- a/app/HGProductionTool/form_maininterface.h +++ b/app/HGProductionTool/form_maininterface.h @@ -38,13 +38,13 @@ protected: signals: void testResult(QString text); void testResultImg(void* img); - void testDistortion(void *data); + void testDistortion(SANE_DISTORTION_VAL data); void testCorrectInfo(QString info); private slots: void on_testResult(QString text); void on_testResultImg(void* img); - void on_testDistortion(void *data); + void on_testDistortion(SANE_DISTORTION_VAL data); void on_testCorrectInfo(QString info); void on_viewerDblClick(); diff --git a/app/HGProductionTool/hgscanner.cpp b/app/HGProductionTool/hgscanner.cpp index dc2e98c..412f126 100644 --- a/app/HGProductionTool/hgscanner.cpp +++ b/app/HGProductionTool/hgscanner.cpp @@ -100,7 +100,14 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si { if (data != nullptr) { - emit m_interface->testDistortion(data); +// qDebug() << ((SANE_DISTORTION_VAL*)data)->w; +// qDebug() << ((SANE_DISTORTION_VAL*)data)->h; +// qDebug() << ((SANE_DISTORTION_VAL*)data)->scaleXY; + + if (m_interface != nullptr) + { + emit m_interface->testDistortion(*((SANE_DISTORTION_VAL*)data)); + } } } else if (ev == TEST_EVENT_FALT_INFO) From 7dbc9eecbe2faea5884fb734c1d1faec58a59644 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 9 Jan 2023 18:53:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=98=E5=9B=BE?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=88=B0=E7=94=B5=E8=84=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/form_maininterface.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index b29673e..8e5bbad 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -429,7 +429,10 @@ QString Form_mainInterface::getItemStatusStr(HGUInt status) QString Form_mainInterface::getCachePath() { HGChar cachePath[512]; - HGBase_GetConfigPath(cachePath, 512); + HGBase_GetDocumentsPath(cachePath, 512); + HGChar procName[512]; + HGBase_GetProcessName(procName, 512); + strcat(cachePath, procName); strcat(cachePath, "/Cache/"); return getStdFileName(StdStringToUtf8(cachePath).c_str());