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

Improve method name to reflect implementation.

Browse Source 
RimColorLegendCollection::allColorLegeds is better than
RimColorLegendCollection::customColorLegends since method returns both kinds
of color legends.
This commit is contained in:
Kristian Bendiksen 2020-05-23 11:19:36 +02:00 committed by Magne Sjaastad
parent 0b9577df71
commit 30ee125749
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimColorLegendCollection.cpp
View File

@ -122,7 +122,7 @@ void RimColorLegendCollection::createStandardColorLegends()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RimColorLegend*> RimColorLegendCollection::customColorLegends() const std::vector<RimColorLegend*> RimColorLegendCollection::allColorLegends() const
{ {
std::vector<RimColorLegend*> allLegends; std::vector<RimColorLegend*> allLegends;
@ -155,7 +155,7 @@ void RimColorLegendCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimColorLegend* RimColorLegendCollection::findByName( const QString& name ) const RimColorLegend* RimColorLegendCollection::findByName( const QString& name ) const
{ {
std::vector<RimColorLegend*> allLegends = customColorLegends(); std::vector<RimColorLegend*> allLegends = allColorLegends();
for ( auto legend : allLegends ) for ( auto legend : allLegends )
{ {
if ( legend->colorLegendName() == name ) if ( legend->colorLegendName() == name )

2
ApplicationCode/ProjectDataModel/RimColorLegendCollection.h
View File

@ -50,7 +50,7 @@ public:
void deleteCustomColorLegends(); void deleteCustomColorLegends();
std::vector<RimColorLegend*> customColorLegends() const; std::vector<RimColorLegend*> allColorLegends() const;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

2
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@ -1064,7 +1064,7 @@ QList<caf::PdmOptionItemInfo>
{ {
RimProject* project = RimProject::current(); RimProject* project = RimProject::current();
RimColorLegendCollection* colorLegendCollection = project->colorLegendCollection(); RimColorLegendCollection* colorLegendCollection = project->colorLegendCollection();
std::vector<RimColorLegend*> colorLegends = colorLegendCollection->customColorLegends(); std::vector<RimColorLegend*> colorLegends = colorLegendCollection->allColorLegends();
for ( RimColorLegend* colorLegend : colorLegends ) for ( RimColorLegend* colorLegend : colorLegends )
{ {

2
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -1038,7 +1038,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogTrack::calculateValueOptions( const caf:
{ {
RimProject* project = RimProject::current(); RimProject* project = RimProject::current();
RimColorLegendCollection* colorLegendCollection = project->colorLegendCollection(); RimColorLegendCollection* colorLegendCollection = project->colorLegendCollection();
std::vector<RimColorLegend*> colorLegends = colorLegendCollection->customColorLegends(); std::vector<RimColorLegend*> colorLegends = colorLegendCollection->allColorLegends();
for ( RimColorLegend* colorLegend : colorLegends ) for ( RimColorLegend* colorLegend : colorLegends )
{ {