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

Valve Import: Avoid duplicated import

Browse Source
This commit is contained in:
Magne Sjaastad 2023-10-20 15:20:37 +02:00
parent a67c2733e7
commit cb7fe4fae5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/Commands/CompletionCommands/RicImportValveTemplatesFeature.cpp
View File

@ -79,8 +79,8 @@ void RicImportValveTemplatesFeature::onActionTriggered( bool isChecked )
aicdTemplates.end(), aicdTemplates.end(),
[]( RiaOpmParserTools::AicdTemplateValues& templateA, RiaOpmParserTools::AicdTemplateValues& templateB ) []( RiaOpmParserTools::AicdTemplateValues& templateA, RiaOpmParserTools::AicdTemplateValues& templateB )
{ {
int idA = 0; int idA = std::numeric_limits<int>::max();
int idB = 0; int idB = std::numeric_limits<int>::max();
auto itA = templateA.find( RiaOpmParserTools::aicdTemplateId() ); auto itA = templateA.find( RiaOpmParserTools::aicdTemplateId() );
if ( itA != templateA.end() ) if ( itA != templateA.end() )
@ -94,7 +94,13 @@ void RicImportValveTemplatesFeature::onActionTriggered( bool isChecked )
idB = itB->second; idB = itB->second;
} }
return idA < idB; if ( idA != std::numeric_limits<int>::max() && idB != std::numeric_limits<int>::max() )
{
// Sort by id if both have id
return idA < idB;
}
return templateA < templateB;
} ); } );
auto it = std::unique( aicdTemplates.begin(), aicdTemplates.end() ); auto it = std::unique( aicdTemplates.begin(), aicdTemplates.end() );