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

#4208 Store last used folder when exporting Sector Model + warning for LGRs

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-21 11:56:19 +01:00
parent 677f42591b
commit f8102797c1
6 changed files with 82 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -2054,6 +2054,7 @@ bool RiaApplication::openFile(const QString& fileName)
bool loadingSucceded = false;
QString lastUsedDialogTag;
if (RiaApplication::hasValidProjectFileExtension(fileName))
{
loadingSucceded = loadProject(fileName);
@@ -2061,14 +2062,18 @@ bool RiaApplication::openFile(const QString& 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))
{
loadingSucceded = openOdbCaseFromFile(fileName);
if (loadingSucceded) lastUsedDialogTag = "GEOMECH_MODEL";
}
else if (fileName.contains(".smspec", Qt::CaseInsensitive))
{
@@ -2076,12 +2081,20 @@ bool RiaApplication::openFile(const QString& fileName)
if (loadingSucceded)
{
getOrCreateAndShowMainPlotWindow();
lastUsedDialogTag = "INPUT_FILES";
}
}
if (loadingSucceded && !RiaApplication::hasValidProjectFileExtension(fileName))
if (loadingSucceded)
{
caf::PdmUiModelChangeDetector::instance()->setModelChanged();
if (!lastUsedDialogTag.isEmpty())
{
RiaApplication::instance()->setLastUsedDialogDirectory(lastUsedDialogTag, QFileInfo(fileName).absolutePath());
}
if (!RiaApplication::hasValidProjectFileExtension(fileName))
{
caf::PdmUiModelChangeDetector::instance()->setModelChanged();
}
}
return loadingSucceded;