fix(nmSubWxs): 按显示相更新流量表头并精简标签

- 流量表格按当前相显示油相、气相或水相流量
- 移除压力记录、流量记录和显示相标签的冒号
- 更新中文翻译资源
feature/nmNum-multi-gauge-record
lh 4 days ago
parent 34d745ff60
commit 1ef8370bb1

Binary file not shown.

@ -7203,13 +7203,16 @@ Average pressure in contour: %2 MPa</source>
<message><source>No pressure or flow data</source><translation></translation></message> <message><source>No pressure or flow data</source><translation></translation></message>
<message><source>Pressure</source><translation></translation></message> <message><source>Pressure</source><translation></translation></message>
<message><source>Flow</source><translation></translation></message> <message><source>Flow</source><translation></translation></message>
<message><source>Oil phase flow</source><translation></translation></message>
<message><source>Gas phase flow</source><translation></translation></message>
<message><source>Water phase flow</source><translation></translation></message>
<message><source>Time</source><translation></translation></message> <message><source>Time</source><translation></translation></message>
<message><source>h</source><translation>h</translation></message> <message><source>h</source><translation>h</translation></message>
<message><source>MPa</source><translation>MPa</translation></message> <message><source>MPa</source><translation>MPa</translation></message>
<message><source>m³/d</source><translation>m³/d</translation></message> <message><source>m³/d</source><translation>m³/d</translation></message>
<message><source>Pressure Record:</source><translation></translation></message> <message><source>Pressure Record</source><translation></translation></message>
<message><source>Flow Record:</source><translation></translation></message> <message><source>Flow Record</source><translation></translation></message>
<message><source>Display Phase:</source><translation></translation></message> <message><source>Display Phase</source><translation></translation></message>
<message><source>This page only displays the selected record.</source><translation></translation></message> <message><source>This page only displays the selected record.</source><translation></translation></message>
<message><source> (Invalid)</source><translation> ()</translation></message> <message><source> (Invalid)</source><translation> ()</translation></message>
<message><source> (Empty)</source><translation> ()</translation></message> <message><source> (Empty)</source><translation> ()</translation></message>

@ -1021,7 +1021,7 @@ void nmWellPressureFlowPage::createRecordSelectionBar()
pBarLayout->setSpacing(6); pBarLayout->setSpacing(6);
QLabel* pPressureLabel = new QLabel( QLabel* pPressureLabel = new QLabel(
tr("Pressure Record:"), m_pRecordSelectionBar); tr("Pressure Record"), m_pRecordSelectionBar);
m_pPressureGaugeCombo = new QComboBox(m_pRecordSelectionBar); m_pPressureGaugeCombo = new QComboBox(m_pRecordSelectionBar);
m_pPressureGaugeCombo->setEnabled(false); m_pPressureGaugeCombo->setEnabled(false);
m_pPressureGaugeCombo->setMinimumWidth(160); m_pPressureGaugeCombo->setMinimumWidth(160);
@ -1029,7 +1029,7 @@ void nmWellPressureFlowPage::createRecordSelectionBar()
tr("This page only displays the selected record.")); tr("This page only displays the selected record."));
QLabel* pFlowLabel = new QLabel( QLabel* pFlowLabel = new QLabel(
tr("Flow Record:"), m_pRecordSelectionBar); tr("Flow Record"), m_pRecordSelectionBar);
m_pFlowGaugeCombo = new QComboBox(m_pRecordSelectionBar); m_pFlowGaugeCombo = new QComboBox(m_pRecordSelectionBar);
m_pFlowGaugeCombo->setEnabled(false); m_pFlowGaugeCombo->setEnabled(false);
m_pFlowGaugeCombo->setMinimumWidth(160); m_pFlowGaugeCombo->setMinimumWidth(160);
@ -1042,7 +1042,7 @@ void nmWellPressureFlowPage::createRecordSelectionBar()
pPhaseLayout->setContentsMargins(0, 0, 0, 0); pPhaseLayout->setContentsMargins(0, 0, 0, 0);
pPhaseLayout->setSpacing(6); pPhaseLayout->setSpacing(6);
QLabel* pPhaseLabel = new QLabel( QLabel* pPhaseLabel = new QLabel(
tr("Display Phase:"), m_pDisplayPhaseContainer); tr("Display Phase"), m_pDisplayPhaseContainer);
m_pDisplayPhaseCombo = new QComboBox(m_pDisplayPhaseContainer); m_pDisplayPhaseCombo = new QComboBox(m_pDisplayPhaseContainer);
m_pDisplayPhaseCombo->setMinimumWidth(80); m_pDisplayPhaseCombo->setMinimumWidth(80);
pPhaseLayout->addWidget(pPhaseLabel); pPhaseLayout->addWidget(pPhaseLabel);
@ -1327,8 +1327,24 @@ void nmWellPressureFlowPage::updateUnitHeader()
return; 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; QStringList listTitles;
listTitles << tr("Time") << tr("Flow"); listTitles << tr("Time") << sFlowTitle;
QStringList listUnits; QStringList listUnits;
listUnits << m_sTimeUnit << m_sFlowUnit; listUnits << m_sTimeUnit << m_sFlowUnit;
m_pFlowHeader->setHeaderData(listTitles, listUnits); m_pFlowHeader->setHeaderData(listTitles, listUnits);

Loading…
Cancel
Save