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

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-24 07:29:32 +02:00
parent f89dcf4e52
commit e85c36b4a4
10 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/Commands/RicImportGeneralDataFeature.cpp
View File

@@ -54,15 +54,16 @@ RicImportGeneralDataFeature::OpenCaseResults
for ( const QString& fileName : fileNames )
{
if ( obtainFileTypeFromFileName( fileName ) & ( ECLIPSE_GRID_FILE | ECLIPSE_EGRID_FILE ) )
int fileTypeAsInt = int( obtainFileTypeFromFileName( fileName ) );
if ( fileTypeAsInt & ( int( ImportFileType::ECLIPSE_GRID_FILE ) | int( ImportFileType::ECLIPSE_EGRID_FILE ) ) )
{
eclipseCaseFiles.push_back( fileName );
}
else if ( obtainFileTypeFromFileName( fileName ) & ECLIPSE_INPUT_FILE )
else if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_INPUT_FILE ) )
{
eclipseInputFiles.push_back( fileName );
}
else if ( obtainFileTypeFromFileName( fileName ) & ECLIPSE_SUMMARY_FILE )
else if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_SUMMARY_FILE ) )
{
eclipseSummaryFiles.push_back( fileName );
}
@@ -76,7 +77,8 @@ RicImportGeneralDataFeature::OpenCaseResults
return OpenCaseResults();
}
results.eclipseCaseFiles = eclipseCaseFiles;
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ECLIPSE_EGRID_FILE ), defaultDir );
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ImportFileType::ECLIPSE_EGRID_FILE ),
defaultDir );
}
if ( !eclipseInputFiles.empty() )
{
@@ -85,7 +87,8 @@ RicImportGeneralDataFeature::OpenCaseResults
return OpenCaseResults();
}
results.eclipseInputFiles = eclipseInputFiles;
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ECLIPSE_INPUT_FILE ), defaultDir );
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ImportFileType::ECLIPSE_INPUT_FILE ),
defaultDir );
}
if ( !eclipseSummaryFiles.empty() )
{
@@ -94,7 +97,8 @@ RicImportGeneralDataFeature::OpenCaseResults
return OpenCaseResults();
}
results.eclipseSummaryFiles = eclipseSummaryFiles;
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ECLIPSE_SUMMARY_FILE ), defaultDir );
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ImportFileType::ECLIPSE_SUMMARY_FILE ),
defaultDir );
}
return results;
}
@@ -138,7 +142,7 @@ bool RicImportGeneralDataFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicImportGeneralDataFeature::onActionTriggered( bool isChecked )
{
openFileDialog( ANY_ECLIPSE_FILE );
openFileDialog( ImportFileType::ANY_ECLIPSE_FILE );
}
//--------------------------------------------------------------------------------------------------
@@ -153,7 +157,7 @@ void RicImportGeneralDataFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefines::ImportFileType fileTypes )
QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefines::ImportFileType fileType )
{
QString eclipseGridFilePattern( "*.GRID" );
QString eclipseEGridFilePattern( "*.EGRID" );
@@ -161,7 +165,7 @@ QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefin
QString eclipseSummaryFilePattern( "*.SMSPEC" );
QStringList filePatternTexts;
if ( fileTypes == ANY_ECLIPSE_FILE )
if ( fileType == ImportFileType::ANY_ECLIPSE_FILE )
{
filePatternTexts += QString( "Eclipse Files (%1 %2 %3 %4)" )
.arg( eclipseGridFilePattern )
@@ -169,26 +173,29 @@ QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefin
.arg( eclipseInputFilePattern )
.arg( eclipseSummaryFilePattern );
}
if ( fileTypes & ECLIPSE_EGRID_FILE )
int fileTypeAsInt = int( fileType );
if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_EGRID_FILE ) )
{
filePatternTexts += QString( "Eclipse EGrid Files (%1)" ).arg( eclipseEGridFilePattern );
}
if ( fileTypes & ECLIPSE_GRID_FILE )
if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_GRID_FILE ) )
{
filePatternTexts += QString( "Eclipse Grid Files (%1)" ).arg( eclipseGridFilePattern );
}
if ( fileTypes & ECLIPSE_INPUT_FILE )
if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_INPUT_FILE ) )
{
filePatternTexts += QString( "Eclipse Input Files and Input Properties (%1)" ).arg( eclipseInputFilePattern );
}
if ( fileTypes & ECLIPSE_SUMMARY_FILE )
if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_SUMMARY_FILE ) )
{
filePatternTexts += QString( "Eclipse Summary File (%1)" ).arg( eclipseSummaryFilePattern );
}
QString fullPattern = filePatternTexts.join( ";;" );
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory( defaultDirectoryLabel( fileTypes ) );
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory( defaultDirectoryLabel( fileType ) );
QStringList fileNames =
QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), "Import Data File", defaultDir, fullPattern );
@@ -203,9 +210,9 @@ void RicImportGeneralDataFeature::openFileDialog( ImportFileType fileTypes )
QStringList fileNames = getEclipseFileNamesWithDialog( fileTypes );
if ( fileNames.empty() ) return;
if ( fileTypes == ANY_ECLIPSE_FILE )
if ( fileTypes == ImportFileType::ANY_ECLIPSE_FILE )
{
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ANY_ECLIPSE_FILE ),
RiaApplication::instance()->setLastUsedDialogDirectory( defaultDirectoryLabel( ImportFileType::ANY_ECLIPSE_FILE ),
fileNames.front() );
}