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

37
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -34,8 +34,7 @@
#include "ExportCommands/RicSnapshotAllViewsToFileFeature.h"
#include "HoloLensCommands/RicHoloLensSessionManager.h"
#include "RicImportInputEclipseCaseFeature.h"
#include "RicImportSummaryCasesFeature.h"
#include "RicImportGeneralDataFeature.h"
#include "Rim2dIntersectionViewCollection.h"
#include "RimAnnotationCollection.h"
@@ -1224,7 +1223,7 @@ void RiaApplication::createMockModelCustomized()
//--------------------------------------------------------------------------------------------------
void RiaApplication::createInputMockModel()
{
RicImportInputEclipseCaseFeature::openInputEclipseCaseFromFileNames(QStringList(RiaDefines::mockModelBasicInputCase()));
RiaImportEclipseCaseTools::openEclipseInputCaseFromFileNames(QStringList(RiaDefines::mockModelBasicInputCase()));
}
//--------------------------------------------------------------------------------------------------
@@ -2057,33 +2056,29 @@ bool RiaApplication::openFile(const QString& fileName)
bool loadingSucceded = false;
QString lastUsedDialogTag;
if (RiaApplication::hasValidProjectFileExtension(fileName))
RiaDefines::ImportFileType fileType = RiaDefines::obtainFileTypeFromFileName(fileName);
if (fileType == RiaDefines::RESINSIGHT_PROJECT_FILE)
{
loadingSucceded = loadProject(fileName);
}
else if (fileName.contains(".egrid", Qt::CaseInsensitive) || fileName.contains(".grid", Qt::CaseInsensitive))
{
loadingSucceded = RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({fileName}));
if (loadingSucceded) lastUsedDialogTag = "BINARY_GRID";
}
else if (fileName.contains(".grdecl", Qt::CaseInsensitive))
{
loadingSucceded = RicImportInputEclipseCaseFeature::openInputEclipseCaseFromFileNames(QStringList(fileName));
if (loadingSucceded) lastUsedDialogTag = "INPUT_FILES";
}
else if (fileName.contains(".odb", Qt::CaseInsensitive))
else if (fileType == RiaDefines::GEOMECH_ODB_FILE)
{
loadingSucceded = openOdbCaseFromFile(fileName);
if (loadingSucceded) lastUsedDialogTag = "GEOMECH_MODEL";
if (loadingSucceded) lastUsedDialogTag = "GEOMECH_MODEL";
}
else if (fileName.contains(".smspec", Qt::CaseInsensitive))
else if ( fileType & RiaDefines::ANY_ECLIPSE_FILE)
{
loadingSucceded = RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles(QStringList({fileName}));
loadingSucceded = RicImportGeneralDataFeature::openEclipseFilesFromFileNames({ fileName });
if (loadingSucceded)
{
getOrCreateAndShowMainPlotWindow();
lastUsedDialogTag = "INPUT_FILES";
lastUsedDialogTag = RiaDefines::defaultDirectoryLabel(fileType);
if (fileType & RiaDefines::ECLIPSE_SUMMARY_FILE)
{
getOrCreateAndShowMainPlotWindow();
}
}
}

65
ApplicationCode/Application/RiaDefines.cpp
View File

@@ -479,3 +479,68 @@ double RiaDefines::maximumDefaultValuePlot()
{
return 100.0;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaDefines::ImportFileType RiaDefines::obtainFileTypeFromFileName(const QString& fileName)
{
if (fileName.endsWith("EGRID", Qt::CaseInsensitive))
{
return ECLIPSE_EGRID_FILE;
}
else if (fileName.endsWith("GRID", Qt::CaseInsensitive))
{
return ECLIPSE_GRID_FILE;
}
else if (fileName.endsWith("GRDECL", Qt::CaseInsensitive))
{
return ECLIPSE_INPUT_FILE;
}
else if (fileName.endsWith("SMSPEC", Qt::CaseInsensitive))
{
return ECLIPSE_SUMMARY_FILE;
}
else if (fileName.endsWith("ODB", Qt::CaseInsensitive))
{
return GEOMECH_ODB_FILE;
}
else if (fileName.endsWith(".rsp", Qt::CaseInsensitive) || fileName.endsWith(".rip", Qt::CaseInsensitive))
{
return RESINSIGHT_PROJECT_FILE;
}
return NOT_A_VALID_IMPORT_FILE;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaDefines::defaultDirectoryLabel(RiaDefines::ImportFileType fileType)
{
QString defaultDirLabel;
if (fileType == ANY_ECLIPSE_FILE)
{
defaultDirLabel = "GENERAL_DATA";
}
else if (fileType & (ECLIPSE_GRID_FILE | fileType & ECLIPSE_EGRID_FILE))
{
defaultDirLabel = "BINARY_GRID";
}
else if (fileType & ECLIPSE_INPUT_FILE)
{
defaultDirLabel = "INPUT_FILES";
}
else if (fileType & ECLIPSE_SUMMARY_FILE)
{
// TODO: Summary files used "INPUT_FILES" as last used directory.
// Check if this is correct.
defaultDirLabel = "INPUT_FILES";
}
else if (fileType & GEOMECH_ODB_FILE)
{
defaultDirLabel = "GEOMECH_MODEL";
}
return defaultDirLabel;
}

19
ApplicationCode/Application/RiaDefines.h
View File

@@ -58,7 +58,7 @@ namespace RiaDefines
PACKER,
UNDEFINED_COMPONENT
};
bool isPerCellFaceResult(const QString& resultName);
bool isNativeCategoryResult(const QString& resultName);
@@ -143,5 +143,22 @@ namespace RiaDefines
GAS_PHASE,
WATER_PHASE
};
enum ImportFileType
{
NOT_A_VALID_IMPORT_FILE = 0x00,
ECLIPSE_GRID_FILE = 0x01,
ECLIPSE_EGRID_FILE = 0x02,
ECLIPSE_INPUT_FILE = 0x04,
ECLIPSE_SUMMARY_FILE = 0x08,
GEOMECH_ODB_FILE = 0x10,
RESINSIGHT_PROJECT_FILE = 0x20,
ECLIPSE_RESULT_GRID = ECLIPSE_GRID_FILE | ECLIPSE_EGRID_FILE,
ANY_ECLIPSE_FILE = ECLIPSE_RESULT_GRID | ECLIPSE_INPUT_FILE | ECLIPSE_SUMMARY_FILE,
ANY_IMPORT_FILE = 0xFF
};
ImportFileType obtainFileTypeFromFileName(const QString& fileName);
QString defaultDirectoryLabel(ImportFileType fileTypes);
};

49
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@@ -34,6 +34,7 @@
#include "RimCompletionTemplateCollection.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseInputCase.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimFileSummaryCase.h"
@@ -51,6 +52,7 @@
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "Riu3DMainWindowTools.h"
#include "RiuMainWindow.h"
#include "RiuPlotMainWindow.h"
#include "RiuPlotMainWindowTools.h"
@@ -197,6 +199,53 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilter(const QString&
return RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl(fileName, true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaImportEclipseCaseTools::openEclipseInputCaseFromFileNames(const QStringList& fileNames, QString* fileContainingGrid/*=nullptr*/)
{
RimEclipseInputCase* rimInputReservoir = new RimEclipseInputCase();
RiaApplication* app = RiaApplication::instance();
RimProject* project = app->project();
project->assignCaseIdToCase(rimInputReservoir);
bool gridImportSuccess = rimInputReservoir->openDataFileSet(fileNames);
if (!gridImportSuccess)
{
RiaLogging::error("Failed to import grid");
return false;
}
RimEclipseCaseCollection* analysisModels = project->activeOilField() ? project->activeOilField()->analysisModels() : nullptr;
if (analysisModels == nullptr) return false;
analysisModels->cases.push_back(rimInputReservoir);
RimEclipseView* riv = rimInputReservoir->createAndAddReservoirView();
riv->cellResult()->setResultType(RiaDefines::INPUT_PROPERTY);
riv->loadDataAndUpdate();
if (!riv->cellResult()->hasResult())
{
riv->cellResult()->setResultVariable(RiaDefines::undefinedResultName());
}
analysisModels->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(riv->cellResult());
if (fileContainingGrid)
{
*fileContainingGrid = rimInputReservoir->gridFileName();
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.h
View File

@@ -30,6 +30,7 @@ public:
static bool openEclipseCasesFromFile(const QStringList& fileNames, QStringList* openedFiles = nullptr, bool noDialog = false);
static bool openEclipseCaseShowTimeStepFilter(const QString& fileName);
static bool openEclipseInputCaseFromFileNames(const QStringList& fileNames, QString* fileContainingGrid = nullptr);
static bool openMockModel(const QString& name);
static bool addEclipseCases(const QStringList& fileNames);

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

@@ -19,8 +19,6 @@
#include "RicImportEclipseCaseFeature.h"
#include "RiaImportEclipseCaseTools.h"
#include "RiaApplication.h"
#include "RimEclipseCaseCollection.h"
@@ -34,23 +32,6 @@
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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

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

@@ -19,6 +19,8 @@
#pragma once
#include "RicImportGeneralDataFeature.h"
#include "cafCmdFeature.h"
#include <vector>
@@ -26,11 +28,10 @@
//==================================================================================================
///
//==================================================================================================
class RicImportEclipseCaseFeature : public caf::CmdFeature
class RicImportEclipseCaseFeature : public RicImportGeneralDataFeature
{
CAF_CMD_HEADER_INIT;
static bool openEclipseCaseFromFileNames(const QStringList& fileNames);
protected:
// Overrides
bool isCommandEnabled() override;

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

@@ -39,53 +39,6 @@
CAF_CMD_SOURCE_INIT(RicImportInputEclipseCaseFeature, "RicImportInputEclipseCaseFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportInputEclipseCaseFeature::openInputEclipseCaseFromFileNames(const QStringList& fileNames)
{
RimEclipseInputCase* rimInputReservoir = new RimEclipseInputCase();
RiaApplication* app = RiaApplication::instance();
RimProject* project = app->project();
project->assignCaseIdToCase(rimInputReservoir);
bool gridImportSuccess = rimInputReservoir->openDataFileSet(fileNames);
if (!gridImportSuccess)
{
RiaLogging::error("Failed to import grid");
return false;
}
RimEclipseCaseCollection* analysisModels = project->activeOilField() ? project->activeOilField()->analysisModels() : nullptr;
if (analysisModels == nullptr) return false;
analysisModels->cases.push_back(rimInputReservoir);
RimEclipseView* riv = rimInputReservoir->createAndAddReservoirView();
riv->cellResult()->setResultType(RiaDefines::INPUT_PROPERTY);
riv->loadDataAndUpdate();
if (!riv->cellResult()->hasResult())
{
riv->cellResult()->setResultVariable(RiaDefines::undefinedResultName());
}
analysisModels->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(riv->cellResult());
if (fileNames.size() == 1)
{
app->addToRecentFiles(fileNames[0]);
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -99,16 +52,7 @@ bool RicImportInputEclipseCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
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 (*.GRDECL);;All Files (*.*)");
if (fileNames.isEmpty()) return;
// Remember the path to next time
app->setLastUsedDialogDirectory("INPUT_FILES", QFileInfo(fileNames.last()).absolutePath());
RicImportInputEclipseCaseFeature::openInputEclipseCaseFromFileNames(fileNames);
RicImportGeneralDataFeature::openFileDialog(RiaDefines::ECLIPSE_INPUT_FILE);
}
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.h
View File

@@ -19,6 +19,8 @@
#pragma once
#include "RicImportGeneralDataFeature.h"
#include "cafCmdFeature.h"
#include <vector>
@@ -28,14 +30,10 @@ class QStringList;
//==================================================================================================
///
//==================================================================================================
class RicImportInputEclipseCaseFeature : public caf::CmdFeature
class RicImportInputEclipseCaseFeature : public RicImportGeneralDataFeature
{
CAF_CMD_HEADER_INIT;
public:
static bool openInputEclipseCaseFromFileNames(const QStringList& fileNames);
protected:
// Overrides
bool isCommandEnabled() override;

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;
}

13
ApplicationCode/Commands/RicImportGeneralDataFeature.h
View File

@@ -18,6 +18,8 @@
#pragma once
#include "RiaDefines.h"
#include "cafCmdFeature.h"
#include <vector>
@@ -29,9 +31,20 @@ class RicImportGeneralDataFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
public:
static bool openEclipseFilesFromFileNames(const QStringList& fileNames);
protected:
// Overrides
bool isCommandEnabled() override;
void onActionTriggered(bool isChecked) override;
void setupActionLook(QAction* actionToSetup) override;
static void openFileDialog(RiaDefines::ImportFileType fileTypes);
static bool openEclipseCaseFromFileNames(const QStringList& fileNames);
static bool openInputEclipseCaseFromFileNames(const QStringList& fileNames);
static bool openSummaryCaseFromFileNames(const QStringList& fileNames);
};

41
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@@ -22,8 +22,6 @@
#include "RiaPreferences.h"
#include "RiaFilePathTools.h"
#include "RicImportSummaryCasesFeature.h"
#include "RimGridSummaryCase.h"
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
@@ -40,24 +38,6 @@
CAF_CMD_SOURCE_INIT(RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportSummaryCaseFeature::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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -71,26 +51,7 @@ bool RicImportSummaryCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicImportSummaryCaseFeature::onActionTriggered(bool isChecked)
{
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
QStringList fileNames_ = QFileDialog::getOpenFileNames(nullptr, "Import Summary Case", defaultDir, "Eclipse Summary File (*.SMSPEC);;All Files (*.*)");
if (fileNames_.isEmpty()) return;
QStringList fileNames;
// Convert to internal path separator
for (QString s : fileNames_)
{
fileNames.push_back(RiaFilePathTools::toInternalSeparator(s));
}
if (fileNames.isEmpty()) return;
// Remember the path to next time
app->setLastUsedDialogDirectory("INPUT_FILES", QFileInfo(fileNames.last()).absolutePath());
openSummaryCaseFromFileNames(fileNames);
RicImportGeneralDataFeature::openFileDialog(RiaDefines::ECLIPSE_SUMMARY_FILE);
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/Commands/RicImportSummaryCaseFeature.h
View File

@@ -18,6 +18,8 @@
#pragma once
#include "RicImportGeneralDataFeature.h"
#include "cafCmdFeature.h"
#include <QString>
@@ -25,10 +27,10 @@
//==================================================================================================
///
//==================================================================================================
class RicImportSummaryCaseFeature : public caf::CmdFeature
class RicImportSummaryCaseFeature : public RicImportGeneralDataFeature
{
CAF_CMD_HEADER_INIT;
static bool openSummaryCaseFromFileNames(const QStringList& fileNames);
protected:
// Overrides
bool isCommandEnabled() override;