Use wrapper class instead of QFileDialog

This commit is contained in:
Magne Sjaastad 2020-08-21 18:56:44 +02:00
parent 6655946be5
commit afa8804e5b
31 changed files with 172 additions and 140 deletions

View File

@ -92,6 +92,7 @@
#include "Riu3dSelectionManager.h" #include "Riu3dSelectionManager.h"
#include "RiuDockWidgetTools.h" #include "RiuDockWidgetTools.h"
#include "RiuFileDialogTools.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RiuMainWindowTools.h" #include "RiuMainWindowTools.h"
#include "RiuMdiMaximizeWindowGuard.h" #include "RiuMdiMaximizeWindowGuard.h"
@ -119,7 +120,6 @@
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QDir> #include <QDir>
#include <QErrorMessage> #include <QErrorMessage>
#include <QFileDialog>
#include <QGridLayout> #include <QGridLayout>
#include <QMdiSubWindow> #include <QMdiSubWindow>
#include <QMessageBox> #include <QMessageBox>
@ -241,8 +241,10 @@ QString RiaGuiApplication::promptForProjectSaveAsFileName() const
startPath += "/ResInsightProject.rsp"; startPath += "/ResInsightProject.rsp";
} }
QString fileName = QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
QFileDialog::getSaveFileName( nullptr, tr( "Save File" ), startPath, tr( "Project Files (*.rsp);;All files(*.*)" ) ); tr( "Save File" ),
startPath,
tr( "Project Files (*.rsp);;All files(*.*)" ) );
return fileName; return fileName;
} }

View File

@ -27,11 +27,12 @@
#include "RimProject.h" #include "RimProject.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <cafSelectionManagerTools.h> #include "cafSelectionManagerTools.h"
CAF_CMD_SOURCE_INIT( RicImportPolylinesAnnotationFeature, "RicImportPolylinesAnnotationFeature" ); CAF_CMD_SOURCE_INIT( RicImportPolylinesAnnotationFeature, "RicImportPolylinesAnnotationFeature" );
@ -55,7 +56,8 @@ void RicImportPolylinesAnnotationFeature::onActionTriggered( bool isChecked )
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" ); QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
QStringList fileNames = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList fileNames =
RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Poly Lines Annotation", "Import Poly Lines Annotation",
defaultDir, defaultDir,
"Text Files (*.txt);;Polylines (*.dat);;All Files (*.*)" ); "Text Files (*.txt);;Polylines (*.dat);;All Files (*.*)" );

View File

@ -20,6 +20,7 @@
#include "RiaVersionInfo.h" #include "RiaVersionInfo.h"
#include "RiuFileDialogTools.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "cafClassTypeName.h" #include "cafClassTypeName.h"
@ -29,7 +30,7 @@
#include <QAction> #include <QAction>
#include <QApplication> #include <QApplication>
#include <QDateTime> #include <QDateTime>
#include <QFileDialog> #include <QFile>
#include <QTextStream> #include <QTextStream>
CAF_CMD_SOURCE_INIT( RicExportObjectAndFieldKeywordsFeature, "RicExportObjectAndFieldKeywordsFeature" ); CAF_CMD_SOURCE_INIT( RicExportObjectAndFieldKeywordsFeature, "RicExportObjectAndFieldKeywordsFeature" );
@ -47,10 +48,9 @@ bool RicExportObjectAndFieldKeywordsFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExportObjectAndFieldKeywordsFeature::onActionTriggered( bool isChecked ) void RicExportObjectAndFieldKeywordsFeature::onActionTriggered( bool isChecked )
{ {
QString dir = QFileDialog::getExistingDirectory( RiuMainWindow::instance(), QString dir = RiuFileDialogTools::getExistingDirectory( RiuMainWindow::instance(),
tr( "Select Directory For Export" ), tr( "Select Directory For Export" ),
"c:/temp", "c:/temp" );
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
if ( !dir.isEmpty() ) if ( !dir.isEmpty() )
{ {

View File

@ -20,10 +20,11 @@
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiuFileDialogTools.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <QStyle> #include <QStyle>
CAF_CMD_SOURCE_INIT( RicOpenProjectFeature, "RicOpenProjectFeature" ); CAF_CMD_SOURCE_INIT( RicOpenProjectFeature, "RicOpenProjectFeature" );
@ -46,7 +47,7 @@ void RicOpenProjectFeature::onActionTriggered( bool isChecked )
if ( !app->askUserToSaveModifiedProject() ) return; if ( !app->askUserToSaveModifiedProject() ) return;
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" ); QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
QString fileName = QFileDialog::getOpenFileName( nullptr, QString fileName = RiuFileDialogTools::getOpenFileName( nullptr,
"Open ResInsight Project", "Open ResInsight Project",
defaultDir, defaultDir,
"ResInsight project (*.rsp *.rip);;All files(*.*)" ); "ResInsight project (*.rsp *.rip);;All files(*.*)" );

View File

@ -20,10 +20,11 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RicfCommandFileExecutor.h" #include "RicfCommandFileExecutor.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QDir> #include <QDir>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicRunCommandFileFeature, "RicRunCommandFileFeature" ); CAF_CMD_SOURCE_INIT( RicRunCommandFileFeature, "RicRunCommandFileFeature" );
@ -43,7 +44,7 @@ void RicRunCommandFileFeature::onActionTriggered( bool isChecked )
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectoryWithFallbackToProjectFolder( "COMMAND_FILE" ); QString defaultDir = app->lastUsedDialogDirectoryWithFallbackToProjectFolder( "COMMAND_FILE" );
QString fileName = QFileDialog::getOpenFileName( nullptr, QString fileName = RiuFileDialogTools::getOpenFileName( nullptr,
"Open ResInsight Command File", "Open ResInsight Command File",
defaultDir, defaultDir,
"ResInsight Command File (*.txt);;All files(*.*)" ); "ResInsight Command File (*.txt);;All files(*.*)" );

View File

@ -28,11 +28,12 @@
#include "RimWellPathCompletions.h" #include "RimWellPathCompletions.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicWellPathImportCompletionsFileFeature, "RicWellPathImportCompletionsFileFeature" ); CAF_CMD_SOURCE_INIT( RicWellPathImportCompletionsFileFeature, "RicWellPathImportCompletionsFileFeature" );
@ -61,11 +62,11 @@ void RicWellPathImportCompletionsFileFeature::onActionTriggered( bool isChecked
// Open dialog box to select well path files // Open dialog box to select well path files
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" ); QString defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
QStringList wellPathFilePaths = QStringList wellPathFilePaths = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Fishbone Laterals", "Import Fishbone Laterals",
defaultDir, defaultDir,
"Well Path Laterals (*.json *.asc *.asci *.ascii *.dev);;All Files (*.*)" ); "Well Path Laterals (*.json *.asc *.asci "
"*.ascii *.dev);;All Files (*.*)" );
if ( wellPathFilePaths.size() < 1 ) return; if ( wellPathFilePaths.size() < 1 ) return;

View File

@ -30,11 +30,12 @@
#include "RifPerforationIntervalReader.h" #include "RifPerforationIntervalReader.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicWellPathImportPerforationIntervalsFeature, "RicWellPathImportPerforationIntervalsFeature" ); CAF_CMD_SOURCE_INIT( RicWellPathImportPerforationIntervalsFeature, "RicWellPathImportPerforationIntervalsFeature" );
@ -63,7 +64,7 @@ void RicWellPathImportPerforationIntervalsFeature::onActionTriggered( bool isChe
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" ); QString defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
QStringList wellPathFilePaths = QStringList wellPathFilePaths =
QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Well Path Perforation Intervals", "Import Well Path Perforation Intervals",
defaultDir, defaultDir,
"Well Path Perforation Intervals (*.ev);;All Files (*.*)" ); "Well Path Perforation Intervals (*.ev);;All Files (*.*)" );

View File

@ -27,11 +27,11 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QStringList> #include <QStringList>
@ -67,7 +67,7 @@ void RicAddEclipseInputPropertyFeature::onActionTriggered( bool isChecked )
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectoryWithFallback( "INPUT_FILES", casePath ); QString defaultDir = app->lastUsedDialogDirectoryWithFallback( "INPUT_FILES", casePath );
QStringList fileNames = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Select Eclipse Input Property Files", "Select Eclipse Input Property Files",
defaultDir, defaultDir,
"All Files (*.* *)" ); "All Files (*.* *)" );

View File

@ -24,11 +24,12 @@
#include "RimEclipseCaseCollection.h" #include "RimEclipseCaseCollection.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportEclipseCaseFeature, "RicImportEclipseCaseFeature" ); CAF_CMD_SOURCE_INIT( RicImportEclipseCaseFeature, "RicImportEclipseCaseFeature" );
@ -48,7 +49,7 @@ void RicImportEclipseCaseFeature::onActionTriggered( bool isChecked )
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" ); QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
QStringList fileNames = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Eclipse File", "Import Eclipse File",
defaultDir, defaultDir,
"Eclipse Grid Files (*.GRID *.EGRID)" ); "Eclipse Grid Files (*.GRID *.EGRID)" );

View File

@ -22,9 +22,9 @@
#include "RiaImportEclipseCaseTools.h" #include "RiaImportEclipseCaseTools.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportEclipseCaseTimeStepFilterFeature, "RicImportEclipseCaseTimeStepFilterFeature" ); CAF_CMD_SOURCE_INIT( RicImportEclipseCaseTimeStepFilterFeature, "RicImportEclipseCaseTimeStepFilterFeature" );
@ -37,7 +37,7 @@ void RicImportEclipseCaseTimeStepFilterFeature::onActionTriggered( bool isChecke
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" ); QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
QString fileName = QFileDialog::getOpenFileName( Riu3DMainWindowTools::mainWindowWidget(), QString fileName = RiuFileDialogTools::getOpenFileName( Riu3DMainWindowTools::mainWindowWidget(),
"Import Eclipse File", "Import Eclipse File",
defaultDir, defaultDir,
"Eclipse Grid Files (*.GRID *.EGRID)" ); "Eclipse Grid Files (*.GRID *.EGRID)" );

View File

@ -31,11 +31,12 @@
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include "RimFaultInView.h" #include "RimFaultInView.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "cafUtils.h" #include "cafUtils.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicExportFaultsFeature, "RicExportFaultsFeature" ); CAF_CMD_SOURCE_INIT( RicExportFaultsFeature, "RicExportFaultsFeature" );
@ -66,7 +67,7 @@ void RicExportFaultsFeature::onActionTriggered( bool isChecked )
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder( "FAULTS" ); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder( "FAULTS" );
QString selectedDir = QFileDialog::getExistingDirectory( nullptr, tr( "Select Directory" ), defaultDir ); QString selectedDir = RiuFileDialogTools::getExistingDirectory( nullptr, tr( "Select Directory" ), defaultDir );
if ( selectedDir.isNull() ) if ( selectedDir.isNull() )
{ {

View File

@ -27,6 +27,8 @@
#include "RimPlotWindow.h" #include "RimPlotWindow.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimViewWindow.h" #include "RimViewWindow.h"
#include "RiuFileDialogTools.h"
#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindow.h"
#include "RicSnapshotFilenameGenerator.h" #include "RicSnapshotFilenameGenerator.h"
@ -37,7 +39,6 @@
#include <QClipboard> #include <QClipboard>
#include <QDebug> #include <QDebug>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QMdiSubWindow> #include <QMdiSubWindow>
#include <QPageLayout> #include <QPageLayout>
@ -210,7 +211,7 @@ QString RicSnapshotViewToFileFeature::generateSaveFileName( const QString& defau
{ {
selectedExtension = pdfFilter; selectedExtension = pdfFilter;
} }
QString fileName = QFileDialog::getSaveFileName( nullptr, QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
tr( "Export to File" ), tr( "Export to File" ),
defaultAbsFileName, defaultAbsFileName,
fileExtensionFilter, fileExtensionFilter,

View File

@ -29,13 +29,14 @@
#include "RimWellPathFracture.h" #include "RimWellPathFracture.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "cvfAssert.h" #include "cvfAssert.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicNewStimPlanFractureTemplateFeature, "RicNewStimPlanFractureTemplateFeature" ); CAF_CMD_SOURCE_INIT( RicNewStimPlanFractureTemplateFeature, "RicNewStimPlanFractureTemplateFeature" );
@ -78,7 +79,7 @@ std::vector<RimStimPlanFractureTemplate*> RicNewStimPlanFractureTemplateFeature:
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" ); QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
QStringList fileNames = QFileDialog::getOpenFileNames( nullptr, QStringList fileNames = RiuFileDialogTools::getOpenFileNames( nullptr,
"Open StimPlan XML File", "Open StimPlan XML File",
defaultDir, defaultDir,
"StimPlan XML File (*.xml);;All files(*.*)" ); "StimPlan XML File (*.xml);;All files(*.*)" );

View File

@ -27,11 +27,11 @@
#include "RimScriptCollection.h" #include "RimScriptCollection.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cvfAssert.h" #include "cvfAssert.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicAddScriptPathFeature, "RicAddScriptPathFeature" ); CAF_CMD_SOURCE_INIT( RicAddScriptPathFeature, "RicAddScriptPathFeature" );
@ -50,7 +50,7 @@ bool RicAddScriptPathFeature::isCommandEnabled()
void RicAddScriptPathFeature::onActionTriggered( bool isChecked ) void RicAddScriptPathFeature::onActionTriggered( bool isChecked )
{ {
QString selectedFolder = QString selectedFolder =
QFileDialog::getExistingDirectory( Riu3DMainWindowTools::mainWindowWidget(), "Select script folder" ); RiuFileDialogTools::getExistingDirectory( Riu3DMainWindowTools::mainWindowWidget(), "Select script folder" );
if ( !selectedFolder.isEmpty() ) if ( !selectedFolder.isEmpty() )
{ {
QString filePathString = RiaApplication::instance()->preferences()->scriptDirectories(); QString filePathString = RiaApplication::instance()->preferences()->scriptDirectories();

View File

@ -32,12 +32,15 @@
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RiuFileDialogTools.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "cafUtils.h" #include "cafUtils.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFile>
#include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
CAF_CMD_SOURCE_INIT( RicSavePlotTemplateFeature, "RicSavePlotTemplateFeature" ); CAF_CMD_SOURCE_INIT( RicSavePlotTemplateFeature, "RicSavePlotTemplateFeature" );
@ -75,7 +78,7 @@ void RicSavePlotTemplateFeature::onActionTriggered( bool isChecked )
startPath = startPath + "/" + templateCandidateName + ".rpt"; startPath = startPath + "/" + templateCandidateName + ".rpt";
QString fileName = QFileDialog::getSaveFileName( nullptr, QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
tr( "Save Plot Template To File" ), tr( "Save Plot Template To File" ),
startPath, startPath,
tr( "Plot Template Files (*.rpt);;All files(*.*)" ) ); tr( "Plot Template Files (*.rpt);;All files(*.*)" ) );

View File

@ -26,8 +26,10 @@
#include "RimGeoMechCase.h" #include "RimGeoMechCase.h"
#include "RimGeoMechView.h" #include "RimGeoMechView.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportElementPropertyFeature, "RicImportElementPropertyFeature" ); CAF_CMD_SOURCE_INIT( RicImportElementPropertyFeature, "RicImportElementPropertyFeature" );
@ -56,7 +58,7 @@ void RicImportElementPropertyFeature::importElementProperties()
QString defaultDir = app->lastUsedDialogDirectory( "ELM_PROPS" ); QString defaultDir = app->lastUsedDialogDirectory( "ELM_PROPS" );
QStringList fileNames = QStringList fileNames =
QFileDialog::getOpenFileNames( nullptr, "Import Element Property Table", defaultDir, "Property Table (*.inp)" ); RiuFileDialogTools::getOpenFileNames( nullptr, "Import Element Property Table", defaultDir, "Property Table (*.inp)" );
if ( !fileNames.empty() ) if ( !fileNames.empty() )
{ {

View File

@ -36,6 +36,7 @@
#include "RimOilField.h" #include "RimOilField.h"
#include "RimProject.h" #include "RimProject.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "RimColorLegend.h" #include "RimColorLegend.h"
#include "RimColorLegendCollection.h" #include "RimColorLegendCollection.h"
@ -43,7 +44,7 @@
#include "RimRegularLegendConfig.h" #include "RimRegularLegendConfig.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportFormationNamesFeature, "RicImportFormationNamesFeature" ); CAF_CMD_SOURCE_INIT( RicImportFormationNamesFeature, "RicImportFormationNamesFeature" );
@ -110,7 +111,7 @@ void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )
QString( "Formation Names description File (*.lyr);;FMU Layer Zone Table(%1);;All Files (*.*)" ) QString( "Formation Names description File (*.lyr);;FMU Layer Zone Table(%1);;All Files (*.*)" )
.arg( RimFormationNames::layerZoneTableFileName() ); .arg( RimFormationNames::layerZoneTableFileName() );
QStringList fileNames = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Formation Names", "Import Formation Names",
defaultDir, defaultDir,
filterText ); filterText );

View File

@ -28,9 +28,10 @@
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
@ -197,8 +198,10 @@ QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefin
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory( defaultDirectoryLabel( fileType ) ); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory( defaultDirectoryLabel( fileType ) );
QStringList fileNames = QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), "Import Data File", defaultDir, fullPattern ); "Import Data File",
defaultDir,
fullPattern );
return fileNames; return fileNames;
} }

View File

@ -20,8 +20,10 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseFeature, "RicImportGeoMechCaseFeature" ); CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseFeature, "RicImportGeoMechCaseFeature" );
@ -42,7 +44,7 @@ void RicImportGeoMechCaseFeature::onActionTriggered( bool isChecked )
QString defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" ); QString defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" );
QStringList fileNames = QStringList fileNames =
QFileDialog::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" ); RiuFileDialogTools::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" );
if ( fileNames.size() ) defaultDir = QFileInfo( fileNames.last() ).absolutePath(); if ( fileNames.size() ) defaultDir = QFileInfo( fileNames.last() ).absolutePath();
app->setLastUsedDialogDirectory( "GEOMECH_MODEL", defaultDir ); app->setLastUsedDialogDirectory( "GEOMECH_MODEL", defaultDir );

View File

@ -22,9 +22,9 @@
#include "RiaImportEclipseCaseTools.h" #include "RiaImportEclipseCaseTools.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseTimeStepFilterFeature, "RicImportGeoMechCaseTimeStepFilterFeature" ); CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseTimeStepFilterFeature, "RicImportGeoMechCaseTimeStepFilterFeature" );
@ -38,7 +38,7 @@ void RicImportGeoMechCaseTimeStepFilterFeature::onActionTriggered( bool isChecke
QString defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" ); QString defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" );
QStringList fileNames = QStringList fileNames =
QFileDialog::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" ); RiuFileDialogTools::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" );
if ( fileNames.size() ) defaultDir = QFileInfo( fileNames.last() ).absolutePath(); if ( fileNames.size() ) defaultDir = QFileInfo( fileNames.last() ).absolutePath();
for ( QString fileName : fileNames ) for ( QString fileName : fileNames )
{ {

View File

@ -26,12 +26,13 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryObservedDataFile.h" #include "RimSummaryObservedDataFile.h"
#include "RiuFileDialogTools.h"
#include "RiuPlotMainWindowTools.h" #include "RiuPlotMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
CAF_CMD_SOURCE_INIT( RicImportObservedDataFeature, "RicImportObservedDataFeature" ); CAF_CMD_SOURCE_INIT( RicImportObservedDataFeature, "RicImportObservedDataFeature" );
@ -43,7 +44,8 @@ void RicImportObservedDataFeature::selectObservedDataFileInDialog()
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "INPUT_FILES" ); QString defaultDir = app->lastUsedDialogDirectory( "INPUT_FILES" );
QStringList fileNames = QFileDialog::getOpenFileNames( nullptr, QStringList fileNames =
RiuFileDialogTools::getOpenFileNames( nullptr,
"Import Observed Data", "Import Observed Data",
defaultDir, defaultDir,
"Observed Data (*.RSM *.txt *.csv);;All Files (*.*)" ); "Observed Data (*.RSM *.txt *.csv);;All Files (*.*)" );

View File

@ -33,6 +33,7 @@
#include "RimOilField.h" #include "RimOilField.h"
#include "RimProject.h" #include "RimProject.h"
#include "RiuFileDialogTools.h"
#include "RiuPlotMainWindowTools.h" #include "RiuPlotMainWindowTools.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
@ -40,7 +41,6 @@
#include <QAction> #include <QAction>
#include <QDir> #include <QDir>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
@ -53,10 +53,9 @@ void RicImportObservedFmuDataFeature::selectObservedDataPathInDialog()
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "SUMMARY_CASE_DIR" ); QString defaultDir = app->lastUsedDialogDirectory( "SUMMARY_CASE_DIR" );
QString directory = QFileDialog::getExistingDirectory( nullptr, QString directory = RiuFileDialogTools::getExistingDirectory( nullptr,
"Import Observed FMU Data Recursively from Directory", "Import Observed FMU Data Recursively from Directory",
defaultDir, defaultDir );
QFileDialog::ShowDirsOnly );
QStringList subDirsWithFmuData = RifReaderFmuRft::findSubDirectoriesWithFmuRftData( directory ); QStringList subDirsWithFmuData = RifReaderFmuRft::findSubDirectoriesWithFmuRftData( directory );
if ( subDirsWithFmuData.empty() ) if ( subDirsWithFmuData.empty() )

View File

@ -21,13 +21,14 @@
#include "RiaFilePathTools.h" #include "RiaFilePathTools.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiuFileDialogTools.h"
#include "RiuTools.h" #include "RiuTools.h"
#include <QAbstractItemView> #include <QAbstractItemView>
#include <QAction> #include <QAction>
#include <QClipboard> #include <QClipboard>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QFileDialog> #include <QDir>
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
@ -711,7 +712,7 @@ void RicRecursiveFileSearchDialog::slotDialogCancelClicked()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicRecursiveFileSearchDialog::slotBrowseButtonClicked() void RicRecursiveFileSearchDialog::slotBrowseButtonClicked()
{ {
QString folder = QFileDialog::getExistingDirectory( this, "Select folder", rootDirWithEndSeparator() ); QString folder = RiuFileDialogTools::getExistingDirectory( this, "Select folder", rootDirWithEndSeparator() );
RiaFilePathTools::appendSeparatorIfNo( folder ); RiaFilePathTools::appendSeparatorIfNo( folder );
folder += "*"; folder += "*";
if ( !folder.isEmpty() ) m_pathFilterField->setText( QDir::toNativeSeparators( folder ) ); if ( !folder.isEmpty() ) m_pathFilterField->setText( QDir::toNativeSeparators( folder ) );

View File

@ -26,6 +26,7 @@
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RiuFileDialogTools.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "cafPdmUiPropertyViewDialog.h" #include "cafPdmUiPropertyViewDialog.h"
@ -37,7 +38,6 @@
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicAsciiExportSummaryPlotFeature, "RicAsciiExportSummaryPlotFeature" ); CAF_CMD_SOURCE_INIT( RicAsciiExportSummaryPlotFeature, "RicAsciiExportSummaryPlotFeature" );
@ -138,7 +138,7 @@ QString RicAsciiExportSummaryPlotFeature::getFileNameFromUserDialog( const QStri
const QString& defaultDir ) const QString& defaultDir )
{ {
QString defaultFileName = defaultDir + "/" + caf::Utils::makeValidFileBasename( fileNameCandidate ) + ".ascii"; QString defaultFileName = defaultDir + "/" + caf::Utils::makeValidFileBasename( fileNameCandidate ) + ".ascii";
QString fileName = QFileDialog::getSaveFileName( nullptr, QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
"Select File for Summary Plot Export", "Select File for Summary Plot Export",
defaultFileName, defaultFileName,
"Text File(*.ascii);;All files(*.*)" ); "Text File(*.ascii);;All files(*.*)" );

View File

@ -26,9 +26,10 @@
#include "RimSurfaceCollection.h" #include "RimSurfaceCollection.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportSurfacesFeature, "RicImportSurfacesFeature" ); CAF_CMD_SOURCE_INIT( RicImportSurfacesFeature, "RicImportSurfacesFeature" );
@ -47,7 +48,7 @@ void RicImportSurfacesFeature::onActionTriggered( bool isChecked )
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" ); QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
QStringList fileNames = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Surfaces", "Import Surfaces",
defaultDir, defaultDir,
"Surface files (*.ptl *.ts);;All Files (*.*)" ); "Surface files (*.ptl *.ts);;All Files (*.*)" );

View File

@ -23,6 +23,7 @@
#include "RimWellLogPlot.h" #include "RimWellLogPlot.h"
#include "RiuFileDialogTools.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "cafPdmUiPropertyViewDialog.h" #include "cafPdmUiPropertyViewDialog.h"
@ -33,7 +34,7 @@
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicAsciiExportWellLogPlotFeature, "RicAsciiExportWellLogPlotFeature" ); CAF_CMD_SOURCE_INIT( RicAsciiExportWellLogPlotFeature, "RicAsciiExportWellLogPlotFeature" );
@ -66,7 +67,7 @@ void RicAsciiExportWellLogPlotFeature::onActionTriggered( bool isChecked )
RimWellLogPlot* wellLogPlot = selectedWellLogPlots.at( 0 ); RimWellLogPlot* wellLogPlot = selectedWellLogPlots.at( 0 );
QString defaultFileName = defaultDir + "/" + QString defaultFileName = defaultDir + "/" +
caf::Utils::makeValidFileBasename( ( wellLogPlot->description() ) ) + ".ascii"; caf::Utils::makeValidFileBasename( ( wellLogPlot->description() ) ) + ".ascii";
QString fileName = QFileDialog::getSaveFileName( nullptr, QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
"Select File for Plot Data Export", "Select File for Plot Data Export",
defaultFileName, defaultFileName,
"Text File(*.ascii);;All files(*.*)" ); "Text File(*.ascii);;All files(*.*)" );

View File

@ -25,11 +25,12 @@
#include "RimProject.h" #include "RimProject.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafPdmUiObjectEditorHandle.h" #include "cafPdmUiObjectEditorHandle.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
CAF_CMD_SOURCE_INIT( RicWellLogsImportFileFeature, "RicWellLogsImportFileFeature" ); CAF_CMD_SOURCE_INIT( RicWellLogsImportFileFeature, "RicWellLogsImportFileFeature" );
@ -80,7 +81,7 @@ void RicWellLogsImportFileFeature::onActionTriggered( bool isChecked )
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "WELL_LOGS_DIR" ); QString defaultDir = app->lastUsedDialogDirectory( "WELL_LOGS_DIR" );
QString nameFilterString = QString( "Well Logs (%1);;All Files (*.*)" ).arg( wellLogFileNameFilters().join( " " ) ); QString nameFilterString = QString( "Well Logs (%1);;All Files (*.*)" ).arg( wellLogFileNameFilters().join( " " ) );
QStringList wellLogFilePaths = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList wellLogFilePaths = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Well Logs", "Import Well Logs",
defaultDir, defaultDir,
nameFilterString ); nameFilterString );

View File

@ -25,9 +25,10 @@
#include "RicWellMeasurementImportTools.h" #include "RicWellMeasurementImportTools.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportWellMeasurementsFeature, "RicImportWellMeasurementsFeature" ); CAF_CMD_SOURCE_INIT( RicImportWellMeasurementsFeature, "RicImportWellMeasurementsFeature" );
@ -50,7 +51,8 @@ void RicImportWellMeasurementsFeature::onActionTriggered( bool isChecked )
// Open dialog box to select well path files // Open dialog box to select well path files
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" ); QString defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
QStringList wellPathFilePaths = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList wellPathFilePaths =
RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Well Measurements", "Import Well Measurements",
defaultDir, defaultDir,
"Well Measurements (*.csv);;All Files (*.*)" ); "Well Measurements (*.csv);;All Files (*.*)" );

View File

@ -30,11 +30,12 @@
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include "cafPdmFieldIOScriptability.h" #include "cafPdmFieldIOScriptability.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QDir>
#include <QMessageBox> #include <QMessageBox>
//================================================================================================== //==================================================================================================
@ -216,8 +217,10 @@ void RicImportWellPaths::onActionTriggered( bool isChecked )
QString nameList = QString( "Well Paths (%1);;All Files (*.*)" ).arg( wellPathNameFilters().join( " " ) ); QString nameList = QString( "Well Paths (%1);;All Files (*.*)" ).arg( wellPathNameFilters().join( " " ) );
QStringList wellPathFilePaths = QStringList wellPathFilePaths = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), "Import Well Paths", defaultDir, nameList ); "Import Well Paths",
defaultDir,
nameList );
if ( wellPathFilePaths.size() >= 1 ) if ( wellPathFilePaths.size() >= 1 )
{ {

View File

@ -27,9 +27,10 @@
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicWellPathFormationsImportFileFeature, "RicWellPathFormationsImportFileFeature" ); CAF_CMD_SOURCE_INIT( RicWellPathFormationsImportFileFeature, "RicWellPathFormationsImportFileFeature" );
@ -49,7 +50,8 @@ void RicWellPathFormationsImportFileFeature::onActionTriggered( bool isChecked )
// Open dialog box to select well path formations files // Open dialog box to select well path formations files
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "WELLPATHFORMATIONS_DIR" ); QString defaultDir = app->lastUsedDialogDirectory( "WELLPATHFORMATIONS_DIR" );
QStringList wellPathFormationsFilePaths = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), QStringList wellPathFormationsFilePaths =
RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
"Import Well Picks", "Import Well Picks",
defaultDir, defaultDir,
"Well Picks (*.csv);;All Files (*.*)" ); "Well Picks (*.csv);;All Files (*.*)" );

View File

@ -29,6 +29,7 @@
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimProject.h" #include "RimProject.h"
#include "RiuFileDialogTools.h"
#include "RiuTools.h" #include "RiuTools.h"
#include "cafCmdFeatureManager.h" #include "cafCmdFeatureManager.h"
@ -38,7 +39,6 @@
#include <QAbstractItemView> #include <QAbstractItemView>
#include <QBoxLayout> #include <QBoxLayout>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QFileDialog>
#include <QHeaderView> #include <QHeaderView>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
@ -247,10 +247,7 @@ void RiuAdvancedSnapshotExportWidget::folderSelectionClicked()
QString defaultPath = m_exportFolderLineEdit->text(); QString defaultPath = m_exportFolderLineEdit->text();
QString directoryPath = QString directoryPath =
QFileDialog::getExistingDirectory( m_exportFolderLineEdit, RiuFileDialogTools::getExistingDirectory( m_exportFolderLineEdit, tr( "Get existing directory" ), defaultPath );
tr( "Get existing directory" ),
defaultPath,
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
if ( !directoryPath.isEmpty() ) if ( !directoryPath.isEmpty() )
{ {