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

WIP: Color legend: import of lyr file with colors should generate custom color legend #5961

Browse Source 
Work in progress:
- lacks support of views other than Eclipse views
- signature of RicImportFormationNamesFeature::importFormationFiles()
- reconsideration of variable names
This commit is contained in:
Stein Inge Dale
2020-07-30 14:31:11 +02:00
committed by Magne Sjaastad
parent edc4b39acb
commit 0424202461
4 changed files with 121 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp
View File

@@ -60,7 +60,7 @@ void RimFormationNamesCollection::readAllFormationNames()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFormationNames* RimFormationNamesCollection::importFiles( const QStringList& fileNames )
std::vector<RimFormationNames*> RimFormationNamesCollection::importFiles( const QStringList& fileNames )
{
QStringList newFileNames;
std::vector<RimFormationNames*> formNamesObjsToReload;
@@ -111,14 +111,7 @@ RimFormationNames* RimFormationNamesCollection::importFiles( const QStringList&
QMessageBox::warning( nullptr, "Import Formation Names", totalErrorMessage );
}
if ( m_formationNamesList.size() > formationListBeforeImportCount )
{
return m_formationNamesList[m_formationNamesList.size() - 1];
}
else
{
return nullptr;
}
return m_formationNamesList.childObjects();
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/RimFormationNamesCollection.h
View File

@@ -37,8 +37,9 @@ public:
void readAllFormationNames();
RimFormationNames* importFiles( const QStringList& fileNames );
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
std::vector<RimFormationNames*> importFiles( const QStringList& fileNames );
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;