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

#5601 Avoid listing LAS-files multiple times in source list

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-03-02 13:37:28 +01:00
parent eca3531c2e
commit 06d964d070
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimWbsParameters.cpp
View File

@ -427,13 +427,18 @@ std::vector<RimWbsParameters::ParameterSource> RimWbsParameters::supportedSource
{
std::vector<RigGeoMechWellLogExtractor::WbsParameterSource> sources;
std::set<RimWbsParameters::ParameterSource> sourcesAlreadyAdded;
for ( auto source : parameter.sources() )
{
if ( sourcesAlreadyAdded.count( source ) ) continue;
if ( source == RigWbsParameter::LAS_FILE )
{
if ( hasLasFileWithChannel( parameter.addressString( RigWbsParameter::LAS_FILE ) ) )
{
sources.push_back( source );
sourcesAlreadyAdded.insert( source );
}
}
else if ( source == RigWbsParameter::ELEMENT_PROPERTY_TABLE )
@ -442,11 +447,13 @@ std::vector<RimWbsParameters::ParameterSource> RimWbsParameters::supportedSource
if ( hasElementPropertyEntry( resAddr ) )
{
sources.push_back( source );
sourcesAlreadyAdded.insert( source );
}
}
else
{
sources.push_back( source );
sourcesAlreadyAdded.insert( source );
}
}
return sources;