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

Select last imported wellPath on import, not last wellPath in collection

Browse Source
This commit is contained in:
Rebecca Cox
2017-11-12 21:57:25 +01:00
parent 3e40331c5b
commit a4484579e2
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp
View File

@@ -70,8 +70,16 @@ void RicWellPathsImportFileFeature::onActionTriggered(bool isChecked)
if (oilField->wellPathCollection->wellPaths().size() > 0) if (oilField->wellPathCollection->wellPaths().size() > 0)
{ {
RimWellPath* wellPath = oilField->wellPathCollection->wellPaths()[oilField->wellPathCollection->wellPaths().size() - 1];
RiuMainWindow::instance()->selectAsCurrentItem(wellPath); RimWellPath* wellPath = nullptr;
QString wellPathName = oilField->wellPathCollection->newestAddedWellName();
wellPath = oilField->wellPathCollection->wellPathByName(wellPathName);
if (wellPath)
{
RiuMainWindow::instance()->selectAsCurrentItem(wellPath);
}
} }
} }
} }

6
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -96,6 +96,7 @@ RimWellPathCollection::RimWellPathCollection()
wellPaths.uiCapability()->setUiHidden(true); wellPaths.uiCapability()->setUiHidden(true);
m_wellPathImporter = new RifWellPathImporter; m_wellPathImporter = new RifWellPathImporter;
m_newestAddedWellName = QString();
} }
@@ -273,6 +274,11 @@ void RimWellPathCollection::readAndAddWellPaths(std::vector<RimWellPath*>& wellP
progress.incrementProgress(); progress.incrementProgress();
} }
if (!wellPathArray.empty())
{
m_newestAddedWellName = wellPathArray.back()->name();
}
this->sortWellsByName(); this->sortWellsByName();
} }

3
ApplicationCode/ProjectDataModel/RimWellPathCollection.h
View File

@@ -66,6 +66,8 @@ public:
void setProject(RimProject* project); void setProject(RimProject* project);
QString newestAddedWellName() { return m_newestAddedWellName; }
enum WellVisibilityType enum WellVisibilityType
{ {
FORCE_ALL_OFF, FORCE_ALL_OFF,
@@ -129,4 +131,5 @@ private:
RiaEclipseUnitTools::UnitSystemType findUnitSystemForWellPath(const RimWellPath* wellPath); RiaEclipseUnitTools::UnitSystemType findUnitSystemForWellPath(const RimWellPath* wellPath);
RifWellPathImporter* m_wellPathImporter; RifWellPathImporter* m_wellPathImporter;
QString m_newestAddedWellName;
}; };