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-23 23:08:14 +02:00
parent 4b372b438e
commit 8aa36ee31e
10 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/RiaApplication.cpp
View File

@ -567,7 +567,7 @@ bool RiaApplication::loadProject( const QString& projectFileName,
// If load action is specified to recalculate statistics, do it now.
// Apparently this needs to be done before the views are loaded, lest the number of time steps for statistics will
// be clamped
if ( loadAction & PLA_CALCULATE_STATISTICS )
if ( loadAction & int( ProjectLoadAction::PLA_CALCULATE_STATISTICS ) )
{
for ( size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++ )
{
@ -696,7 +696,7 @@ bool RiaApplication::loadProject( const QString& projectFileName,
//--------------------------------------------------------------------------------------------------
bool RiaApplication::loadProject( const QString& projectFileName )
{
return loadProject( projectFileName, PLA_NONE, nullptr );
return loadProject( projectFileName, ProjectLoadAction::PLA_NONE, nullptr );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Application/RiaApplication.h
View File

@ -87,13 +87,13 @@ class ProgramOptions;
class RiaApplication
{
public:
enum ProjectLoadAction
enum class ProjectLoadAction
{
PLA_NONE = 0,
PLA_CALCULATE_STATISTICS = 1
};
enum ApplicationStatus
enum class ApplicationStatus
{
KEEP_GOING = 0,
EXIT_COMPLETED,

24
ApplicationCode/Application/RiaConsoleApplication.cpp
View File

@ -120,14 +120,14 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
// --------------------------------------------------------
if ( cvf::Option o = progOpt->option( "ignoreArgs" ) )
{
return KEEP_GOING;
return ApplicationStatus::KEEP_GOING;
}
if ( progOpt->option( "help" ) || progOpt->option( "?" ) )
{
this->showFormattedTextInMessageBoxOrConsole( "\nThe current command line options in ResInsight are:\n" +
this->commandLineParameterHelp() );
return RiaApplication::EXIT_COMPLETED;
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
// Code generation
@ -141,10 +141,10 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
if ( !RiaApplication::generateCode( outputFile, &errMsg ) )
{
RiaLogging::error( QString( "Error: %1" ).arg( errMsg ) );
return RiaApplication::EXIT_WITH_ERROR;
return RiaApplication::ApplicationStatus::EXIT_WITH_ERROR;
}
return RiaApplication::EXIT_COMPLETED;
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
// Unit testing
@ -154,12 +154,12 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
int testReturnValue = launchUnitTestsWithConsole();
if ( testReturnValue == 0 )
{
return RiaApplication::EXIT_COMPLETED;
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
else
{
RiaLogging::error( "Error running unit tests" );
return RiaApplication::EXIT_WITH_ERROR;
return RiaApplication::ApplicationStatus::EXIT_WITH_ERROR;
}
}
@ -185,7 +185,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
if ( !projectFileName.isEmpty() )
{
cvf::ref<RiaProjectModifier> projectModifier;
RiaApplication::ProjectLoadAction projectLoadAction = RiaApplication::PLA_NONE;
RiaApplication::ProjectLoadAction projectLoadAction = RiaApplication::ProjectLoadAction::PLA_NONE;
if ( cvf::Option o = progOpt->option( "replaceCase" ) )
{
@ -242,7 +242,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
}
}
projectLoadAction = RiaApplication::PLA_CALCULATE_STATISTICS;
projectLoadAction = RiaApplication::ProjectLoadAction::PLA_CALCULATE_STATISTICS;
}
if ( cvf::Option o = progOpt->option( "replacePropertiesFolder" ) )
@ -328,7 +328,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
{
RiaProjectModifier projectModifier;
projectModifier.setReplaceCaseFirstOccurrence( caseFile );
loadProject( projectFileName, RiaApplication::PLA_NONE, &projectModifier );
loadProject( projectFileName, RiaApplication::ProjectLoadAction::PLA_NONE, &projectModifier );
executeCommandFile( commandFile );
}
}
@ -357,7 +357,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
}
}
loadProject( projectFileName, RiaApplication::PLA_NONE, &projectModifier );
loadProject( projectFileName, RiaApplication::ProjectLoadAction::PLA_NONE, &projectModifier );
executeCommandFile( commandFile );
}
}
@ -366,10 +366,10 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::P
{
executeCommandFile( commandFile );
}
return EXIT_COMPLETED;
return ApplicationStatus::EXIT_COMPLETED;
}
return KEEP_GOING;
return ApplicationStatus::KEEP_GOING;
}
//--------------------------------------------------------------------------------------------------

44
ApplicationCode/Application/RiaGuiApplication.cpp
View File

@ -144,11 +144,11 @@ namespace caf
template <>
void AppEnum<RiaGuiApplication::RINavigationPolicy>::setUp()
{
addItem( RiaGuiApplication::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron" );
addItem( RiaGuiApplication::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD" );
addItem( RiaGuiApplication::NAVIGATION_POLICY_GEOQUEST, "NAVIGATION_POLICY_GEOQUEST", "GEOQUEST" );
addItem( RiaGuiApplication::NAVIGATION_POLICY_RMS, "NAVIGATION_POLICY_RMS", "RMS" );
setDefault( RiaGuiApplication::NAVIGATION_POLICY_RMS );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron" );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD" );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_GEOQUEST, "NAVIGATION_POLICY_GEOQUEST", "GEOQUEST" );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS, "NAVIGATION_POLICY_RMS", "RMS" );
setDefault( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS );
}
} // namespace caf
@ -445,14 +445,14 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
// --------------------------------------------------------
if ( cvf::Option o = progOpt->option( "ignoreArgs" ) )
{
return KEEP_GOING;
return ApplicationStatus::KEEP_GOING;
}
if ( progOpt->option( "help" ) || progOpt->option( "?" ) )
{
this->showFormattedTextInMessageBoxOrConsole( "The current command line options in ResInsight are:\n" +
this->commandLineParameterHelp() );
return RiaApplication::EXIT_COMPLETED;
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
// Code generation
@ -466,10 +466,10 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
if ( !RiaApplication::generateCode( outputFile, &errMsg ) )
{
RiaLogging::error( QString( "Error: %1" ).arg( errMsg ) );
return RiaApplication::EXIT_WITH_ERROR;
return RiaApplication::ApplicationStatus::EXIT_WITH_ERROR;
}
return RiaApplication::EXIT_COMPLETED;
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
// Unit testing
@ -479,12 +479,12 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
int testReturnValue = launchUnitTestsWithConsole();
if ( testReturnValue == 0 )
{
return RiaApplication::EXIT_COMPLETED;
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
else
{
RiaLogging::error( "Error running unit tests" );
return RiaApplication::EXIT_WITH_ERROR;
return RiaApplication::ApplicationStatus::EXIT_WITH_ERROR;
}
}
@ -502,7 +502,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
RiaLogging::setLoggerInstance( stdLogger );
RiaRegressionTestRunner::instance()->executeRegressionTests( regressionTestPath, QStringList() );
return EXIT_COMPLETED;
return ApplicationStatus::EXIT_COMPLETED;
}
if ( cvf::Option o = progOpt->option( "updateregressiontestbase" ) )
@ -510,7 +510,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
CVF_ASSERT( o.valueCount() == 1 );
QString regressionTestPath = cvfqt::Utils::toQString( o.value( 0 ) );
RiaRegressionTestRunner::instance()->updateRegressionTest( regressionTestPath );
return EXIT_COMPLETED;
return ApplicationStatus::EXIT_COMPLETED;
}
if ( cvf::Option o = progOpt->option( "startdir" ) )
@ -587,14 +587,14 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
std::vector<QString> gridFiles = readFileListFromTextFile( gridListFile );
runMultiCaseSnapshots( projectFileName, gridFiles, "multiCaseSnapshots" );
return EXIT_COMPLETED;
return ApplicationStatus::EXIT_COMPLETED;
}
}
if ( !projectFileName.isEmpty() )
{
cvf::ref<RiaProjectModifier> projectModifier;
RiaApplication::ProjectLoadAction projectLoadAction = RiaApplication::PLA_NONE;
RiaApplication::ProjectLoadAction projectLoadAction = RiaApplication::ProjectLoadAction::PLA_NONE;
if ( cvf::Option o = progOpt->option( "replaceCase" ) )
{
@ -651,7 +651,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
}
}
projectLoadAction = RiaApplication::PLA_CALCULATE_STATISTICS;
projectLoadAction = RiaApplication::ProjectLoadAction::PLA_CALCULATE_STATISTICS;
}
if ( cvf::Option o = progOpt->option( "replacePropertiesFolder" ) )
@ -780,7 +780,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
closeProject();
return EXIT_COMPLETED;
return ApplicationStatus::EXIT_COMPLETED;
}
if ( cvf::Option o = progOpt->option( "commandFile" ) )
@ -831,7 +831,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
{
RiaProjectModifier projectModifier;
projectModifier.setReplaceCaseFirstOccurrence( caseFile );
loadProject( projectFileName, RiaApplication::PLA_NONE, &projectModifier );
loadProject( projectFileName, RiaApplication::ProjectLoadAction::PLA_NONE, &projectModifier );
executeCommandFile( commandFile );
}
}
@ -860,7 +860,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
}
}
loadProject( projectFileName, RiaApplication::PLA_NONE, &projectModifier );
loadProject( projectFileName, RiaApplication::ProjectLoadAction::PLA_NONE, &projectModifier );
executeCommandFile( commandFile );
}
}
@ -869,10 +869,10 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
{
executeCommandFile( commandFile );
}
return EXIT_COMPLETED;
return ApplicationStatus::EXIT_COMPLETED;
}
return KEEP_GOING;
return ApplicationStatus::KEEP_GOING;
}
//--------------------------------------------------------------------------------------------------
@ -1762,7 +1762,7 @@ void RiaGuiApplication::runMultiCaseSnapshots( const QString& templateProj
RiaProjectModifier modifier;
modifier.setReplaceCaseFirstOccurrence( gridFn );
bool loadOk = loadProject( templateProjectFileName, PLA_NONE, &modifier );
bool loadOk = loadProject( templateProjectFileName, ProjectLoadAction::PLA_NONE, &modifier );
if ( loadOk )
{
RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( snapshotFolderName );

2
ApplicationCode/Application/RiaGuiApplication.h
View File

@ -76,7 +76,7 @@ class RiaGuiApplication : public QApplication, public RiaApplication
Q_OBJECT
public:
enum RINavigationPolicy
enum class RINavigationPolicy
{
NAVIGATION_POLICY_CEETRON,
NAVIGATION_POLICY_CAD,

6
ApplicationCode/Application/RiaMain.cpp
View File

@ -94,15 +94,15 @@ int main( int argc, char* argv[] )
RiaApplication::ApplicationStatus status = app->handleArguments( &progOpt );
if ( status == RiaApplication::EXIT_COMPLETED )
if ( status == RiaApplication::ApplicationStatus::EXIT_COMPLETED )
{
return 0;
}
else if ( status == RiaApplication::EXIT_WITH_ERROR )
else if ( status == RiaApplication::ApplicationStatus::EXIT_WITH_ERROR )
{
return 2;
}
else if ( status == RiaApplication::KEEP_GOING )
else if ( status == RiaApplication::ApplicationStatus::KEEP_GOING )
{
int exitCode = 0;
try

3
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -92,7 +92,8 @@ RiaPreferences::RiaPreferences( void )
{
CAF_PDM_InitField( &m_navigationPolicy,
"navigationPolicy",
caf::AppEnum<RiaGuiApplication::RINavigationPolicy>( RiaGuiApplication::NAVIGATION_POLICY_RMS ),
caf::AppEnum<RiaGuiApplication::RINavigationPolicy>(
RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS ),
"Navigation Mode",
"",
"",

8
ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp
View File

@ -91,7 +91,9 @@ caf::PdmScriptResponse RicfSingleCaseReplace::execute()
projectModifier->setReplaceCase( m_caseId(), filePath );
}
if ( !RiaApplication::instance()->loadProject( lastProjectPath, RiaApplication::PLA_NONE, projectModifier.p() ) )
if ( !RiaApplication::instance()->loadProject( lastProjectPath,
RiaApplication::ProjectLoadAction::PLA_NONE,
projectModifier.p() ) )
{
QString errMsg( "Could not reload project" );
RiaLogging::error( errMsg );
@ -161,7 +163,9 @@ caf::PdmScriptResponse RicfMultiCaseReplace::execute()
}
}
if ( !RiaApplication::instance()->loadProject( lastProjectPath, RiaApplication::PLA_NONE, projectModifier.p() ) )
if ( !RiaApplication::instance()->loadProject( lastProjectPath,
RiaApplication::ProjectLoadAction::PLA_NONE,
projectModifier.p() ) )
{
QString errMsg( "Could not reload project" );
RiaLogging::error( errMsg );

2
ApplicationCode/CommandFileInterface/RicfReplaceSourceCases.cpp
View File

@ -71,7 +71,7 @@ caf::PdmScriptResponse RicfReplaceSourceCases::execute()
}
if ( !RiaApplication::instance()->loadProject( lastProjectPath,
RiaApplication::PLA_CALCULATE_STATISTICS,
RiaApplication::ProjectLoadAction::PLA_CALCULATE_STATISTICS,
projectModifier.p() ) )
{
QString error( "Could not reload project" );

8
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -930,19 +930,19 @@ void RiuViewer::updateNavigationPolicy()
{
switch ( RiaGuiApplication::instance()->navigationPolicy() )
{
case RiaGuiApplication::NAVIGATION_POLICY_CAD:
case RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_CAD:
setNavigationPolicy( new RiuCadNavigation );
break;
case RiaGuiApplication::NAVIGATION_POLICY_CEETRON:
case RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_CEETRON:
setNavigationPolicy( new caf::CeetronPlusNavigation );
break;
case RiaGuiApplication::NAVIGATION_POLICY_GEOQUEST:
case RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_GEOQUEST:
setNavigationPolicy( new RiuGeoQuestNavigation );
break;
case RiaGuiApplication::NAVIGATION_POLICY_RMS:
case RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS:
setNavigationPolicy( new RiuRmsNavigation );
break;