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

#7965 Skip ensemble name suggestion dialog for grouped import.

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-09-21 23:49:18 +02:00
parent c6f04a6ad6
commit 17f44b0f25
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
View File

@ -83,23 +83,26 @@ void RicImportEnsembleFeature::onActionTriggered( bool isChecked )
std::vector<QStringList> groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( fileNames );
for ( const QStringList& groupedFileNames : groupedByEnsemble )
{
importSingleEnsemble( groupedFileNames );
bool useEnsembleNameDialog = false;
importSingleEnsemble( groupedFileNames, useEnsembleNameDialog );
}
}
else
{
importSingleEnsemble( fileNames );
bool useEnsembleNameDialog = true;
importSingleEnsemble( fileNames, useEnsembleNameDialog );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicImportEnsembleFeature::importSingleEnsemble( const QStringList& fileNames )
void RicImportEnsembleFeature::importSingleEnsemble( const QStringList& fileNames, bool useEnsembleNameDialog )
{
QString ensembleNameSuggestion = RiaEnsembleNameTools::findSuitableEnsembleName( fileNames );
QString ensembleName = RiaEnsembleNameTools::findSuitableEnsembleName( fileNames );
if ( useEnsembleNameDialog ) ensembleName = askForEnsembleName( ensembleName );
QString ensembleName = askForEnsembleName( ensembleNameSuggestion );
if ( ensembleName.isEmpty() ) return;
std::vector<RimSummaryCase*> cases;

2
ApplicationLibCode/Commands/RicImportEnsembleFeature.h
View File

@ -38,5 +38,5 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
static QString askForEnsembleName( const QString& suggestion );
static void importSingleEnsemble( const QStringList& fileNames );
static void importSingleEnsemble( const QStringList& fileNames, bool useEnsembleNameDialog );
};