Release adjustments

* Add CON*RAT track for tubing branch
* Set long summary vector name as default, and allow both in curve name
* Use line shift if multiple quantities are present on axis title
Insert line shift if multiple quantities are present, otherwise insert space between individual vector names and the unit text.
* Move Groups between Field and Wells
* Bump version
This commit is contained in:
Magne Sjaastad
2023-03-13 19:01:31 +01:00
committed by GitHub
parent eb5a0cf936
commit 9b4a3f663e
6 changed files with 25 additions and 14 deletions

View File

@@ -75,15 +75,17 @@ void RicNewMultiPhaseRftSegmentPlotFeature::onActionTriggered( bool isChecked )
auto wellNames = rftReader->wellNames();
if ( !wellNames.empty() ) wellName = *wellNames.begin();
// Reservoir rates can be available on both annulus and device
for ( auto branchType : { RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE } )
const auto allBranchTypes = { RiaDefines::RftBranchType::RFT_ANNULUS,
RiaDefines::RftBranchType::RFT_DEVICE,
RiaDefines::RftBranchType::RFT_TUBING };
for ( auto branchType : allBranchTypes )
{
QString trackName = "Reservoir Rates - " + caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );
appendTrackAndCurveForBranchType( plot, trackName, { "CONGRAT", "CONORAT", "CONWRAT" }, wellName, branchType, summaryCase );
}
for ( auto branchType :
{ RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE, RiaDefines::RftBranchType::RFT_TUBING } )
for ( auto branchType : allBranchTypes )
{
QString trackName = caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );
trackName += " Rates";

View File

@@ -75,8 +75,11 @@ void RicNewRftSegmentWellLogPlotFeature::onActionTriggered( bool isChecked )
auto wellNames = rftReader->wellNames();
if ( !wellNames.empty() ) wellName = *wellNames.begin();
// Reservoir rates can be available on both annulus and device
for ( auto branchType : { RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE } )
const auto allBranchTypes = { RiaDefines::RftBranchType::RFT_ANNULUS,
RiaDefines::RftBranchType::RFT_DEVICE,
RiaDefines::RftBranchType::RFT_TUBING };
for ( auto branchType : allBranchTypes )
{
QString trackName = "Reservoir Rates - " + caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );
@@ -89,8 +92,7 @@ void RicNewRftSegmentWellLogPlotFeature::onActionTriggered( bool isChecked )
curve->setFillStyle( Qt::SolidPattern );
}
for ( auto branchType :
{ RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE, RiaDefines::RftBranchType::RFT_TUBING } )
for ( auto branchType : allBranchTypes )
{
QString resultName = "SEGGRAT";
QString trackName = caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );