diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index ebd8d23..c9591eb 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 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);