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

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