From 1ef8370bb195d20c1140856ffcd13498e0885b78 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Tue, 8 Sep 2026 10:01:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(nmSubWxs):=20=E6=8C=89=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9B=B8=E6=9B=B4=E6=96=B0=E6=B5=81=E9=87=8F=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=B9=B6=E7=B2=BE=E7=AE=80=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 流量表格按当前相显示油相、气相或水相流量 - 移除压力记录、流量记录和显示相标签的冒号 - 更新中文翻译资源 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 135798 -> 136015 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 9 ++++--- Src/nmNum/nmSubWxs/nmWellPressureFlowPage.cpp | 24 +++++++++++++++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index ebd8d23e4f0e8343ce9f510943bafe7436b940d0..c9591eb6a887621039bf3dad2d9cec6c2f5bf457 100644 GIT binary patch delta 9163 zcmZXZd00)``@r9|&))k?`7(XlCfOT zKqOP40YwAJoZ;dQ#5K?Hdu!e2`#j(8?~k5OYoC4gS?itOcYny1)$f=6s!OJ)>X~cr z0l-8cxn9Ug0NK4MkKCnvjlk<9sxxJ7JTeF%-3>V#i0(|}JRp6?PssWPrMs#6}LM{S~z@u$^ zPI=)n<(-89-j=wf9+ZVm$O0g)D6BSm?4|UIq4dR__^krMHc%$y1B|l;;`U7}W%T7= z0sKRNbbBB+Glm`o+W-RA0O_uz?1x$o_>OBA%6{ts0x#hD3Gy4jV^lek$aYgM@e*Am z<{^!!cKqg!$CS?_+eu74D6LSRLD4|`=OS+dWOboz`O!{dx)fmYbRaWOyTKIzIsGW> zTiZ!GC5lxNM@7_FfVm|=#I7R8TASWH3=q=^$US^w4DMM(9mXF;E&#^*Esz!c#6Z^3 z|4K5j<&i+{E&;ZoHxN%xU>j!vkrY!FL{VOR4D78KAR*Pjw)6*5a)h$>9&l_ukkP*Y zHy{?}7%euluBM?0z3~t#@%8TXQ(w*0k;RwWYvW-vO8t9HE@T}_RH3`lQ`c8?(hJBQv)c^<9)a$ z9c(EJ{-&(K-5p(n9yOTq1SOE%g7SAP-6L)^eUOZ?(K%Kd4S z|KR6%om`FuzB3+sx)S&`i2!emfX_(9kdOxaJ{?r`8Ok@lz+c<~WT!4j`9%P4*Mn5! z2&8f{NPD2-(&UtH-+^?XpBCW#Q;3DX*^ophX~|HWClpvBvW_*q$mlpvk{~f z_(MAvQGR$2(zcTo7=z484RAsUstdh=%+`YX+Yx}*!JwIdZkA#VdRy-U)Kr81HCF)3 zj$kk|4>!^T-800YQr6%P{0Akl-2{5iP6u)*5-goI0x`NQPL&#Jn@qsw!YY7K$DqIR z84xEMa2VhK&=3y}p6FnWwcrTX0gQtw{ZE3^MRdasVKC^x5Fnw?DSt@>*BdW@fE9RT zPXp4s0=&FeVhlVFUa!l6$ki|$U7GX^0`Eo6KmromIf{s1!Fw&5`H{htm*0X4*@ovr+iiolMdmYb&kTMv(o?!3n<5RfJq+? z;+6>nF<*cjFo&R7xK)2=m^{-S$b(FnGByF@Kn+Y;RSaalC*{TvN{?J6OxYd?gt-e- z*P(E9ILalrVQPgvz^X~@B!RV*SvM*3-%*z7idk|qANOdO`t<;i1v_9`h6tqi2+T^| z0p!Y8n7t5V*XLO63%_(2C2?I38|n<4%Nic3!eOWTf<;73_7QVdjBcir+UY@C+?;QkTPH?sh-$6=rR z9FX7q#4LrO&+#pAXm|vW+Mglc84a|o2#(ti19Iy)l;yYr$!Ua&fhddXEL5jW0McbY zW#40z%YK5I8)+ElMv0u#%=B6W)URv;^7AHWYRCX`HX3fPQDC_H0{0X-K#B}SKc!(; zwKu#@F9OmZk5P|qlTtz8&T1e#qQoSnD^naMR^h`=^e5f-8v-nyM2yZo0w_65Oim62 z!VM+nHYmtNCqzydZE<5gnJm2tpzcG04etXPQA)x;?8KlFL}qDA0c^jM*}u&J61_oO zCK&q9OD5}wU;;lrlBDdz2%Hy0wgrU)Ssy}njAmHlHUb&iO>|M&Xg@Q;Sxm1rhZvR9J0Rm0GV0m5Zdk!+KH%PY71Mbn z#-DsQrk@y(Hk`>=XW`k_JZ1(oV7k~gooVxb(qkRt+*Ea3Pb~ zaRVOZJG0{@y5G7P%&xoT09Ow%yB;I2=`lG)5+IRhn7k0Qg$-UzUSS20lRt^IYIFGs zrpN!7FaSawbHg|vRi|QZ>7D|zWIl7h0ILCc z1oL}hHIRWy=1GMdpz0{)AF6f|<8hRhvnlt9%+qe~F(OnlPg~JiD|<74wym$eX8vqj zH@Y*=hMizNO1DuJxpEwNt_4KV&^$&jaZ0Mqp)t|=(VdxIrzIxRqwHIku= zSs-(}NZg%J(lITREB=-Y<9nj1#z{Oau!cOaobqU{#4E!A#DtCpbG3UV-Zdy&nL?C{fQ zgd6#VwT&u5*O|!R~4f4BZS_G+p1aro4kc`0hIpb0>Dk5(gk# z=dwFDq9@I=V0V>bM6=w)?lwUQG12V4v&VqM+Ozx4W8~u#+3e=s7>*e>XMZ28@^`Q~ z4>tpJ_G5p0B+B&q4RQ@;^DHq`Tr8x#^N}qm!A3PZi9MQ(QIM6f#opnVAaAnAW3VM! zZi>X6ET1CI(=!@(gRM{-V-@&{tr|HJJ@*ECsp2R$o>A>2<0nuS_hBzxjK%Kk3tKxF z%R>EPwpNSw?;Ob19a@KmQq9&c+>D`$qyv*I}QxzQZ2HSyXkl_E@oi zlPtqNDDh4^$@s4vtL_ERBc5{1HICbX54ogAdG|CYy&?iw<#NLAI3T_W;bONI-WbN0i#hsccJqdFYy40s`$M_4E^YPWP|9bXT#5|c zU)7sS8IE4GshILonb@jt)3J`*`sE6M?h9@k7Ud*psOZwg)o!H)cj(W$~TijrvZxGMx?3jW1_$uGM zVK0!0-+2=?9y{4vEH%*A-r%i%poMqH;jO#l`KlUt+nE?@8q0WlH8vE&V&1{A6A+gW z-m!B6kingJ4?m2dUsL&E!|=C#tN5VocL0aN+DStE`JnvO0Qny&A8tZsqsG1Y;04#Q zI7{b)TQP!{%;H0*ZNX8Cr<4z^!XOp>l#fti9VJ}mBd!FY)=c>*M_YinzI>G1TTFIx zaamVupTJ;#{f<~5T6=!u?Uw-B20ryv2{tl2__Uafc>5oGTJn9YNz8b$suz%-yeZcN z@|&%mVI4c4(mqOj(bX)}WE#IUry7XmKFXmLeCG3NfbZ&dlBi}rYq|-5>R-BA@ViP; z9LM_bIW=Rkh&1Q-Td+X(bmR92l>wPHg#Yc~Pe9zg`GV>}r~+RxuA7V6zupo9prfGl%;fJ3M_ba&=I>@S0x314 zY?SlO#cjo5naFjw){2?@t0Un+2A$$xy|xD8Gl+jX8GBiaJSp!Hg7dL>O6zFKLSL!$ ziz$$6H>F)?pxdNJwUgW&EH&S(2GVP()W-WDy7CsOZCD6q_`6cunfiF&eW^o7G?Dml zsk6&yOz|_MgA-gpNoIVPx;fZmR{koMb{}qcHCY-Exe@!FBI(4{C=>rD(pmLr%gtS+ zbIkkV)>snQkT17z(z%3s5z ziGxt`ds?N*g=lymE=ZFPS74{UOq%=`t_S}uUAI&Xu;v+Mlf5*hJ{>)4taO7GcVTc< zZ0(^>%tSpyGwt}b(nCqZfE@orTKIk*z)h|6@OreS>BSpQu&;S3ZE741@Zb;WjjyiQ z{v=CptI+2nK1d%vqMxz3_OmR;1&3?(fwGvD9Wju8lr6@X2bH$6#f^plA79Ag zKbv99I3ruG69DA&E7__Y9zcw{QCiwjZdfWyI*zfTPX%RUgX|Y8l-BAMvh^EVF>Ab* zZSZ-E21I0=hoF3ZyD8g3>@kZ}?31M@Gy?RRCENMvGmvZ}kux##*_|dk_&ff7{4m)e zKy6K&OqnW`9UjpitH{r?qg^WjN<(EQrs)Bha#D6CbO81_VX`t_g8hB(c9OvDVw{PQ zJWp1W`yQ*Pb7Gc>nYKDi_G#o6oKCQ^&pA(VYcaao^|dsMCi zve{ieY%!kR@x0t?C06b>tQcqNru`zHz6Zyyvi|Z=z8J`_=9D$I@|jmK0B$%ckMKbY z_WVm8u@^tDJ0_p6w-1x!Gs;VEbaqjoA5}zrLe}u=GvRj^bBL@d%W92D@ z1juf0`HrP1<9>JK*{LX=vAlf0Qxg!y(h>6g%_o6W%oAOD8hT9WATKylgZ)Go`KhvU zjEwK()ybG2)?~`7b8y=6qEKG!-{tk6(UaDC$QvBd)}T^;Rh$AO@SB*`Q{VZC z{N8-5D<*D||2gLrkfufQ7r*HOn8#91lgM8bEdy|Dk-su`$Ixaaf9JdwcamKkzq1@IB-E^3ugYPgD%HNcSk1KTCy94CrP~JJ$PIByyLI>}I zGkNVKr}v6ed%1R11S*{KFnU-_rHs0-a9MB#O(j<>?qx2oRSfHd5-TkcpY|HgTuczH zdK(!$QOw!lfMd0VipalG(N!KR;_)El!Z$Izx0|*~u{ysOKudqc#=KNPr#~ukU*R$Hb}RB@jsf)5 zC<+o$xegYJ!emtbQch8#>xz!^PH}PvI$Y*T#kmU>K(@FksvHKP^16D^e=O2PD>G}w zv3NzTO*Re#JBs0E=I+-NbuB2Z=1Gccm96;FVVk1qEbhWRQ}JjEn$+$_#nWtzz|t#< z=Qx9ee!-NngA_04q6bv(7i-PTwClSlAsIu{j0;MVfz47Ug;J7(qszkXN?8wgEI<8~ zGB>14Q#*;n8Kv?s1r}%;%2YR{hU@+QF^9t#(_Yoa@5Zi0P6}VZyi$lrlP`U&ZA6UB{rMuPr9j`9y}L_ zSC%rgx&`2fobpv?<&1I+a?4C8FLYLhk>!|NH!0_CdW>%@mMZ7#MFA)xDP2^`xWO0} zOtw&3-Vy!!7%CR9%A^<^6m5?X;!ssJ*1oifu59c8*!xzoHH z6VzU@wvV~?lrq=J3r8}OmAMHRQVweEXA4YL8ot%*A;=z}VSBp@ z3P%*N&qP7lZ9FFV6hWEqfc@J@%Ha`|+K-eMqJ+_T53z>YEsQS2Aiek} zVa(lQ=+R#V|DQHuC);sM+dn`SW>Yqt69WF4j?vs%2pu*7huDHJqaH<9(p#9_>l%Q@ zgwicei1@q@-@Z8tkxNmr{SOF{O%7PE?-b@gM+vNq5fU=d0Ni>COIT~HEp`bjrhW#n z2@(?bMFW|TB_sulpDgTk)^!oKe>;PI^j_GLJqP{dmgv&YF!Z>muwVTMhaInl+?QxE zhn$5YD=-J|ohzKak%#vBR45NaomcTf1wS6(r(cAMjcD~LNkXMNN@i9O<@Sq0Wqbx! z*naIK(FQ{0@1bY|tzv0EGrO5~LSy+00EsT8-Fe~qsC(#?>xG*EB2K%t!tFsx_%bk7 zxcxL7LtTcbXK5C6W|YvJdK;5ry6~tZ7ROQ`{5kC{mLB7U78f-}Ko8+{Nf3@kh6(S^ zy#%l&?~4)5UIMl&XUUuX7-7u^cFWsIq!xf^)$u zVw0tr_TFaI{D59K2O6S^T7wyOS-L82Kou6?x~c>htb-EjREalh0h|u15+9Aj`Y1)U zcC0?W4!c3QKASRYt7?M^!}Agc)mAbZ&3~3E-ETF%(3nIy_LOQHSBJLXsM@s#Bbs%- zYPb6%tRC5g;xa3JgBPk(!ZaM7pH`ilgetVtQ&nEV!oc;Am~W*&u0r)F15XYCswa=| zAzSlRFWm8NvumniGt>SOUnd_&Yt_38XMw9s3s?`=Oi zaGUDK6B+hnyF@+fG1}*9bxIA!kBOA2dFqbk7+m{%t97cL-~i8A-8oZ^d+4Cnf2)HI zc~#xT4Mh^aP2FSUPJE%4r8c(0OludSHrbC>;NC}Vk!cGMW~sJp*@7>QCs6k5p|V)Yg0NLDgivE9pkLjSqTsmGl?h<3}V{kc{6LhB#(gb@K4QXJJ&ZSfdc zebmzgd$jZW>fk$V_YG42oQ@Ht+*TbW#|`ky)C-S90-T$oURZ{HGxVr>(Jwo22oM_Qt6Zv>bi#=umZnCIoeuX|E2&)hEy!J zab@a7@x6^1W1lbf=s(TFZ=%Na1BR11D>Uw}3<0iKXuQ&UqZe=048Mr=j?pTOcf@Fb zZ(;2uC*M%k_t*IRjwx*JDY3M_(WHMgKVP~IB-m9GaSfZ(&Yv{Vfn%^+nV?ztxf9l0 zx|(J8lhEkjYgXJkkELsaCecuV_g|+>+oVZMa0SqNNI7zsX7#nRc=SkdfUT=tpPw~* zJEN$q$|+}rY4#>Npy7dLf9_hGa_VaGZ=-7N+iD6@B$ypa#2i~Q=D}F8*49uV^wu;# zc#m%;mW%IgZCsl*e?C}>MfW<&x+KlVSac{aXnaP6=0^aQfl>#}kC`C=Kl^Kb ztii2)?1Q3x*t9Ctt|ZisJYWp@nXd7J7Jibog#sS`RGxEU7DR-^8;_kG5)+<&-j*1r zuN*+?4Q2D(Q|s3s4i5a!t;*pM^A{QWhtHTF9oBwhNtz?+N=#%Cx(h$G-Tj|C)gwY; zj2E;$(0C?(hu)kwkaT15=9B+>^O!ji|L^9Dg9*==$^zE=Xa3h7G-IQ~V`Ac>!~bg^ zI<7>A?h9{v9w-piBx#_-&{@}oBY9^}<<@{1>H;Tsa0el~@4(Kz=n tKWrQl8D`wixb5F`lXXPDMgO(F3~{|Czx)hhr1 delta 9177 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 diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index da3d8c2..f1bdacd 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -7203,13 +7203,16 @@ Average pressure in contour: %2 MPa No pressure or flow data无压力和流量数据 Pressure压力 Flow流量 + Oil phase flow油相流量 + Gas phase flow气相流量 + Water phase flow水相流量 Time时间 hh MPaMPa m³/dm³/d - Pressure Record:压力记录: - Flow Record:流量记录: - Display Phase:显示相: + Pressure Record压力记录 + Flow Record流量记录 + Display Phase显示相 This page only displays the selected record.此页面仅展示当前选中的记录。 (Invalid) (无效) (Empty) (空) diff --git a/Src/nmNum/nmSubWxs/nmWellPressureFlowPage.cpp b/Src/nmNum/nmSubWxs/nmWellPressureFlowPage.cpp index fa07e3c..1529215 100644 --- a/Src/nmNum/nmSubWxs/nmWellPressureFlowPage.cpp +++ b/Src/nmNum/nmSubWxs/nmWellPressureFlowPage.cpp @@ -1021,7 +1021,7 @@ void nmWellPressureFlowPage::createRecordSelectionBar() pBarLayout->setSpacing(6); QLabel* pPressureLabel = new QLabel( - tr("Pressure Record:"), m_pRecordSelectionBar); + tr("Pressure Record"), m_pRecordSelectionBar); m_pPressureGaugeCombo = new QComboBox(m_pRecordSelectionBar); m_pPressureGaugeCombo->setEnabled(false); m_pPressureGaugeCombo->setMinimumWidth(160); @@ -1029,7 +1029,7 @@ void nmWellPressureFlowPage::createRecordSelectionBar() tr("This page only displays the selected record.")); QLabel* pFlowLabel = new QLabel( - tr("Flow Record:"), m_pRecordSelectionBar); + tr("Flow Record"), m_pRecordSelectionBar); m_pFlowGaugeCombo = new QComboBox(m_pRecordSelectionBar); m_pFlowGaugeCombo->setEnabled(false); m_pFlowGaugeCombo->setMinimumWidth(160); @@ -1042,7 +1042,7 @@ void nmWellPressureFlowPage::createRecordSelectionBar() pPhaseLayout->setContentsMargins(0, 0, 0, 0); pPhaseLayout->setSpacing(6); QLabel* pPhaseLabel = new QLabel( - tr("Display Phase:"), m_pDisplayPhaseContainer); + tr("Display Phase"), m_pDisplayPhaseContainer); m_pDisplayPhaseCombo = new QComboBox(m_pDisplayPhaseContainer); m_pDisplayPhaseCombo->setMinimumWidth(80); pPhaseLayout->addWidget(pPhaseLabel); @@ -1327,8 +1327,24 @@ void nmWellPressureFlowPage::updateUnitHeader() return; } + QString sFlowTitle = tr("Flow"); + switch (m_eDisplayPhase) + { + case PHASE_Oil: + sFlowTitle = tr("Oil phase flow"); + break; + case PHASE_Gas: + sFlowTitle = tr("Gas phase flow"); + break; + case PHASE_Water: + sFlowTitle = tr("Water phase flow"); + break; + default: + break; + } + QStringList listTitles; - listTitles << tr("Time") << tr("Flow"); + listTitles << tr("Time") << sFlowTitle; QStringList listUnits; listUnits << m_sTimeUnit << m_sFlowUnit; m_pFlowHeader->setHeaderData(listTitles, listUnits);