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

#3476 Regression Test : Use lastUsedDialogDirectoryWithFallbackToProjectFolder

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-09 16:05:15 +02:00
parent fd5b9653ba
commit 046c05e76e
10 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -1947,7 +1947,7 @@ QString RiaApplication::lastUsedDialogDirectoryWithFallback(const QString& dialo
//--------------------------------------------------------------------------------------------------
QString RiaApplication::lastUsedDialogDirectoryWithFallbackToProjectFolder(const QString& dialogName)
{
return lastUsedDialogDirectoryWithFallback(this->currentProjectPath());
return lastUsedDialogDirectoryWithFallback(dialogName, currentProjectPath());
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/Application/RiaApplication.h
View File

@@ -115,7 +115,6 @@ public:
void createInputMockModel();
QString lastUsedDialogDirectory(const QString& dialogName);
QString lastUsedDialogDirectoryWithFallback(const QString& dialogName, const QString& fallbackDirectory);
QString lastUsedDialogDirectoryWithFallbackToProjectFolder(const QString& dialogName);
void setLastUsedDialogDirectory(const QString& dialogName, const QString& directory);
@@ -215,6 +214,8 @@ private:
void loadAndUpdatePlotData();
QString lastUsedDialogDirectoryWithFallback(const QString& dialogName, const QString& fallbackDirectory);
void storeTreeViewState();
friend RiaArgumentParser;
@@ -226,7 +227,7 @@ private slots:
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
private:
caf::PdmPointer<Rim3dView> m_activeReservoirView;
caf::PdmPointer<Rim3dView> m_activeReservoirView;
caf::PdmPointer<RimProject> m_project;
RiaSocketServer* m_socketServer;