OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-28 16:10:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

#12848 Python: fix unexpected returned well path when importing.

Browse Source 
Fixes #12848.
This commit is contained in:
Kristian Bendiksen committed 2025-08-29 15:31:47 +02:00
1 parent 393917e6f3
commit a2473af644
3 files changed
+36 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp
+8 -3
View File
@@ -298,13 +298,13 @@ std::vector<RimWellPath*> RimWellPathCollection::addWellPaths( QStringList fileP
}
}
readAndAddWellPaths( wellPathArray );
std::vector<RimWellPath*> addedWellPaths = readAndAddWellPaths( wellPathArray );
CAF_ASSERT( wellPathArray.empty() );
scheduleRedrawAffectedViews();
updateAllRequiredEditors();
return allWellPaths();
return addedWellPaths;
}
//--------------------------------------------------------------------------------------------------
@@ -330,10 +330,12 @@ std::vector<RimWellPath*> RimWellPathCollection::allWellPaths() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCollection::readAndAddWellPaths( std::vector<RimFileWellPath*>& wellPathArray )
std::vector<RimWellPath*> RimWellPathCollection::readAndAddWellPaths( std::vector<RimFileWellPath*>& wellPathArray )
{
caf::ProgressInfo progress( wellPathArray.size(), "Reading well paths from file" );
// Keep track of the well paths that were actually added.
std::vector<RimWellPath*> addedWellPaths;
for ( RimFileWellPath* wellPath : wellPathArray )
{
wellPath->readWellPathFile( nullptr, m_wellPathImporter.get(), true );
@@ -362,6 +364,7 @@ void RimWellPathCollection::readAndAddWellPaths( std::vector<RimFileWellPath*>&
wellPath->setWellPathColor( RiaColorTables::wellPathsPaletteColors().cycledColor3f( m_wellPaths.size() ) );
wellPath->setUnitSystem( findUnitSystemForWellPath( wellPath ) );
addWellPath( wellPath );
addedWellPaths.push_back( wellPath );
}
progress.incrementProgress();
@@ -371,6 +374,8 @@ void RimWellPathCollection::readAndAddWellPaths( std::vector<RimFileWellPath*>&
groupWellPaths( allWellPaths() );
sortWellsByName();
rebuildWellPathNodes();
return addedWellPaths;
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.h
+2 -2
View File
@@ -150,8 +150,8 @@ private:
caf::PdmFieldHandle* objectToggleField() override;
void readAndAddWellPaths( std::vector<RimFileWellPath*>& wellPathArray );
void sortWellsByName();
std::vector<RimWellPath*> readAndAddWellPaths( std::vector<RimFileWellPath*>& wellPathArray );
void sortWellsByName();
caf::AppEnum<RiaDefines::EclipseUnitSystem> findUnitSystemForWellPath( const RimWellPath* wellPath );