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

#2027 Select formation name on formation name import

Browse Source
This commit is contained in:
Rebecca Cox
2017-10-20 14:34:56 +02:00
parent 53912c4152
commit 9bd60ebec2
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp
View File

@@ -58,11 +58,12 @@ void RimFormationNamesCollection::readAllFormationNames()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFormationNamesCollection::importFiles(const QStringList& fileNames)
RimFormationNames* RimFormationNamesCollection::importFiles(const QStringList& fileNames)
{
QStringList newFileNames;
std::vector<RimFormationNames*> formNamesObjsToReload;
size_t formationListBeforeImportCount = m_formationNamesList.size();
for(const QString& newFileName : fileNames)
{
bool isFound = false;
@@ -108,6 +109,16 @@ void RimFormationNamesCollection::importFiles(const QStringList& fileNames)
{
QMessageBox::warning(nullptr, "Import Formation Names", totalErrorMessage);
}
if (m_formationNamesList.size() > formationListBeforeImportCount)
{
return m_formationNamesList[m_formationNamesList.size() - 1];
}
else
{
return nullptr;
}
}
//--------------------------------------------------------------------------------------------------