diff --git a/ApplicationLibCode/Commands/CompletionCommands/RicImportEnsembleFractureStatisticsFeature.cpp b/ApplicationLibCode/Commands/CompletionCommands/RicImportEnsembleFractureStatisticsFeature.cpp index 1b15f80587..72ebd829ee 100644 --- a/ApplicationLibCode/Commands/CompletionCommands/RicImportEnsembleFractureStatisticsFeature.cpp +++ b/ApplicationLibCode/Commands/CompletionCommands/RicImportEnsembleFractureStatisticsFeature.cpp @@ -55,11 +55,11 @@ bool RicImportEnsembleFractureStatisticsFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicImportEnsembleFractureStatisticsFeature::onActionTriggered( bool isChecked ) { - RiaGuiApplication* app = RiaGuiApplication::instance(); - QString pathCacheName = "INPUT_FILES"; - auto [fileNames, groupByIteration] = runRecursiveFileSearchDialog( "Import StimPlan Fractures", pathCacheName ); + RiaGuiApplication* app = RiaGuiApplication::instance(); + QString pathCacheName = "INPUT_FILES"; + auto [fileNames, groupByEnsemble] = runRecursiveFileSearchDialog( "Import StimPlan Fractures", pathCacheName ); - if ( groupByIteration ) + if ( groupByEnsemble ) { std::vector groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( fileNames ); for ( const QStringList& groupedFileNames : groupedByEnsemble ) @@ -148,5 +148,5 @@ std::pair // Remember the path to next time app->setLastUsedDialogDirectory( pathCacheName, QFileInfo( result.rootDir ).absoluteFilePath() ); - return std::make_pair( result.files, result.groupByIteration ); + return std::make_pair( result.files, result.groupByEnsemble ); } diff --git a/ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp b/ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp index 930b60dbf0..bee624d4fc 100644 --- a/ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp @@ -72,13 +72,13 @@ bool RicImportEnsembleFeature::isCommandEnabled() void RicImportEnsembleFeature::onActionTriggered( bool isChecked ) { QString pathCacheName = "ENSEMBLE_FILES"; - auto [fileNames, groupByIteration] = + auto [fileNames, groupByEnsemble] = RicImportSummaryCasesFeature::runRecursiveSummaryCaseFileSearchDialogWithGrouping( "Import Ensemble", pathCacheName ); if ( fileNames.isEmpty() ) return; - if ( groupByIteration ) + if ( groupByEnsemble ) { std::vector groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( fileNames ); for ( const QStringList& groupedFileNames : groupedByEnsemble ) diff --git a/ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp b/ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp index 7516f94fc8..cfd40abc18 100644 --- a/ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp @@ -62,11 +62,11 @@ bool RicImportEnsembleSurfaceFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicImportEnsembleSurfaceFeature::onActionTriggered( bool isChecked ) { - RiaApplication* app = RiaApplication::instance(); - QString pathCacheName = "ENSEMBLE_SURFACE_FILES"; - auto [fileNames, groupByIteration] = runRecursiveFileSearchDialog( "Import Ensemble Surface", pathCacheName ); + RiaApplication* app = RiaApplication::instance(); + QString pathCacheName = "ENSEMBLE_SURFACE_FILES"; + auto [fileNames, groupByEnsemble] = runRecursiveFileSearchDialog( "Import Ensemble Surface", pathCacheName ); - if ( groupByIteration ) + if ( groupByEnsemble ) importEnsembleSurfaceFromFiles( fileNames ); else importSingleEnsembleSurfaceFromFiles( fileNames ); @@ -209,5 +209,5 @@ std::pair RicImportEnsembleSurfaceFeature::runRecursiveFileSe // Remember the path to next time app->setLastUsedDialogDirectory( pathCacheName, QFileInfo( result.rootDir ).absoluteFilePath() ); - return std::pair( result.files, result.groupByIteration ); + return std::pair( result.files, result.groupByEnsemble ); } diff --git a/ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.cpp b/ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.cpp index f20f25ec1c..105b409b71 100644 --- a/ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.cpp @@ -58,12 +58,12 @@ bool RicImportEnsembleWellLogsFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicImportEnsembleWellLogsFeature::onActionTriggered( bool isChecked ) { - RiaApplication* app = RiaApplication::instance(); - QString pathCacheName = "ENSEMBLE_WELL_LOGS_FILES"; - auto [fileNames, groupByIteration] = runRecursiveFileSearchDialog( "Import Ensemble Well Logs", pathCacheName ); + RiaApplication* app = RiaApplication::instance(); + QString pathCacheName = "ENSEMBLE_WELL_LOGS_FILES"; + auto [fileNames, groupByEnsemble] = runRecursiveFileSearchDialog( "Import Ensemble Well Logs", pathCacheName ); if ( fileNames.isEmpty() ) return; - if ( groupByIteration ) + if ( groupByEnsemble ) createEnsembleWellLogsFromFiles( fileNames ); else createSingleEnsembleWellLogsFromFiles( fileNames ); @@ -157,5 +157,5 @@ std::pair RicImportEnsembleWellLogsFeature::runRecursiveFileS // Remember the path to next time app->setLastUsedDialogDirectory( pathCacheName, QFileInfo( result.rootDir ).absoluteFilePath() ); - return std::make_pair( result.files, result.groupByIteration ); + return std::make_pair( result.files, result.groupByEnsemble ); } diff --git a/ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp b/ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp index 0cc8777e2e..002d45f339 100644 --- a/ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp @@ -275,7 +275,7 @@ std::pair // Remember the path to next time app->setLastUsedDialogDirectory( pathCacheName, QFileInfo( result.rootDir ).absoluteFilePath() ); - return std::make_pair( result.files, result.groupByIteration ); + return std::make_pair( result.files, result.groupByEnsemble ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp index 71dff14bf2..67751d309b 100644 --- a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp +++ b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp @@ -134,7 +134,7 @@ RicRecursiveFileSearchDialogResult RicRecursiveFileSearchDialog::runRecursiveSea dialog.rootDirWithEndSeparator(), dialog.pathFilterWithoutStartSeparator(), dialog.fileNameFilter(), - dialog.groupByIteration() ); + dialog.groupByEnsemble() ); } //-------------------------------------------------------------------------------------------------- @@ -149,8 +149,8 @@ RicRecursiveFileSearchDialog::RicRecursiveFileSearchDialog( QWidget* parent ) m_useRealizationStarCheckBox = new QCheckBox( "Use 'realization-*' in filter" ); connect( m_useRealizationStarCheckBox, SIGNAL( clicked() ), this, SLOT( slotUseRealizationStarClicked() ) ); - m_groupByIterationCheckBox = new QCheckBox( "Group by iteration" ); - m_groupByIterationCheckBox->setChecked( true ); + m_groupByEnsembleCheckBox = new QCheckBox( "Group by ensemble" ); + m_groupByEnsembleCheckBox->setChecked( true ); m_pathFilterLabel = new QLabel(); m_pathFilterField = new QComboBox(); @@ -230,7 +230,7 @@ RicRecursiveFileSearchDialog::RicRecursiveFileSearchDialog( QWidget* parent ) inputGridLayout->addWidget( m_fileFilterLabel, 1, 0 ); inputGridLayout->addWidget( m_fileFilterField, 1, 1, 1, 2 ); inputGridLayout->addWidget( m_useRealizationStarCheckBox, 2, 1 ); - inputGridLayout->addWidget( m_groupByIterationCheckBox, 3, 1 ); + inputGridLayout->addWidget( m_groupByEnsembleCheckBox, 3, 1 ); inputGridLayout->addWidget( m_effectiveFilterLabel, 4, 0 ); inputGridLayout->addWidget( m_effectiveFilterContentLabel, 4, 1 ); inputGridLayout->addWidget( m_findOrCancelButton, 4, 2, 1, 2 ); @@ -375,13 +375,13 @@ void RicRecursiveFileSearchDialog::updateFileListWidget() { m_fileListWidget->clear(); - if ( m_groupByIterationCheckBox->isChecked() ) + if ( m_groupByEnsembleCheckBox->isChecked() ) { std::vector groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( m_foundFiles ); for ( const QStringList& groupedFileNames : groupedByEnsemble ) { - QString iterationName = RiaEnsembleNameTools::findSuitableEnsembleName( groupedFileNames ); - QListWidgetItem* item = new QListWidgetItem( QDir::toNativeSeparators( iterationName ), m_fileListWidget ); + QString ensembleName = RiaEnsembleNameTools::findSuitableEnsembleName( groupedFileNames ); + QListWidgetItem* item = new QListWidgetItem( QDir::toNativeSeparators( ensembleName ), m_fileListWidget ); addToFileListWidget( groupedFileNames ); } } @@ -885,9 +885,9 @@ void RicRecursiveFileSearchDialog::slotUseRealizationStarClicked() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRecursiveFileSearchDialog::groupByIteration() const +bool RicRecursiveFileSearchDialog::groupByEnsemble() const { - return m_groupByIterationCheckBox->isChecked(); + return m_groupByEnsembleCheckBox->isChecked(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h index 8146f3ca07..c438f55f7d 100644 --- a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h +++ b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h @@ -70,7 +70,7 @@ private: QStringList fileExtensions() const; QString extensionFromFileNameFilter() const; - bool groupByIteration() const; + bool groupByEnsemble() const; void setOkButtonEnabled( bool enabled ); void warningIfInvalidCharacters(); @@ -114,7 +114,7 @@ private: QComboBox* m_pathFilterField; QPushButton* m_browseButton; QCheckBox* m_useRealizationStarCheckBox; - QCheckBox* m_groupByIterationCheckBox; + QCheckBox* m_groupByEnsembleCheckBox; QLabel* m_fileFilterLabel; QComboBox* m_fileFilterField; @@ -151,13 +151,13 @@ public: const QString& rootDir, const QString& pathFilter, const QString& fileNameFilter, - bool groupByIteration ) + bool groupByEnsemble ) : ok( ok ) , files( files ) , rootDir( rootDir ) , pathFilter( pathFilter ) , fileNameFilter( fileNameFilter ) - , groupByIteration( groupByIteration ) + , groupByEnsemble( groupByEnsemble ) { } @@ -166,5 +166,5 @@ public: QString rootDir; QString pathFilter; QString fileNameFilter; - bool groupByIteration; + bool groupByEnsemble; };