From dd24440450e763b4ca568ee1c92bd3676d652c16 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 7 Feb 2023 13:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=88=87=E6=8D=A2=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=A1=B9=E5=88=A0=E9=99=A4=E6=9C=AC=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 12412 -> 12420 bytes
 app/HGProductionTool/ProductionTool_zh_CN.ts |   2 +-
 app/HGProductionTool/form_maininterface.cpp  |  20 ++++++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 595235ac9d7722c189fad5c4afe03e87c95ef641..45493399f7aa18da1b1be3820a2a17f642118aa3 100644
GIT binary patch
delta 422
zcmey9(2}@8nvqF~WwI=zIA<XP`;4Ou44N*JZ5jPJuQIT2C<gMfCr@Q`XUv&=mr-2u
zGUK@r76t~DLdNGGHZU-7{bqdrFNA?XRctaZlRRe+)1O{F1_t#flTDfA8M!Bi0!h=!
zrA+;d$&*=`<uy%N=cLYKU|>#T-L{JfsBQ=ANgWfQ?lRW%+(1*+Ls{>0sRHS)$-d0;
ziWk_7@1y`_7qgk}$YEe$wO~un|IEOkaGouF^%n*PMVraJ%;JoNlb159Gaj6L7RX*O
z`6<vAK@R)=Rt5$oEslBCaSRL^&p2~$F9EvQgmZFpDFcH{2j`qS1q=*Ywv%;P%sCag
zq5@5Uws=j>WziE-WZ^osQ<H&#;}6#*1x}#nCrw_<;;*=j`_WE&1_u6k9)^2eKo5N6
zVOtH<q{hg@d1Vohemhx~)t~Xp<Xl#9!3n%QuYjHr+r#_6(G@7SZ1PlAea526M_JwZ
zbokH50G%TCI}>Ps)?_($*~tPz9GmUg7!^dtGS~x;g|jhOMek)$V9;Vvn014}YO}AJ
GJ{JJ`D|0{q

delta 414
zcmZok{FAUjnvqHI&tzFfan4Kz_8CVR7&L7r+cNrdo@HR)Pz>ZHPoB!?&X_X!E~B{Q
zX~uIQEDQ`PnT*drY+zvE`px+KUkC$(D&J&YCV9>lra!%U3=HabCYv(JGcr#O1(Ldx
zOPTr^qbIX6%WLYg&Pkoez`&fwx@{K|P~8UBlR73q-Fd9%xq+st`?B8WQU%gYlYN=x
z6;H4k-$?<=&So>+k;A~iYQdJC|Cxb7;W%6R>MsloiYAkLnZ+41Cog4IXWTjYERa28
z@>8HKoE-N3tqcrGN*wd7;}{q;?s4YcUIKKp4(H_NQU(T@4$e7u3K$r)OegEIm~%>U
zMFpAyZE>2M%c3Ww@Q3TvPE7^|jz3(N6gYvN@0z@p#b0qA_oJQm3=I77JPh}`fFAhB
z!?qfv=_e28l|>8;YELK2vidW=nViciF4)1_^9tx0u|2&18(o2N^CnMa)o09_e3aFl
zPlf+{4A3cJzcYdMCry@Pmz^vi#If0)jZuM@FM~bsSU6ks-dQ*POKlES)8_&Jy6SZh

diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 20b35d4..2f36068 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -874,7 +874,7 @@
         <location filename="form_maininterface.cpp" line="208"/>
         <location filename="form_maininterface.cpp" line="490"/>
         <source>image pixel: </source>
-        <translation>标准圆宽高： </translation>
+        <translation>标准圆:宽 * 高: </translation>
     </message>
     <message>
         <location filename="form_maininterface.cpp" line="519"/>
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index 8e5bbad..3fb0f39 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -576,12 +576,12 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
 //            ui->pbtn_showImg->setVisible(true);
         }
 
-        m_multiIndex = -1;
-        m_curNameIndex = 1;
-        m_list_images.clear();
-        QDir dir(getCachePath());
-        if (dir.exists())
-            dir.removeRecursively();
+//        m_multiIndex = -1;
+//        m_curNameIndex = 1;
+//        m_list_images.clear();
+//        QDir dir(getCachePath());
+//        if (dir.exists())
+//            dir.removeRecursively();
     }
 }
 
@@ -590,7 +590,13 @@ void Form_mainInterface::on_pbtn_start_clicked()
     m_multiIndex = -1;
     m_curNameIndex = 1;
     m_list_images.clear();
-    QDir dir(getCachePath());
+
+    QString cachePath = getCachePath();
+    cachePath.append(m_serialNum);
+    cachePath.append("/");
+    cachePath.append(m_curItemName);
+    cachePath.append("/");
+    QDir dir(getStdString(getStdFileName(cachePath)).c_str());
     if (dir.exists())
         dir.removeRecursively();