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

6
ApplicationCode/Application/RiaApplication.cpp
View File

@ -322,16 +322,16 @@ bool RiaApplication::openFile( const QString& fileName )
RiaDefines::ImportFileType fileType = RiaDefines::obtainFileTypeFromFileName( fileName );
if ( fileType == RiaDefines::RESINSIGHT_PROJECT_FILE )
if ( fileType == RiaDefines::ImportFileType::RESINSIGHT_PROJECT_FILE )
{
loadingSucceded = loadProject( fileName );
}
else if ( fileType == RiaDefines::GEOMECH_ODB_FILE )
else if ( fileType == RiaDefines::ImportFileType::GEOMECH_ODB_FILE )
{
loadingSucceded = openOdbCaseFromFile( fileName );
lastUsedDialogTag = "GEOMECH_MODEL";
}
else if ( fileType & RiaDefines::ANY_ECLIPSE_FILE )
else if ( int( fileType ) & int( RiaDefines::ImportFileType::ANY_ECLIPSE_FILE ) )
{
loadingSucceded = RicImportGeneralDataFeature::openEclipseFilesFromFileNames( QStringList{fileName}, true );
lastUsedDialogTag = RiaDefines::defaultDirectoryLabel( fileType );

26
ApplicationCode/Application/RiaDefines.cpp
View File

@ -552,29 +552,29 @@ RiaDefines::ImportFileType RiaDefines::obtainFileTypeFromFileName( const QString
{
if ( fileName.endsWith( "EGRID", Qt::CaseInsensitive ) )
{
return ECLIPSE_EGRID_FILE;
return ImportFileType::ECLIPSE_EGRID_FILE;
}
else if ( fileName.endsWith( "GRID", Qt::CaseInsensitive ) )
{
return ECLIPSE_GRID_FILE;
return ImportFileType::ECLIPSE_GRID_FILE;
}
else if ( fileName.endsWith( "GRDECL", Qt::CaseInsensitive ) )
{
return ECLIPSE_INPUT_FILE;
return ImportFileType::ECLIPSE_INPUT_FILE;
}
else if ( fileName.endsWith( "SMSPEC", Qt::CaseInsensitive ) )
{
return ECLIPSE_SUMMARY_FILE;
return ImportFileType::ECLIPSE_SUMMARY_FILE;
}
else if ( fileName.endsWith( "ODB", Qt::CaseInsensitive ) )
{
return GEOMECH_ODB_FILE;
return ImportFileType::GEOMECH_ODB_FILE;
}
else if ( fileName.endsWith( ".rsp", Qt::CaseInsensitive ) || fileName.endsWith( ".rip", Qt::CaseInsensitive ) )
{
return RESINSIGHT_PROJECT_FILE;
return ImportFileType::RESINSIGHT_PROJECT_FILE;
}
return NOT_A_VALID_IMPORT_FILE;
return ImportFileType::NOT_A_VALID_IMPORT_FILE;
}
//--------------------------------------------------------------------------------------------------
@ -584,25 +584,27 @@ QString RiaDefines::defaultDirectoryLabel( RiaDefines::ImportFileType fileType )
{
QString defaultDirLabel;
if ( fileType == ANY_ECLIPSE_FILE )
int fileTypeAsInt = int( fileType );
if ( fileType == ImportFileType::ANY_ECLIPSE_FILE )
{
defaultDirLabel = "GENERAL_DATA";
}
else if ( fileType & ECLIPSE_RESULT_GRID )
else if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_RESULT_GRID ) )
{
defaultDirLabel = "BINARY_GRID";
}
else if ( fileType & ECLIPSE_INPUT_FILE )
else if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_INPUT_FILE ) )
{
defaultDirLabel = "INPUT_FILES";
}
else if ( fileType & ECLIPSE_SUMMARY_FILE )
else if ( fileTypeAsInt & int( ImportFileType::ECLIPSE_SUMMARY_FILE ) )
{
// TODO: Summary files used "INPUT_FILES" as last used directory.
// Check if this is correct.
defaultDirLabel = "INPUT_FILES";
}
else if ( fileType & GEOMECH_ODB_FILE )
else if ( fileTypeAsInt & int( ImportFileType::GEOMECH_ODB_FILE ) )
{
defaultDirLabel = "GEOMECH_MODEL";
}

2
ApplicationCode/Application/RiaDefines.h
View File

@ -169,7 +169,7 @@ enum class PhaseType
WATER_PHASE
};
enum ImportFileType
enum class ImportFileType
{
NOT_A_VALID_IMPORT_FILE = 0x00,
ECLIPSE_GRID_FILE = 0x01,

4
ApplicationCode/Application/RiaGuiApplication.cpp
View File

@ -1226,11 +1226,11 @@ void RiaGuiApplication::invokeProcessEvents( QEventLoop::ProcessEventsFlags flag
//--------------------------------------------------------------------------------------------------
void RiaGuiApplication::onFileSuccessfullyLoaded( const QString& fileName, RiaDefines::ImportFileType fileType )
{
if ( fileType & RiaDefines::ANY_ECLIPSE_FILE )
if ( int( fileType ) & int( RiaDefines::ImportFileType::ANY_ECLIPSE_FILE ) )
{
getOrCreateAndShowMainPlotWindow();
if ( fileType != RiaDefines::ECLIPSE_SUMMARY_FILE )
if ( fileType != RiaDefines::ImportFileType::ECLIPSE_SUMMARY_FILE )
{
if ( mainWindow() )
{

2
ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
View File

@ -52,7 +52,7 @@ bool RicImportInputEclipseCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicImportInputEclipseCaseFeature::onActionTriggered( bool isChecked )
{
RicImportGeneralDataFeature::openFileDialog( RiaDefines::ECLIPSE_INPUT_FILE );
RicImportGeneralDataFeature::openFileDialog( RiaDefines::ImportFileType::ECLIPSE_INPUT_FILE );
}
//--------------------------------------------------------------------------------------------------

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() );
}

2
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@ -51,7 +51,7 @@ bool RicImportSummaryCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicImportSummaryCaseFeature::onActionTriggered( bool isChecked )
{
RicImportGeneralDataFeature::openFileDialog( RiaDefines::ECLIPSE_SUMMARY_FILE );
RicImportGeneralDataFeature::openFileDialog( RiaDefines::ImportFileType::ECLIPSE_SUMMARY_FILE );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/RicReplaceCaseFeature.cpp
View File

@ -73,7 +73,7 @@ void RicReplaceCaseFeature::onActionTriggered( bool isChecked )
RiaGuiApplication::clearAllSelections();
const QStringList fileNames =
RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefines::ECLIPSE_RESULT_GRID );
RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefines::ImportFileType::ECLIPSE_RESULT_GRID );
if ( fileNames.isEmpty() ) return;
const QString fileName = fileNames[0];

2
ApplicationCode/Commands/RicReplaceSummaryCaseFeature.cpp
View File

@ -65,7 +65,7 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )
if ( !summaryCase ) return;
const QStringList fileNames =
RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefines::ECLIPSE_SUMMARY_FILE );
RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefines::ImportFileType::ECLIPSE_SUMMARY_FILE );
if ( fileNames.isEmpty() ) return;
QString oldSummaryHeaderFilename = summaryCase->summaryHeaderFilename();

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@ -381,7 +381,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
RicImportSummaryCasesFeature::addSummaryCases( summaryCasesToUse );
RiaApplication::instance()->setLastUsedDialogDirectory( RiaDefines::defaultDirectoryLabel(
RiaDefines::ECLIPSE_SUMMARY_FILE ),
RiaDefines::ImportFileType::ECLIPSE_SUMMARY_FILE ),
QFileInfo( summaryFileNames[0] ).absolutePath() );
}