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

3
ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp
View File

@@ -54,9 +54,8 @@ void RicExportFishbonesLateralsFeature::onActionTriggered(bool isChecked)
CVF_ASSERT(wellPath); CVF_ASSERT(wellPath);
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString projectFolder = app->currentProjectPath();
QString defaultDir = app->lastUsedDialogDirectoryWithFallback("WELL_PATH_EXPORT_DIR", projectFolder); QString defaultDir = app->lastUsedDialogDirectoryWithFallbackToProjectFolder("WELL_PATH_EXPORT_DIR");
auto fileName = caf::Utils::makeValidFileBasename(wellPath->name()) + "_laterals.dev"; auto fileName = caf::Utils::makeValidFileBasename(wellPath->name()) + "_laterals.dev";
auto dialogData = EXP::openDialog(); auto dialogData = EXP::openDialog();

3
ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp
View File

@@ -64,8 +64,7 @@ void RicExportFishbonesWellSegmentsFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString projectFolder = app->currentProjectPath(); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("COMPLETIONS");
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder);
RicCaseAndFileExportSettingsUi exportSettings; RicCaseAndFileExportSettingsUi exportSettings;
std::vector<RimCase*> cases; std::vector<RimCase*> cases;

3
ApplicationCode/Commands/CompletionExportCommands/RicExportFracturesWellSegmentsFeature.cpp
View File

@@ -99,8 +99,7 @@ void RicExportFracturesWellSegmentsFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString projectFolder = app->currentProjectPath(); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("COMPLETIONS");
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder);
RicCaseAndFileExportSettingsUi exportSettings; RicCaseAndFileExportSettingsUi exportSettings;
std::vector<RimCase*> cases; std::vector<RimCase*> cases;

8
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@@ -51,11 +51,9 @@ void RicWellPathExportCompletionDataFeature::prepareExportSettingsAndExportCompl
const std::vector<RimWellPath*>& wellPaths, const std::vector<RimWellPath*>& wellPaths,
const std::vector<RimSimWellInView*>& simWells) const std::vector<RimSimWellInView*>& simWells)
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
RimProject* project = app->project(); RimProject* project = app->project();
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("COMPLETIONS");
QString projectFolder = app->currentProjectPath();
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder);
RicExportCompletionDataSettingsUi* exportSettings = project->dialogData()->exportCompletionData(); RicExportCompletionDataSettingsUi* exportSettings = project->dialogData()->exportCompletionData();

5
ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
View File

@@ -64,10 +64,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked)
if (selectedFaults.size() == 0) return; if (selectedFaults.size() == 0) return;
RiaApplication* app = RiaApplication::instance(); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("FAULTS");
QString projectFolder = app->currentProjectPath();
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("FAULTS", projectFolder);
QString selectedDir = QFileDialog::getExistingDirectory(nullptr, tr("Select Directory"), defaultDir); QString selectedDir = QFileDialog::getExistingDirectory(nullptr, tr("Select Directory"), defaultDir);

5
ApplicationCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
View File

@@ -63,10 +63,7 @@ void RicExportToLasFileFeature::onActionTriggered(bool isChecked)
std::vector<RimWellLogCurve*> curves = RicWellLogPlotCurveFeatureImpl::selectedWellLogCurves(); std::vector<RimWellLogCurve*> curves = RicWellLogPlotCurveFeatureImpl::selectedWellLogCurves();
if (curves.size() == 0) return; if (curves.size() == 0) return;
RiaApplication* app = RiaApplication::instance(); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("WELL_LOGS_DIR");
QString projectFolder = app->currentProjectPath();
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("WELL_LOGS_DIR", projectFolder);
RigLasFileExporter lasExporter(curves); RigLasFileExporter lasExporter(curves);
RicExportToLasFileResampleUi featureUi; RicExportToLasFileResampleUi featureUi;

4
ApplicationCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
View File

@@ -122,9 +122,7 @@ void RicAsciiExportSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RicAsciiExportSummaryPlotFeature::defaultExportDir() QString RicAsciiExportSummaryPlotFeature::defaultExportDir()
{ {
RiaApplication* app = RiaApplication::instance(); return RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("PLOT_ASCIIEXPORT_DIR");
QString projectFolder = app->currentProjectPath();
return RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("PLOT_ASCIIEXPORT_DIR", projectFolder);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp
View File

@@ -55,15 +55,9 @@ void RicAsciiExportWellLogPlotFeature::onActionTriggered(bool isChecked)
{ {
this->disableModelChangeContribution(); this->disableModelChangeContribution();
RiaApplication* app = RiaApplication::instance();
QString projectFolder = app->currentProjectPath();
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
std::vector<RimWellLogPlot*> selectedWellLogPlots; std::vector<RimWellLogPlot*> selectedWellLogPlots;
caf::SelectionManager::instance()->objectsByType(&selectedWellLogPlots); caf::SelectionManager::instance()->objectsByType(&selectedWellLogPlots);
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("PLOT_ASCIIEXPORT_DIR", projectFolder); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder("PLOT_ASCIIEXPORT_DIR");
caf::ProgressInfo pi(selectedWellLogPlots.size(), QString("Exporting plot data to ASCII")); caf::ProgressInfo pi(selectedWellLogPlots.size(), QString("Exporting plot data to ASCII"));
size_t progress = 0; size_t progress = 0;