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

#4243 Fix crash in import EGRID or SMSPEC by moving to general import feature

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-28 10:17:34 +01:00
parent 7d5a82d1cc
commit 4ada37c218
13 changed files with 339 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
ApplicationCode/Commands/RicImportGeneralDataFeature.cpp
View File

@@ -18,10 +18,14 @@
#include "RicImportGeneralDataFeature.h"
#include "RiaApplication.h"
#include "RiaDefines.h"
#include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h"
#include "RicImportEclipseCaseFeature.h"
#include "RicImportInputEclipseCaseFeature.h"
#include "RicImportSummaryCaseFeature.h"
#include "RicImportSummaryCasesFeature.h"
#include "RimSummaryCase.h"
#include "Riu3DMainWindowTools.h"
#include <QAction>
@@ -29,7 +33,59 @@
#include <QString>
#include <QStringList>
using namespace RiaDefines;
CAF_CMD_SOURCE_INIT(RicImportGeneralDataFeature, "RicImportGeneralDataFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportGeneralDataFeature::openEclipseFilesFromFileNames(const QStringList& fileNames)
{
CVF_ASSERT(!fileNames.empty());
QString defaultDir = QFileInfo(fileNames.last()).absolutePath();
QStringList eclipseCaseFiles;
QStringList eclipseInputFiles;
QStringList eclipseSummaryFiles;
for (const QString& fileName : fileNames)
{
if (obtainFileTypeFromFileName(fileName) & (ECLIPSE_GRID_FILE | ECLIPSE_EGRID_FILE))
{
eclipseCaseFiles.push_back(fileName);
}
else if (obtainFileTypeFromFileName(fileName) & ECLIPSE_INPUT_FILE)
{
eclipseInputFiles.push_back(fileName);
}
else if (obtainFileTypeFromFileName(fileName) & ECLIPSE_SUMMARY_FILE)
{
eclipseSummaryFiles.push_back(fileName);
}
}
bool allSucceeded = true;
if (!eclipseCaseFiles.empty())
{
allSucceeded = allSucceeded && openEclipseCaseFromFileNames(eclipseCaseFiles);
RiaApplication::instance()->setLastUsedDialogDirectory(defaultDirectoryLabel(ECLIPSE_EGRID_FILE), defaultDir);
}
if (!eclipseInputFiles.empty())
{
allSucceeded = allSucceeded && openInputEclipseCaseFromFileNames(eclipseInputFiles);
RiaApplication::instance()->setLastUsedDialogDirectory(defaultDirectoryLabel(ECLIPSE_INPUT_FILE), defaultDir);
}
if (!eclipseSummaryFiles.empty())
{
allSucceeded = allSucceeded && openSummaryCaseFromFileNames(eclipseSummaryFiles);
RiaApplication::instance()->setLastUsedDialogDirectory(defaultDirectoryLabel(ECLIPSE_SUMMARY_FILE), defaultDir);
}
return allSucceeded;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -43,66 +99,7 @@ bool RicImportGeneralDataFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicImportGeneralDataFeature::onActionTriggered(bool isChecked)
{
RiaApplication* app = RiaApplication::instance();
QString eclipseGridFilePattern("*.GRID");
QString eclipseEGridFilePattern("*.EGRID");
QString eclipseInputFilePattern("*.GRDECL");
QString eclipseSummaryFilePattern("*.SMSPEC");
QStringList filePatternTexts;
filePatternTexts += QString("Eclipse Files (%1 %2 %3 %4)").arg(eclipseGridFilePattern).arg(eclipseEGridFilePattern).arg(eclipseInputFilePattern).arg(eclipseSummaryFilePattern);
filePatternTexts += QString("Eclipse Grid Files (%1)").arg(eclipseGridFilePattern);
filePatternTexts += QString("Eclipse EGrid Files (%1)").arg(eclipseEGridFilePattern);
filePatternTexts += QString("Eclipse Input Files and Input Properties (%1)").arg(eclipseInputFilePattern);
filePatternTexts += QString("Eclipse Summary File (%1)").arg(eclipseSummaryFilePattern);
QString fullPattern = filePatternTexts.join(";;");
QString defaultDir = app->lastUsedDialogDirectory("GENERAL_DATA");
QStringList fileNames = QFileDialog::getOpenFileNames(
Riu3DMainWindowTools::mainWindowWidget(), "Import Data File", defaultDir, fullPattern);
if (fileNames.empty()) return;
defaultDir = QFileInfo(fileNames.last()).absolutePath();
app->setLastUsedDialogDirectory("GENERAL_DATA", defaultDir);
QStringList eclipseCaseFiles;
QStringList eclipseInputFiles;
QStringList eclipseSummaryFiles;
for (const QString& fileName : fileNames)
{
if (fileName.endsWith("GRID", Qt::CaseInsensitive))
{
eclipseCaseFiles.push_back(fileName);
}
else if (fileName.endsWith("GRDECL", Qt::CaseInsensitive))
{
eclipseInputFiles.push_back(fileName);
}
else if (fileName.endsWith("SMSPEC", Qt::CaseInsensitive))
{
eclipseSummaryFiles.push_back(fileName);
}
}
if (!eclipseCaseFiles.empty())
{
RicImportEclipseCaseFeature::openEclipseCaseFromFileNames(eclipseCaseFiles);
app->setLastUsedDialogDirectory("BINARY_GRID", defaultDir);
}
if (!eclipseInputFiles.empty())
{
RicImportInputEclipseCaseFeature::openInputEclipseCaseFromFileNames(eclipseInputFiles);
app->setLastUsedDialogDirectory("INPUT_FILES", defaultDir);
}
if (!eclipseSummaryFiles.empty())
{
RicImportSummaryCaseFeature::openSummaryCaseFromFileNames(eclipseSummaryFiles);
app->setLastUsedDialogDirectory("INPUT_FILES", defaultDir);
}
openFileDialog(ANY_ECLIPSE_FILE);
}
//--------------------------------------------------------------------------------------------------
@@ -113,3 +110,108 @@ void RicImportGeneralDataFeature::setupActionLook(QAction* actionToSetup)
actionToSetup->setIcon(QIcon(":/Case48x48.png"));
actionToSetup->setText("Import Eclipse Files");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicImportGeneralDataFeature::openFileDialog(ImportFileType fileTypes)
{
QString eclipseGridFilePattern("*.GRID");
QString eclipseEGridFilePattern("*.EGRID");
QString eclipseInputFilePattern("*.GRDECL");
QString eclipseSummaryFilePattern("*.SMSPEC");
QStringList filePatternTexts;
if (fileTypes == ANY_ECLIPSE_FILE)
{
filePatternTexts += QString("Eclipse Files (%1 %2 %3 %4)")
.arg(eclipseGridFilePattern)
.arg(eclipseEGridFilePattern)
.arg(eclipseInputFilePattern)
.arg(eclipseSummaryFilePattern);
}
if (fileTypes & ECLIPSE_GRID_FILE)
{
filePatternTexts += QString("Eclipse Grid Files (%1)").arg(eclipseGridFilePattern);
}
if (fileTypes & ECLIPSE_EGRID_FILE)
{
filePatternTexts += QString("Eclipse EGrid Files (%1)").arg(eclipseEGridFilePattern);
}
if (fileTypes & ECLIPSE_INPUT_FILE)
{
filePatternTexts += QString("Eclipse Input Files and Input Properties (%1)").arg(eclipseInputFilePattern);
}
if (fileTypes & ECLIPSE_SUMMARY_FILE)
{
filePatternTexts += QString("Eclipse Summary File (%1)").arg(eclipseSummaryFilePattern);
}
QString fullPattern = filePatternTexts.join(";;");
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory(defaultDirectoryLabel(fileTypes));
QStringList fileNames =
QFileDialog::getOpenFileNames(Riu3DMainWindowTools::mainWindowWidget(), "Import Data File", defaultDir, fullPattern);
if (fileNames.empty()) return;
if (fileTypes == ANY_ECLIPSE_FILE)
{
RiaApplication::instance()->setLastUsedDialogDirectory(defaultDirectoryLabel(ANY_ECLIPSE_FILE), fileNames.front());
}
if (!openEclipseFilesFromFileNames(fileNames))
{
RiaLogging::error(QString("Failed to open file names: %1").arg(fileNames.join(", ")));
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportGeneralDataFeature::openEclipseCaseFromFileNames(const QStringList& fileNames)
{
QStringList newCaseFiles;
if (RiaImportEclipseCaseTools::openEclipseCasesFromFile(fileNames, &newCaseFiles))
{
for (const auto newCaseFile : newCaseFiles)
{
RiaApplication::instance()->addToRecentFiles(newCaseFile);
}
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportGeneralDataFeature::openInputEclipseCaseFromFileNames(const QStringList& fileNames)
{
QString fileContainingGrid;
if (RiaImportEclipseCaseTools::openEclipseInputCaseFromFileNames(fileNames, &fileContainingGrid))
{
RiaApplication::instance()->addToRecentFiles(fileContainingGrid);
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportGeneralDataFeature::openSummaryCaseFromFileNames(const QStringList& fileNames)
{
std::vector<RimSummaryCase*> newCases;
if (RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles(fileNames, &newCases))
{
RicImportSummaryCasesFeature::addCasesToGroupIfRelevant(newCases);
for (const RimSummaryCase* newCase : newCases)
{
RiaApplication::instance()->addToRecentFiles(newCase->summaryHeaderFilename());
}
return true;
}
return false;
}