OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Release adjustments

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
View File

@@ -165,13 +165,13 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
if ( addresses.empty() ) return;
auto* fields = getOrCreateSubfolder( CollectionContentType::FIELD );
auto* groups = getOrCreateSubfolder( CollectionContentType::GROUP_FOLDER );
auto* wells = getOrCreateSubfolder( CollectionContentType::WELL_FOLDER );
auto* aquifer = getOrCreateSubfolder( CollectionContentType::AQUIFER );
auto* network = getOrCreateSubfolder( CollectionContentType::NETWORK );
auto* misc = getOrCreateSubfolder( CollectionContentType::MISC );
auto* regions = getOrCreateSubfolder( CollectionContentType::REGION_FOLDER );
auto* region2region = getOrCreateSubfolder( CollectionContentType::REGION_2_REGION );
auto* groups = getOrCreateSubfolder( CollectionContentType::GROUP_FOLDER );
auto* completion = getOrCreateSubfolder( CollectionContentType::WELL_COMPLETION );
auto* segment = getOrCreateSubfolder( CollectionContentType::WELL_SEGMENT );
auto* blocks = getOrCreateSubfolder( CollectionContentType::BLOCK );

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@@ -45,8 +45,8 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
// clang-format off
CAF_PDM_InitObject("RimSummaryCurveAutoName");
CAF_PDM_InitField( &m_longVectorName, "LongVectorName", false, "Long Vector Name");
CAF_PDM_InitField( &m_vectorName, "VectorName", true, "Vector Name");
CAF_PDM_InitField( &m_longVectorName, "LongVectorName", true, "Long Vector Name");
CAF_PDM_InitField( &m_vectorName, "VectorName", false, "Vector Name");
CAF_PDM_InitField( &m_unit, "Unit", false, "Unit");
CAF_PDM_InitField( &m_regionNumber, "RegionNumber", true, "Region Number");
CAF_PDM_InitField( &m_groupName, "WellGroupName", true, "Group Name");
@@ -191,7 +191,7 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
{
std::string text; // Using std::string locally to avoid a lot of conversion when building the curve name
if ( m_vectorName )
if ( m_vectorName || m_longVectorName )
{
bool skipSubString = currentNameHelper && currentNameHelper->vectorNames().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
{

7
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@@ -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() )