OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6345 Use wrapper class instead of QFileDialog

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/RiaGuiApplication.cpp
View File

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

14
ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp
View File

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

10
ApplicationCode/Commands/ApplicationCommands/RicExportObjectAndFieldKeywordsFeature.cpp
View File

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

11
ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp
View File

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

11
ApplicationCode/Commands/ApplicationCommands/RicRunCommandFileFeature.cpp
View File

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

17
ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp
View File

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

11
ApplicationCode/Commands/CompletionCommands/RicWellPathImportPerforationIntervalsFeature.cpp
View File

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

10
ApplicationCode/Commands/EclipseCommands/RicAddEclipseInputPropertyFeature.cpp
View File

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

11
ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp
View File

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

10
ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseTimeStepFilterFeature.cpp
View File

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

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

@ -31,11 +31,12 @@
#include "RimEclipseCase.h"
#include "RimFaultInView.h"
#include "RiuFileDialogTools.h"
#include "cafSelectionManager.h"
#include "cafUtils.h"
#include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicExportFaultsFeature, "RicExportFaultsFeature" );
@ -66,7 +67,7 @@ void RicExportFaultsFeature::onActionTriggered( bool isChecked )
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() )
{

13
ApplicationCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp
View File

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

11
ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp
View File

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

4
ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.cpp
View File

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

13
ApplicationCode/Commands/PlotTemplateCommands/RicSavePlotTemplateFeature.cpp
View File

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

6
ApplicationCode/Commands/RicImportElementPropertyFeature.cpp
View File

@ -26,8 +26,10 @@
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
#include "RiuFileDialogTools.h"
#include <QAction>
#include <QFileDialog>
#include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportElementPropertyFeature, "RicImportElementPropertyFeature" );
@ -56,7 +58,7 @@ void RicImportElementPropertyFeature::importElementProperties()
QString defaultDir = app->lastUsedDialogDirectory( "ELM_PROPS" );
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() )
{

11
ApplicationCode/Commands/RicImportFormationNamesFeature.cpp
View File

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

9
ApplicationCode/Commands/RicImportGeneralDataFeature.cpp
View File

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

6
ApplicationCode/Commands/RicImportGeoMechCaseFeature.cpp
View File

@ -20,8 +20,10 @@
#include "RiaApplication.h"
#include "RiuFileDialogTools.h"
#include <QAction>
#include <QFileDialog>
#include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseFeature, "RicImportGeoMechCaseFeature" );
@ -42,7 +44,7 @@ void RicImportGeoMechCaseFeature::onActionTriggered( bool isChecked )
QString defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" );
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();
app->setLastUsedDialogDirectory( "GEOMECH_MODEL", defaultDir );

4
ApplicationCode/Commands/RicImportGeoMechCaseTimeStepFilterFeature.cpp
View File

@ -22,9 +22,9 @@
#include "RiaImportEclipseCaseTools.h"
#include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction>
#include <QFileDialog>
#include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseTimeStepFilterFeature, "RicImportGeoMechCaseTimeStepFilterFeature" );
@ -38,7 +38,7 @@ void RicImportGeoMechCaseTimeStepFilterFeature::onActionTriggered( bool isChecke
QString defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" );
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();
for ( QString fileName : fileNames )
{

12
ApplicationCode/Commands/RicImportObservedDataFeature.cpp
View File

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

9
ApplicationCode/Commands/RicImportObservedFmuDataFeature.cpp
View File

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

5
ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp
View File

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

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

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

11
ApplicationCode/Commands/SurfaceCommands/RicImportSurfacesFeature.cpp
View File

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

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

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

11
ApplicationCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp
View File

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

16
ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp
View File

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

9
ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
View File

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

16
ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
View File

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

7
ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp
View File

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