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

Rename of static recursive search dialog method

Browse Source
This commit is contained in:
Jacob Støren
2018-04-25 11:25:29 +02:00
parent 4a7f54689e
commit 54b21a8a49
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/EclipseCommands/RicCreateGridCaseGroupFromFilesFeature.cpp
View File

@@ -50,7 +50,12 @@ void RicCreateGridCaseGroupFromFilesFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES"); QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
RicFileHierarchyDialogResult result = RicFileHierarchyDialog::getOpenFileNames(nullptr, "Create Grid Case Group from Files", defaultDir, m_pathFilter, m_fileNameFilter, QStringList(".EGRID")); RicFileHierarchyDialogResult result = RicFileHierarchyDialog::runRecursiveSearchDialog(nullptr,
"Create Grid Case Group from Files",
defaultDir,
m_pathFilter,
m_fileNameFilter,
QStringList(".EGRID"));
// Remember filters // Remember filters
m_pathFilter = result.pathFilter; m_pathFilter = result.pathFilter;

12
ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp
View File

@@ -52,12 +52,12 @@ void RicImportEclipseCasesFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID"); QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID");
RicFileHierarchyDialogResult result = RicFileHierarchyDialog::getOpenFileNames(nullptr, RicFileHierarchyDialogResult result = RicFileHierarchyDialog::runRecursiveSearchDialog(nullptr,
"Import Eclipse Cases", "Import Eclipse Cases",
defaultDir, defaultDir,
m_pathFilter, m_pathFilter,
m_fileNameFilter, m_fileNameFilter,
QStringList() << ".EGRID" << ".GRID"); QStringList() << ".EGRID" << ".GRID");
// Remember filters // Remember filters
m_pathFilter = result.pathFilter; m_pathFilter = result.pathFilter;

12
ApplicationCode/Commands/RicFileHierarchyDialog.cpp
View File

@@ -159,12 +159,12 @@ RicFileHierarchyDialog::~RicFileHierarchyDialog()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicFileHierarchyDialogResult RicFileHierarchyDialog::getOpenFileNames(QWidget *parent /*= 0*/, RicFileHierarchyDialogResult RicFileHierarchyDialog::runRecursiveSearchDialog(QWidget *parent /*= 0*/,
const QString &caption /*= QString()*/, const QString &caption /*= QString()*/,
const QString &dir /*= QString()*/, const QString &dir /*= QString()*/,
const QString &pathFilter /*= QString()*/, const QString &pathFilter /*= QString()*/,
const QString &fileNameFilter /*= QString()*/, const QString &fileNameFilter /*= QString()*/,
const QStringList &fileExtensions /*= QStringList()*/) const QStringList &fileExtensions /*= QStringList()*/)
{ {
QStringList files; QStringList files;
RicFileHierarchyDialog dialog(parent); RicFileHierarchyDialog dialog(parent);

12
ApplicationCode/Commands/RicFileHierarchyDialog.h
View File

@@ -46,12 +46,12 @@ public:
RicFileHierarchyDialog(QWidget* parent); RicFileHierarchyDialog(QWidget* parent);
~RicFileHierarchyDialog(); ~RicFileHierarchyDialog();
static RicFileHierarchyDialogResult getOpenFileNames(QWidget *parent = nullptr, static RicFileHierarchyDialogResult runRecursiveSearchDialog(QWidget *parent = nullptr,
const QString& caption = QString(), const QString& caption = QString(),
const QString& dir = QString(), const QString& dir = QString(),
const QString& pathFilter = QString(), const QString& pathFilter = QString(),
const QString& fileNameFilter = QString(), const QString& fileNameFilter = QString(),
const QStringList& fileExtensions = QStringList()); const QStringList& fileExtensions = QStringList());
private: private:
QStringList files() const; QStringList files() const;

7
ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@@ -166,7 +166,12 @@ std::vector<RimSummaryCase*> RicImportSummaryCasesFeature::importSummaryCases(co
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES"); QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
RicFileHierarchyDialogResult result = RicFileHierarchyDialog::getOpenFileNames(nullptr, dialogTitle, defaultDir, m_pathFilter, m_fileNameFilter, QStringList(".SMSPEC")); RicFileHierarchyDialogResult result = RicFileHierarchyDialog::runRecursiveSearchDialog(nullptr,
dialogTitle,
defaultDir,
m_pathFilter,
m_fileNameFilter,
QStringList(".SMSPEC"));
// Remember filters // Remember filters
m_pathFilter = result.pathFilter; m_pathFilter = result.pathFilter;