From 4c7fe38922da0cf8cd7f1e95b506d730cf9e169d Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Wed, 28 Oct 2026 17:02:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=A8=E8=A1=A8=E7=9A=AE?= =?UTF-8?q?=E7=B3=BB=E6=95=B0=E5=8F=8A=E9=A2=9C=E8=89=B2=E5=9B=BE=E4=BE=8B?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BF=BB=E8=AF=91=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 补全射孔封堵对话框及时间相关表皮系数中文翻译 - 为表皮系数与流量图的坐标轴标题接入翻译 - 补全颜色图例设置按钮翻译,并统一底部按钮右对齐 - 更新中文 TS 和 QM 翻译资源 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 195053 -> 195952 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 54 +++++++++++------- Src/nmNum/nmSubWxs/nmWxChartWidget.cpp | 4 +- .../nmWxPebiResultColorScaleSettingsDlg.cpp | 2 + 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index e32b87faa28867a10450d02d97724be6df6911cd..fe7f48bbc9f0f0ff59a9280607c2e4d8799cc8d0 100644 GIT binary patch delta 10673 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 TY8n=uvGx|VD7(-|dv*GMrEv(S delta 10356 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 JG40ak{{SPcqp$z~ diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index 9e63badc..aeed24c5 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -3393,6 +3393,9 @@ No valid error was returned; keep the last accepted result and reduce the step.< Unable to convert the range to the selected unit.无法将范围换算为所选单位。 Minimum must be less than maximum.最小值必须小于最大值。 Unable to read the committed color settings.无法读取已提交的颜色设置。 + Apply应用 + OK确定 + Cancel取消 nmWxPebiResultAnimationSettingsDlg @@ -6820,59 +6823,59 @@ Please check your input coordinates. nmWxPerforationClosing Perforation closing intervals - + 射孔封堵时段 Add - 添加 + 添加 Remove - 移除 + 移除 Show dates - 显示日期 + 显示日期 Time unit: - 时间单位: + 时间单位: Perforation - + 射孔段 Perforation #%1 - + 射孔段 #%1 All - 全部 + 全部 OK - 确定 + 确定 Cancel - 取消 + 取消 Start time - 开始时间 + 开始时间 Perforation state - + 射孔状态 Closed - + 关闭 Open - + 开启 @@ -7740,7 +7743,7 @@ Average pressure in contour: %2 MPa Skin vs Rate - 表皮系数对比 + 表皮系数与流量 Split Steps @@ -7776,19 +7779,19 @@ Average pressure in contour: %2 MPa hr - + hr MPa - + MPa Time - 持续时间(hr) + 时间 Flow - 流量 + 流量 m^3/D @@ -7820,7 +7823,7 @@ Average pressure in contour: %2 MPa dS/dQ - 表皮关于产量的变化率 + 表皮关于产量的变化率 @@ -8932,4 +8935,15 @@ Average pressure in contour: %2 MPa Grid generation failed: %1网格划分失败:%1 Check whether the well radius is too small, and check grid spacing and geometry positions.请检查井半径是否过小、网格尺度及几何位置是否合适。 + + nmWxChartWidget + + Liquid rate [STB/D] + 产液量 [STB/D] + + + Skin + 表皮系数 + + diff --git a/Src/nmNum/nmSubWxs/nmWxChartWidget.cpp b/Src/nmNum/nmSubWxs/nmWxChartWidget.cpp index 9cb40128..36b7202d 100644 --- a/Src/nmNum/nmSubWxs/nmWxChartWidget.cpp +++ b/Src/nmNum/nmSubWxs/nmWxChartWidget.cpp @@ -252,12 +252,12 @@ void nmWxChartWidget::drawAxes(QPainter& painter) // 轴标题 painter.setFont(QFont("Arial", 10)); painter.drawText(chartRect.center().x() - 50, chartRect.bottom() + 35, - "Liquid rate [STB/D]"); + tr("Liquid rate [STB/D]")); painter.save(); painter.translate(15, chartRect.center().y()); painter.rotate(-90); - painter.drawText(-15, 0, "Skin"); + painter.drawText(-15, 0, tr("Skin")); painter.restore(); } diff --git a/Src/nmNum/nmSubWxs/nmWxPebiResultColorScaleSettingsDlg.cpp b/Src/nmNum/nmSubWxs/nmWxPebiResultColorScaleSettingsDlg.cpp index 5d8fc9ef..ef544a96 100644 --- a/Src/nmNum/nmSubWxs/nmWxPebiResultColorScaleSettingsDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPebiResultColorScaleSettingsDlg.cpp @@ -398,6 +398,8 @@ void nmWxPebiResultColorScaleSettingsDlg::createUi() QHBoxLayout* pButtonLayout = new QHBoxLayout(); pButtonLayout->setContentsMargins(0, 0, 0, 0); pButtonLayout->setSpacing(6); + // 与数据过滤窗口一致,左侧留出弹性空间,错误提示隐藏时按钮也保持靠右。 + pButtonLayout->addStretch(); m_pApplyButton = new QPushButton(tr("Apply"), this); m_pOkButton = new QPushButton(tr("OK"), this); QPushButton* pCancelButton = new QPushButton(tr("Cancel"), this);