From 9b4a3f663e550fee070da816836d1bdae58a662a Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 13 Mar 2023 19:01:31 +0100 Subject: [PATCH] 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 --- .../RicNewMultiPhaseRftSegmentPlotFeature.cpp | 10 ++++++---- .../RicNewRftSegmentWellLogPlotFeature.cpp | 10 ++++++---- .../Summary/RimSummaryAddressCollection.cpp | 2 +- .../Summary/RimSummaryCurveAutoName.cpp | 8 +++++--- .../Summary/RimSummaryPlotAxisFormatter.cpp | 7 ++++++- ResInsightVersion.cmake | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewMultiPhaseRftSegmentPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewMultiPhaseRftSegmentPlotFeature.cpp index cccbcb690b..76832fdfbd 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewMultiPhaseRftSegmentPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewMultiPhaseRftSegmentPlotFeature.cpp @@ -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::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::uiText( branchType ); trackName += " Rates"; diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp index 266d850f18..f1423d6605 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp @@ -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::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::uiText( branchType ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp index 189d1616da..0567137042 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp @@ -165,13 +165,13 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setvectorNames().size() == 1; if ( !skipSubString ) @@ -202,6 +202,8 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress& if ( summaryAddress.isHistoryVector() ) quantityName = quantityName.substr( 0, quantityName.size() - 1 ); text = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( quantityName ); + + if ( m_vectorName ) text += " (" + summaryAddress.vectorName() + ")"; } else { diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp index c7ea199f49..4ead970f66 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp @@ -301,9 +301,14 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const for ( const auto& unitIt : unitToQuantityNameMap ) { + // Insert line shift if multiple quantities are present, otherwise insert space + bool insertLineShift = unitIt.second.size() > 1; + for ( const auto& quantIt : unitIt.second ) { - assembledYAxisText += QString::fromStdString( quantIt ) + " "; + assembledYAxisText += QString::fromStdString( quantIt ); + + insertLineShift ? ( assembledYAxisText += "\n" ) : ( assembledYAxisText += " " ); } if ( m_axisProperties->showUnitText() ) diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index f91814b3bc..01b37ff0cc 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -5,7 +5,7 @@ set(RESINSIGHT_PATCH_VERSION 0) # Opional text with no restrictions #set(RESINSIGHT_VERSION_TEXT "-dev") -set(RESINSIGHT_VERSION_TEXT "-RC_01") +set(RESINSIGHT_VERSION_TEXT "-RC_02") # Optional text # Must be unique and increasing within one combination of major/minor/patch version