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

Merge pull request #8791 from OPM/8790-rename-to-group

Browse Source 
Rename summary references to "Group"
This commit is contained in:
Magne Sjaastad
2022-04-07 21:06:40 +02:00
committed by GitHub
parent f099a8c89f
commit 93614ef272
42 changed files with 631 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
View File

@@ -81,7 +81,7 @@ RimWellPathCompletionSettings::RimWellPathCompletionSettings()
CAF_PDM_InitField( &m_wellNameForExport, "WellNameForExport", QString(), "Well Name" );
m_wellNameForExport.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_wellGroupName, "WellGroupNameForExport", QString(), "Well Group Name" );
CAF_PDM_InitField( &m_groupName, "WellGroupNameForExport", QString(), "Group Name" );
CAF_PDM_InitField( &m_referenceDepth, "ReferenceDepthForExport", QString(), "Reference Depth for BHP" );
CAF_PDM_InitFieldNoDefault( &m_preferredFluidPhase, "WellTypeForExport", "Preferred Fluid Phase" );
CAF_PDM_InitField( &m_drainageRadiusForPI, "DrainageRadiusForPI", QString( "0.0" ), "Drainage Radius for PI" );
@@ -113,7 +113,7 @@ RimWellPathCompletionSettings::RimWellPathCompletionSettings( const RimWellPathC
RimWellPathCompletionSettings& RimWellPathCompletionSettings::operator=( const RimWellPathCompletionSettings& rhs )
{
m_wellNameForExport = rhs.m_wellNameForExport;
m_wellGroupName = rhs.m_wellGroupName;
m_groupName = rhs.m_groupName;
m_referenceDepth = rhs.m_referenceDepth;
m_preferredFluidPhase = rhs.m_preferredFluidPhase;
m_drainageRadiusForPI = rhs.m_drainageRadiusForPI;
@@ -158,9 +158,9 @@ QString RimWellPathCompletionSettings::wellNameForExport() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellPathCompletionSettings::wellGroupNameForExport() const
QString RimWellPathCompletionSettings::groupNameForExport() const
{
return formatStringForExport( m_wellGroupName, "1*" );
return formatStringForExport( m_groupName, "1*" );
}
//--------------------------------------------------------------------------------------------------
@@ -280,7 +280,7 @@ void RimWellPathCompletionSettings::defineUiOrdering( QString uiConfigName, caf:
{
caf::PdmUiGroup* compExportGroup = uiOrdering.addNewGroup( "Completion Export Parameters" );
compExportGroup->add( &m_wellNameForExport );
compExportGroup->add( &m_wellGroupName );
compExportGroup->add( &m_groupName );
compExportGroup->add( &m_referenceDepth );
compExportGroup->add( &m_preferredFluidPhase );
compExportGroup->add( &m_drainageRadiusForPI );

4
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.h
View File

@@ -69,7 +69,7 @@ public:
void setWellNameForExport( const QString& name );
void updateWellPathNameHasChanged( const QString& newWellPathName, const QString& previousWellPathName );
QString wellNameForExport() const;
QString wellGroupNameForExport() const;
QString groupNameForExport() const;
QString referenceDepthForExport() const;
QString wellTypeNameForExport() const;
@@ -99,7 +99,7 @@ private:
friend class RimWellPathCompletions;
caf::PdmField<QString> m_wellNameForExport;
caf::PdmField<QString> m_wellGroupName;
caf::PdmField<QString> m_groupName;
caf::PdmField<QString> m_referenceDepth;
caf::PdmField<WellTypeEnum> m_preferredFluidPhase;

6
ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp
View File

@@ -104,14 +104,14 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant&
return true;
}
}
else if ( category == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP )
else if ( category == RifEclipseSummaryAddress::SUMMARY_GROUP )
{
std::string oldString = oldValue.toString().toStdString();
std::string newString = newValue.toString().toStdString();
if ( adr->wellGroupName() == oldString )
if ( adr->groupName() == oldString )
{
adr->setWellGroupName( newString );
adr->setGroupName( newString );
return true;
}

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

@@ -75,10 +75,10 @@ bool RimMultiSummaryPlotNameHelper::isWellNameInTitle() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimMultiSummaryPlotNameHelper::isWellGroupNameInTitle() const
bool RimMultiSummaryPlotNameHelper::isGroupNameInTitle() const
{
return std::any_of( m_nameHelpers.begin(), m_nameHelpers.end(), []( auto nameHelper ) {
return nameHelper->isWellGroupNameInTitle();
return nameHelper->isGroupNameInTitle();
} );
}
@@ -174,11 +174,11 @@ std::string RimMultiSummaryPlotNameHelper::titleWellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RimMultiSummaryPlotNameHelper::titleWellGroupName() const
std::string RimMultiSummaryPlotNameHelper::titleGroupName() const
{
for ( auto nameHelper : m_nameHelpers )
{
if ( nameHelper->isWellGroupNameInTitle() ) return nameHelper->titleWellGroupName();
if ( nameHelper->isGroupNameInTitle() ) return nameHelper->titleGroupName();
}
return "";

4
ApplicationLibCode/ProjectDataModel/Summary/RimMultipleSummaryPlotNameHelper.h
View File

@@ -32,7 +32,7 @@ public:
bool isPlotDisplayingSingleQuantity() const override;
bool isWellNameInTitle() const override;
bool isWellGroupNameInTitle() const override;
bool isGroupNameInTitle() const override;
bool isRegionInTitle() const override;
bool isCaseInTitle() const override;
bool isBlockInTitle() const override;
@@ -43,7 +43,7 @@ public:
std::string titleQuantity() const override;
std::string titleWellName() const override;
std::string titleWellGroupName() const override;
std::string titleGroupName() const override;
std::string titleRegion() const override;
std::string titleBlock() const override;
std::string titleSegment() const override;

4
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
View File

@@ -122,8 +122,8 @@ QList<caf::PdmOptionItemInfo>
using AddressAppEnum = caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>;
options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddress::SUMMARY_WELL ),
RifEclipseSummaryAddress::SUMMARY_WELL ) );
options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddress::SUMMARY_WELL_GROUP ),
RifEclipseSummaryAddress::SUMMARY_WELL_GROUP ) );
options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddress::SUMMARY_GROUP ),
RifEclipseSummaryAddress::SUMMARY_GROUP ) );
return options;
}

10
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
View File

@@ -35,7 +35,7 @@ void caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::setUp()
addItem( RifEclipseSummaryAddress::SUMMARY_MISC, "SUMMARY_MISC", "Misc" );
addItem( RifEclipseSummaryAddress::SUMMARY_REGION, "SUMMARY_REGION", "Region" );
addItem( RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION, "SUMMARY_REGION_2_REGION", "Region-Region" );
addItem( RifEclipseSummaryAddress::SUMMARY_WELL_GROUP, "SUMMARY_WELL_GROUP", "Group" );
addItem( RifEclipseSummaryAddress::SUMMARY_GROUP, "SUMMARY_WELL_GROUP", "Group" );
addItem( RifEclipseSummaryAddress::SUMMARY_WELL, "SUMMARY_WELL", "Well" );
addItem( RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION, "SUMMARY_WELL_COMPLETION", "Completion" );
addItem( RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR, "SUMMARY_WELL_COMPLETION_LGR", "Lgr-Completion" );
@@ -64,7 +64,7 @@ RimSummaryAddress::RimSummaryAddress()
CAF_PDM_InitFieldNoDefault( &m_quantityName, "SummaryQuantityName", "Quantity" );
CAF_PDM_InitFieldNoDefault( &m_regionNumber, "SummaryRegion", "Region" );
CAF_PDM_InitFieldNoDefault( &m_regionNumber2, "SummaryRegion2", "Region2" );
CAF_PDM_InitFieldNoDefault( &m_wellGroupName, "SummaryWellGroup", "Group" );
CAF_PDM_InitFieldNoDefault( &m_groupName, "SummaryWellGroup", "Group" );
CAF_PDM_InitFieldNoDefault( &m_wellName, "SummaryWell", "Well" );
CAF_PDM_InitFieldNoDefault( &m_wellSegmentNumber, "SummaryWellSegment", "Well Segment" );
CAF_PDM_InitFieldNoDefault( &m_lgrName, "SummaryLgr", "Grid" );
@@ -120,7 +120,7 @@ void RimSummaryAddress::setAddress( const RifEclipseSummaryAddress& addr )
m_quantityName = addr.quantityName().c_str();
m_regionNumber = addr.regionNumber();
m_regionNumber2 = addr.regionNumber2();
m_wellGroupName = addr.wellGroupName().c_str();
m_groupName = addr.groupName().c_str();
m_wellName = addr.wellName().c_str();
m_wellSegmentNumber = addr.wellSegmentNumber();
m_lgrName = addr.lgrName().c_str();
@@ -144,7 +144,7 @@ RifEclipseSummaryAddress RimSummaryAddress::address()
m_quantityName().toStdString(),
m_regionNumber(),
m_regionNumber2(),
m_wellGroupName().toStdString(),
m_groupName().toStdString(),
m_wellName().toStdString(),
m_wellSegmentNumber(),
m_lgrName().toStdString(),
@@ -206,7 +206,7 @@ QString RimSummaryAddress::keywordForCategory( RifEclipseSummaryAddress::Summary
// Return the keyword text for supported field replacement in plot templates
if ( category == RifEclipseSummaryAddress::SUMMARY_WELL ) return m_wellName.keyword();
if ( category == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP ) return m_wellGroupName.keyword();
if ( category == RifEclipseSummaryAddress::SUMMARY_GROUP ) return m_groupName.keyword();
if ( category == RifEclipseSummaryAddress::SUMMARY_REGION ) return m_regionNumber.keyword();
return {};

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.h
View File

@@ -74,7 +74,7 @@ private:
caf::PdmField<QString> m_quantityName;
caf::PdmField<int> m_regionNumber;
caf::PdmField<int> m_regionNumber2;
caf::PdmField<QString> m_wellGroupName;
caf::PdmField<QString> m_groupName;
caf::PdmField<QString> m_wellName;
caf::PdmField<int> m_wellSegmentNumber;
caf::PdmField<QString> m_lgrName;

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

@@ -131,7 +131,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
RimSummaryAddressCollection* fields = getOrCreateSubfolder( "Field", CollectionContentType::FIELD );
RimSummaryAddressCollection* regions = getOrCreateSubfolder( "Regions", CollectionContentType::REGION_FOLDER );
RimSummaryAddressCollection* wells = getOrCreateSubfolder( "Wells", CollectionContentType::WELL_FOLDER );
RimSummaryAddressCollection* groups = getOrCreateSubfolder( "Well Groups", CollectionContentType::WELL_GROUP_FOLDER );
RimSummaryAddressCollection* groups = getOrCreateSubfolder( "Groups", CollectionContentType::GROUP_FOLDER );
for ( const auto& address : addresses )
{
@@ -153,8 +153,8 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
ensembleId );
break;
case RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_WELL_GROUP:
groups->addToSubfolder( QString::fromStdString( address.wellGroupName() ),
case RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_GROUP:
groups->addToSubfolder( QString::fromStdString( address.groupName() ),
CollectionContentType::WELL_GROUP,
address,
caseId,

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

@@ -42,7 +42,7 @@ public:
FIELD,
MISC,
WELL_FOLDER,
WELL_GROUP_FOLDER,
GROUP_FOLDER,
REGION_FOLDER
};

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

@@ -75,8 +75,8 @@ RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator( const
if ( curveDef.summaryCase() ) m_caseToAppearanceIdxMap[curveDef.summaryCase()] = -1;
if ( !curveDef.summaryAddress().wellName().empty() )
m_welToAppearanceIdxMap[curveDef.summaryAddress().wellName()] = -1;
if ( !curveDef.summaryAddress().wellGroupName().empty() )
m_grpToAppearanceIdxMap[curveDef.summaryAddress().wellGroupName()] = -1;
if ( !curveDef.summaryAddress().groupName().empty() )
m_grpToAppearanceIdxMap[curveDef.summaryAddress().groupName()] = -1;
if ( !( curveDef.summaryAddress().regionNumber() == -1 ) )
m_regToAppearanceIdxMap[curveDef.summaryAddress().regionNumber()] = -1;
@@ -350,12 +350,12 @@ void RimSummaryCurveAppearanceCalculator::setupCurveLook( RimSummaryCurve* curve
int caseAppearanceIdx = m_caseToAppearanceIdxMap[curve->summaryCaseY()];
int varAppearanceIdx = m_varToAppearanceIdxMap[curve->summaryAddressY().quantityName()];
int welAppearanceIdx = m_welToAppearanceIdxMap[curve->summaryAddressY().wellName()];
int grpAppearanceIdx = m_grpToAppearanceIdxMap[curve->summaryAddressY().wellGroupName()];
int grpAppearanceIdx = m_grpToAppearanceIdxMap[curve->summaryAddressY().groupName()];
int regAppearanceIdx = m_regToAppearanceIdxMap[curve->summaryAddressY().regionNumber()];
// Remove index for curves without value at the specific dimension
if ( curve->summaryAddressY().wellName().empty() ) welAppearanceIdx = -1;
if ( curve->summaryAddressY().wellGroupName().empty() ) grpAppearanceIdx = -1;
if ( curve->summaryAddressY().groupName().empty() ) grpAppearanceIdx = -1;
if ( curve->summaryAddressY().regionNumber() < 0 ) regAppearanceIdx = -1;
setOneCurveAppearance( m_caseAppearanceType, m_allSummaryCaseNames.size(), caseAppearanceIdx, curve );

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

@@ -49,7 +49,7 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
CAF_PDM_InitField( &m_vectorName, "VectorName", true, "Vector Name");
CAF_PDM_InitField( &m_unit, "Unit", false, "Unit");
CAF_PDM_InitField( &m_regionNumber, "RegionNumber", true, "Region Number");
CAF_PDM_InitField( &m_wellGroupName, "WellGroupName", true, "Group Name");
CAF_PDM_InitField( &m_groupName, "WellGroupName", true, "Group Name");
CAF_PDM_InitField( &m_wellName, "WellName", true, "Well Name");
CAF_PDM_InitField(&m_wellSegmentNumber, "WellSegmentNumber", true, "Well Segment Number");
CAF_PDM_InitField( &m_lgrName, "LgrName", true, "Lgr Name");
@@ -141,7 +141,7 @@ void RimSummaryCurveAutoName::applySettings( const RimSummaryCurveAutoName& othe
m_longVectorName = other.m_longVectorName;
m_unit = other.m_unit;
m_regionNumber = other.m_regionNumber;
m_wellGroupName = other.m_wellGroupName;
m_groupName = other.m_groupName;
m_wellName = other.m_wellName;
m_wellSegmentNumber = other.m_wellSegmentNumber;
m_lgrName = other.m_lgrName;
@@ -287,15 +287,15 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string&
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
case RifEclipseSummaryAddress::SUMMARY_GROUP:
{
if ( m_wellGroupName )
if ( m_groupName )
{
bool skipSubString = nameHelper && nameHelper->isWellGroupNameInTitle();
bool skipSubString = nameHelper && nameHelper->isGroupNameInTitle();
if ( !skipSubString )
{
if ( !text.empty() ) text += ":";
text += summaryAddress.wellGroupName();
text += summaryAddress.groupName();
}
}
}
@@ -440,7 +440,7 @@ void RimSummaryCurveAutoName::defineUiOrdering( QString uiConfigName, caf::PdmUi
uiOrdering.add( &m_caseName );
uiOrdering.add( &m_vectorName );
uiOrdering.add( &m_longVectorName );
uiOrdering.add( &m_wellGroupName );
uiOrdering.add( &m_groupName );
uiOrdering.add( &m_wellName );
caf::PdmUiGroup& advanced = *( uiOrdering.addNewGroup( "Advanced" ) );

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
View File

@@ -60,7 +60,7 @@ private:
caf::PdmField<bool> m_longVectorName;
caf::PdmField<bool> m_unit;
caf::PdmField<bool> m_regionNumber;
caf::PdmField<bool> m_wellGroupName;
caf::PdmField<bool> m_groupName;
caf::PdmField<bool> m_wellName;
caf::PdmField<bool> m_wellSegmentNumber;
caf::PdmField<bool> m_lgrName;

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.cpp
View File

@@ -43,11 +43,11 @@ QString RimSummaryNameHelper::aggregatedPlotTitle( const RimSummaryNameHelper& o
title += QString::fromStdString( wellName );
}
auto wellGroupName = this->titleWellGroupName();
if ( !other.isWellGroupNameInTitle() && !wellGroupName.empty() )
auto groupName = this->titleGroupName();
if ( !other.isGroupNameInTitle() && !groupName.empty() )
{
if ( !title.isEmpty() ) title += ", ";
title += QString::fromStdString( wellGroupName );
title += QString::fromStdString( groupName );
}
auto region = this->titleRegion();

16
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.h
View File

@@ -39,7 +39,7 @@ public:
virtual bool isPlotDisplayingSingleQuantity() const = 0;
virtual bool isWellNameInTitle() const = 0;
virtual bool isWellGroupNameInTitle() const = 0;
virtual bool isGroupNameInTitle() const = 0;
virtual bool isRegionInTitle() const = 0;
virtual bool isCaseInTitle() const = 0;
virtual bool isBlockInTitle() const = 0;
@@ -48,11 +48,11 @@ public:
virtual QString caseName() const = 0;
virtual std::string titleQuantity() const = 0;
virtual std::string titleWellName() const = 0;
virtual std::string titleWellGroupName() const = 0;
virtual std::string titleRegion() const = 0;
virtual std::string titleBlock() const = 0;
virtual std::string titleSegment() const = 0;
virtual std::string titleCompletion() const = 0;
virtual std::string titleQuantity() const = 0;
virtual std::string titleWellName() const = 0;
virtual std::string titleGroupName() const = 0;
virtual std::string titleRegion() const = 0;
virtual std::string titleBlock() const = 0;
virtual std::string titleSegment() const = 0;
virtual std::string titleCompletion() const = 0;
};

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -1981,8 +1981,8 @@ int RimSummaryPlot::handleAddressCollectionDrop( RimSummaryAddressCollection* ad
}
else if ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::WELL_GROUP )
{
auto currentObjectString = curveAdr.wellGroupName();
curveAdr.setWellGroupName( droppedName );
auto currentObjectString = curveAdr.groupName();
curveAdr.setGroupName( droppedName );
newCurveDef.setSummaryAddress( curveAdr );
newCurveDefsWithObjectNames[newCurveDef].insert( currentObjectString );
}

22
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp
View File

@@ -130,9 +130,9 @@ bool RimSummaryPlotNameHelper::isWellNameInTitle() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryPlotNameHelper::isWellGroupNameInTitle() const
bool RimSummaryPlotNameHelper::isGroupNameInTitle() const
{
return !m_titleWellGroupName.empty();
return !m_titleGroupName.empty();
}
//--------------------------------------------------------------------------------------------------
@@ -202,9 +202,9 @@ std::string RimSummaryPlotNameHelper::titleWellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RimSummaryPlotNameHelper::titleWellGroupName() const
std::string RimSummaryPlotNameHelper::titleGroupName() const
{
return m_titleWellGroupName;
return m_titleGroupName;
}
//--------------------------------------------------------------------------------------------------
@@ -262,11 +262,11 @@ void RimSummaryPlotNameHelper::extractPlotTitleSubStrings()
{
clearTitleSubStrings();
auto wellNames = m_analyzer->wellNames();
auto wellGroupNames = m_analyzer->wellGroupNames();
auto regions = m_analyzer->regionNumbers();
auto blocks = m_analyzer->blocks();
auto categories = m_analyzer->categories();
auto wellNames = m_analyzer->wellNames();
auto groupNames = m_analyzer->groupNames();
auto regions = m_analyzer->regionNumbers();
auto blocks = m_analyzer->blocks();
auto categories = m_analyzer->categories();
if ( categories.size() == 1 )
{
@@ -293,9 +293,9 @@ void RimSummaryPlotNameHelper::extractPlotTitleSubStrings()
}
}
if ( wellGroupNames.size() == 1 )
if ( groupNames.size() == 1 )
{
m_titleWellGroupName = *( wellGroupNames.begin() );
m_titleGroupName = *( groupNames.begin() );
}
if ( regions.size() == 1 )

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.h
View File

@@ -53,7 +53,7 @@ public:
bool isPlotDisplayingSingleQuantity() const override;
bool isWellNameInTitle() const override;
bool isWellGroupNameInTitle() const override;
bool isGroupNameInTitle() const override;
bool isRegionInTitle() const override;
bool isCaseInTitle() const override;
bool isBlockInTitle() const override;
@@ -64,7 +64,7 @@ public:
std::string titleQuantity() const override;
std::string titleWellName() const override;
std::string titleWellGroupName() const override;
std::string titleGroupName() const override;
std::string titleRegion() const override;
std::string titleBlock() const override;
std::string titleSegment() const override;
@@ -85,7 +85,7 @@ private:
std::string m_titleQuantity;
std::string m_titleWellName;
std::string m_titleWellGroupName;
std::string m_titleGroupName;
std::string m_titleRegion;
std::string m_titleBlock;
std::string m_titleSegment;

28
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -63,7 +63,7 @@ RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping()
"Include Ensemble Cases in Case List" );
CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name" );
CAF_PDM_InitFieldNoDefault( &m_wellGroupName, "GroupName", "Group Name" );
CAF_PDM_InitFieldNoDefault( &m_groupName, "GroupName", "Group Name" );
CAF_PDM_InitFieldNoDefault( &m_region, "Region", "Region" );
CAF_PDM_InitFieldNoDefault( &m_quantity, "Quantities", "Quantity" );
@@ -321,9 +321,9 @@ QList<caf::PdmOptionItemInfo>
{
category = RifEclipseSummaryAddress::SUMMARY_REGION;
}
else if ( fieldNeedingOptions == &m_wellGroupName )
else if ( fieldNeedingOptions == &m_groupName )
{
category = RifEclipseSummaryAddress::SUMMARY_WELL_GROUP;
category = RifEclipseSummaryAddress::SUMMARY_GROUP;
}
else if ( fieldNeedingOptions == &m_cellBlock )
{
@@ -436,7 +436,7 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
}
m_wellName.uiCapability()->updateConnectedEditors();
m_wellGroupName.uiCapability()->updateConnectedEditors();
m_groupName.uiCapability()->updateConnectedEditors();
m_region.uiCapability()->updateConnectedEditors();
m_quantity.uiCapability()->updateConnectedEditors();
}
@@ -459,7 +459,7 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
}
m_wellName.uiCapability()->updateConnectedEditors();
m_wellGroupName.uiCapability()->updateConnectedEditors();
m_groupName.uiCapability()->updateConnectedEditors();
m_region.uiCapability()->updateConnectedEditors();
m_quantity.uiCapability()->updateConnectedEditors();
}
@@ -505,9 +505,9 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
{
summaryCategoryToModify = RifEclipseSummaryAddress::SUMMARY_REGION;
}
else if ( changedField == &m_wellGroupName )
else if ( changedField == &m_groupName )
{
summaryCategoryToModify = RifEclipseSummaryAddress::SUMMARY_WELL_GROUP;
summaryCategoryToModify = RifEclipseSummaryAddress::SUMMARY_GROUP;
}
else if ( changedField == &m_cellBlock )
{
@@ -614,9 +614,9 @@ caf::PdmValueField* RimSummaryPlotSourceStepping::fieldToModify()
return &m_wellName;
}
if ( analyzer.wellGroupNames().size() == 1 )
if ( analyzer.groupNames().size() == 1 )
{
return &m_wellGroupName;
return &m_groupName;
}
if ( analyzer.regionNumbers().size() == 1 )
@@ -820,12 +820,12 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForD
fieldsCommonForAllCurves.push_back( &m_wellName );
}
if ( analyzer.wellGroupNames().size() == 1 )
if ( analyzer.groupNames().size() == 1 )
{
QString txt = QString::fromStdString( *( analyzer.wellGroupNames().begin() ) );
m_wellGroupName = txt;
QString txt = QString::fromStdString( *( analyzer.groupNames().begin() ) );
m_groupName = txt;
fieldsCommonForAllCurves.push_back( &m_wellGroupName );
fieldsCommonForAllCurves.push_back( &m_groupName );
}
if ( analyzer.regionNumbers().size() == 1 )
@@ -1000,7 +1000,7 @@ void RimSummaryPlotSourceStepping::defineEditorAttribute( const caf::PdmFieldHan
nextText = RimSummaryPlotControls::caseNextKeyText();
prevText = RimSummaryPlotControls::casePrevKeyText();
}
else if ( field == &m_wellName || field == &m_wellGroupName || field == &m_region )
else if ( field == &m_wellName || field == &m_groupName || field == &m_region )
{
nextText = RimSummaryPlotControls::otherNextKeyText();
prevText = RimSummaryPlotControls::otherPrevKeyText();

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
View File

@@ -97,7 +97,7 @@ private:
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
caf::PdmField<QString> m_wellName;
caf::PdmField<QString> m_wellGroupName;
caf::PdmField<QString> m_groupName;
caf::PdmField<int> m_region;
caf::PdmField<QString> m_quantity;
caf::PdmField<QString> m_placeholderForLabel;