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

#4007 Create new combined import button and move the others to an opt… (#4021)

Browse Source 
* #4007 Create new combined import button and move the others to an optional "Import"-toolbar

* #4007 Make sure we check that fileName vector isn't empty before accessing it
This commit is contained in:
Gaute Lindkvist
2019-01-31 09:02:09 +01:00
committed by GitHub
parent 61e9a2a696
commit 69b20a2aa9
9 changed files with 205 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp
View File

@@ -34,6 +34,23 @@
CAF_CMD_SOURCE_INIT(RicImportEclipseCaseFeature, "RicImportEclipseCaseFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportEclipseCaseFeature::openEclipseCaseFromFileNames(const QStringList& fileNames)
{
QStringList newCaseFiles;
if (RiaImportEclipseCaseTools::openEclipseCasesFromFile(fileNames, &newCaseFiles))
{
for (const auto newCaseFile : newCaseFiles)
{
RiaApplication::instance()->addToRecentFiles(newCaseFile);
}
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -51,16 +68,13 @@ void RicImportEclipseCaseFeature::onActionTriggered(bool isChecked)
QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID");
QStringList fileNames = QFileDialog::getOpenFileNames(Riu3DMainWindowTools::mainWindowWidget(), "Import Eclipse File", defaultDir, "Eclipse Grid Files (*.GRID *.EGRID)");
if (fileNames.size()) defaultDir = QFileInfo(fileNames.last()).absolutePath();
if (fileNames.isEmpty()) return;
defaultDir = QFileInfo(fileNames.last()).absolutePath();
app->setLastUsedDialogDirectory("BINARY_GRID", defaultDir);
QStringList newCaseFiles;
RiaImportEclipseCaseTools::openEclipseCasesFromFile(fileNames, &newCaseFiles);
for (const auto newCaseFile : newCaseFiles)
{
RiaApplication::instance()->addToRecentFiles(newCaseFile);
}
openEclipseCaseFromFileNames(fileNames);
}
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.h
View File

@@ -30,6 +30,7 @@ class RicImportEclipseCaseFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
static bool openEclipseCaseFromFileNames(const QStringList& fileNames);
protected:
// Overrides
bool isCommandEnabled() override;

2
ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
View File

@@ -101,7 +101,7 @@ void RicImportInputEclipseCaseFeature::onActionTriggered(bool isChecked)
{
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
QStringList fileNames = QFileDialog::getOpenFileNames(Riu3DMainWindowTools::mainWindowWidget(), "Import Eclipse Input Files", defaultDir, "Eclipse Input Files and Input Properties Eclipse Input Files (*.GRDECL);;All Files (*.*)");
QStringList fileNames = QFileDialog::getOpenFileNames(Riu3DMainWindowTools::mainWindowWidget(), "Import Eclipse Input Files", defaultDir, "Eclipse Input Files and Input Properties (*.GRDECL);;All Files (*.*)");
if (fileNames.isEmpty()) return;