diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index e32b87fa..fe7f48bb 100644 Binary files a/Bin/Config/Lang/cn/nmNum_cn.qm and b/Bin/Config/Lang/cn/nmNum_cn.qm differ 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);