#8048 Everest Import: Group into separate ensembles

This commit is contained in:
Magne Sjaastad
2021-09-30 09:08:09 +02:00
committed by GitHub
parent c88424dbcf
commit 0d4ab8b594
16 changed files with 254 additions and 116 deletions

View File

@@ -22,6 +22,7 @@
#include "cafPdmPointer.h"
#include "RiaEnsembleNameTools.h"
#include <QDialog>
class QLabel;
@@ -70,7 +71,8 @@ private:
QStringList fileExtensions() const;
QString extensionFromFileNameFilter() const;
bool groupByEnsemble() const;
RiaEnsembleNameTools::EnsembleGroupingMode ensembleGroupingMode() const;
void setOkButtonEnabled( bool enabled );
void warningIfInvalidCharacters();
@@ -115,7 +117,6 @@ private:
QComboBox* m_pathFilterField;
QPushButton* m_browseButton;
QCheckBox* m_useRealizationStarCheckBox;
QCheckBox* m_groupByEnsembleCheckBox;
QLabel* m_fileFilterLabel;
QComboBox* m_fileFilterField;
@@ -127,6 +128,8 @@ private:
QLabel* m_effectiveFilterContentLabel;
QPushButton* m_findOrCancelButton;
QComboBox* m_ensembleGroupingMode;
QGroupBox* m_outputGroup;
QLabel* m_searchRootLabel;
QLabel* m_searchRootContentLabel;
@@ -151,18 +154,18 @@ private:
class RicRecursiveFileSearchDialogResult
{
public:
RicRecursiveFileSearchDialogResult( bool ok,
const QStringList& files,
const QString& rootDir,
const QString& pathFilter,
const QString& fileNameFilter,
bool groupByEnsemble )
RicRecursiveFileSearchDialogResult( bool ok,
const QStringList& files,
const QString& rootDir,
const QString& pathFilter,
const QString& fileNameFilter,
RiaEnsembleNameTools::EnsembleGroupingMode groupingMode )
: ok( ok )
, files( files )
, rootDir( rootDir )
, pathFilter( pathFilter )
, fileNameFilter( fileNameFilter )
, groupByEnsemble( groupByEnsemble )
, groupingMode( groupingMode )
{
}
@@ -171,5 +174,6 @@ public:
QString rootDir;
QString pathFilter;
QString fileNameFilter;
bool groupByEnsemble;
RiaEnsembleNameTools::EnsembleGroupingMode groupingMode;
};