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

#5917 Export Completion: Avoid overwrite of export completion well name

Browse Source
This commit is contained in:
Magne Sjaastad
2020-05-22 12:25:25 +02:00
parent ff90ae5704
commit 4a8aa6ced1
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -152,7 +152,7 @@ void RimWellPathCollection::loadDataAndUpdate()
if ( !fWPath->filePath().isEmpty() )
{
QString errorMessage;
if ( !fWPath->readWellPathFile( &errorMessage, m_wellPathImporter ) )
if ( !fWPath->readWellPathFile( &errorMessage, m_wellPathImporter, false ) )
{
RiaLogging::warning( errorMessage );
}
@@ -260,7 +260,7 @@ void RimWellPathCollection::readAndAddWellPaths( std::vector<RimFileWellPath*>&
for ( size_t wpIdx = 0; wpIdx < wellPathArray.size(); wpIdx++ )
{
RimFileWellPath* wellPath = wellPathArray[wpIdx];
wellPath->readWellPathFile( nullptr, m_wellPathImporter );
wellPath->readWellPathFile( nullptr, m_wellPathImporter, true );
progress.setProgressDescription( QString( "Reading file %1" ).arg( wellPath->name() ) );
@@ -270,7 +270,7 @@ void RimWellPathCollection::readAndAddWellPaths( std::vector<RimFileWellPath*>&
{
existingWellPath->setFilepath( wellPath->filePath() );
existingWellPath->setWellPathIndexInFile( wellPath->wellPathIndexInFile() );
existingWellPath->readWellPathFile( nullptr, m_wellPathImporter );
existingWellPath->readWellPathFile( nullptr, m_wellPathImporter, true );
// Let name from well path file override name from well log file
existingWellPath->setName( wellPath->name() );