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

Janitor : Use enum class

Browse Source
This commit is contained in:
Magne Sjaastad 2021-05-18 15:31:40 +02:00
parent d4f4f20e6e
commit 78e4e1cd5c
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -32,26 +32,26 @@ namespace caf
template<> template<>
void RicExportCompletionDataSettingsUi::ExportSplitType::setUp() void RicExportCompletionDataSettingsUi::ExportSplitType::setUp()
{ {
addItem(RicExportCompletionDataSettingsUi::UNIFIED_FILE, "UNIFIED_FILE", "Unified File"); addItem(RicExportCompletionDataSettingsUi::ExportSplit::UNIFIED_FILE, "UNIFIED_FILE", "Unified File");
addItem(RicExportCompletionDataSettingsUi::SPLIT_ON_WELL, "SPLIT_ON_WELL", "Split on Well"); addItem(RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL, "SPLIT_ON_WELL", "Split on Well");
addItem(RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE, "SPLIT_ON_WELL_AND_COMPLETION_TYPE", "Split on Well and Completion Type"); addItem(RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL_AND_COMPLETION_TYPE, "SPLIT_ON_WELL_AND_COMPLETION_TYPE", "Split on Well and Completion Type");
setDefault(RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE); setDefault(RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL_AND_COMPLETION_TYPE);
} }
template<> template<>
void RicExportCompletionDataSettingsUi::CompdatExportType::setUp() void RicExportCompletionDataSettingsUi::CompdatExportType::setUp()
{ {
addItem(RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES, "TRANSMISSIBILITIES", "Calculated Transmissibilities"); addItem(RicExportCompletionDataSettingsUi::CompdatExport::TRANSMISSIBILITIES, "TRANSMISSIBILITIES", "Calculated Transmissibilities");
addItem(RicExportCompletionDataSettingsUi::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS, "WPIMULT_AND_DEFAULT_CONNECTION_FACTORS", "Default Connection Factors and WPIMULT (Fractures Not Supported)"); addItem(RicExportCompletionDataSettingsUi::CompdatExport::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS, "WPIMULT_AND_DEFAULT_CONNECTION_FACTORS", "Default Connection Factors and WPIMULT (Fractures Not Supported)");
setDefault(RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES); setDefault(RicExportCompletionDataSettingsUi::CompdatExport::TRANSMISSIBILITIES);
} }
template<> template<>
void RicExportCompletionDataSettingsUi::CombinationModeType::setUp() void RicExportCompletionDataSettingsUi::CombinationModeType::setUp()
{ {
addItem(RicExportCompletionDataSettingsUi::INDIVIDUALLY, "INDIVIDUALLY", "Individually"); addItem(RicExportCompletionDataSettingsUi::CombinationMode::INDIVIDUALLY, "INDIVIDUALLY", "Individually");
addItem(RicExportCompletionDataSettingsUi::COMBINED, "COMBINED", "Combined"); addItem(RicExportCompletionDataSettingsUi::CombinationMode::COMBINED, "COMBINED", "Combined");
setDefault(RicExportCompletionDataSettingsUi::INDIVIDUALLY); setDefault(RicExportCompletionDataSettingsUi::CombinationMode::INDIVIDUALLY);
} }
template<> template<>
@ -199,7 +199,7 @@ void RicExportCompletionDataSettingsUi::showFishbonesInUi( bool enable )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicExportCompletionDataSettingsUi::reportCompletionsTypesIndividually() const bool RicExportCompletionDataSettingsUi::reportCompletionsTypesIndividually() const
{ {
return m_reportCompletionTypesSeparately() == INDIVIDUALLY; return m_reportCompletionTypesSeparately() == CombinationMode::INDIVIDUALLY;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -270,11 +270,11 @@ void RicExportCompletionDataSettingsUi::fieldChangedByUi( const caf::PdmFieldHan
{ {
if ( changedField == &compdatExport ) if ( changedField == &compdatExport )
{ {
if ( compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS ) if ( compdatExport == CompdatExport::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS )
{ {
includeFractures = false; includeFractures = false;
} }
else if ( compdatExport == TRANSMISSIBILITIES || includeMsw ) else if ( compdatExport == CompdatExport::TRANSMISSIBILITIES || includeMsw )
{ {
includeFractures = true; includeFractures = true;
} }
@ -385,7 +385,7 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering( QString uiConfigName,
group->add( &m_reportCompletionTypesSeparately ); group->add( &m_reportCompletionTypesSeparately );
group->add( &folder ); group->add( &folder );
if ( fileSplit() == UNIFIED_FILE ) if ( fileSplit() == ExportSplit::UNIFIED_FILE )
{ {
group->add( &m_useCustomFileName ); group->add( &m_useCustomFileName );
@ -453,8 +453,8 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering( QString uiConfigName,
} }
// Set visibility // Set visibility
includeFractures.uiCapability()->setUiHidden( compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS && includeFractures.uiCapability()->setUiHidden(
!includeMsw ); compdatExport == CompdatExport::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS && !includeMsw );
} }
if ( !m_displayForSimWell ) if ( !m_displayForSimWell )

6
ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h
View File

@ -34,7 +34,7 @@ class RicExportCompletionDataSettingsUi : public RicCaseAndFileExportSettingsUi
public: public:
// Exported in .proto file. Do not change without changing .proto // Exported in .proto file. Do not change without changing .proto
enum ExportSplit enum class ExportSplit
{ {
UNIFIED_FILE, UNIFIED_FILE,
SPLIT_ON_WELL, SPLIT_ON_WELL,
@ -43,7 +43,7 @@ public:
typedef caf::AppEnum<ExportSplit> ExportSplitType; typedef caf::AppEnum<ExportSplit> ExportSplitType;
// Exported in .proto file. Do not change without changing .proto // Exported in .proto file. Do not change without changing .proto
enum CompdatExport enum class CompdatExport
{ {
TRANSMISSIBILITIES, TRANSMISSIBILITIES,
WPIMULT_AND_DEFAULT_CONNECTION_FACTORS, WPIMULT_AND_DEFAULT_CONNECTION_FACTORS,
@ -51,7 +51,7 @@ public:
typedef caf::AppEnum<CompdatExport> CompdatExportType; typedef caf::AppEnum<CompdatExport> CompdatExportType;
// Exported in .proto file. Do not change without changing .proto // Exported in .proto file. Do not change without changing .proto
enum CombinationMode enum class CombinationMode
{ {
INDIVIDUALLY, INDIVIDUALLY,
COMBINED, COMBINED,

18
ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -269,7 +269,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions( const std::v
const QString eclipseCaseName = exportSettings.caseToApply->caseUserDescription(); const QString eclipseCaseName = exportSettings.caseToApply->caseUserDescription();
if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::UNIFIED_FILE ) if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::ExportSplit::UNIFIED_FILE )
{ {
QString fileName = exportSettings.customFileName(); QString fileName = exportSettings.customFileName();
if ( fileName.isEmpty() ) fileName = QString( "UnifiedCompletions_%1" ).arg( eclipseCaseName ); if ( fileName.isEmpty() ) fileName = QString( "UnifiedCompletions_%1" ).arg( eclipseCaseName );
@ -283,7 +283,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions( const std::v
exportSettings.exportDataSourceAsComment(), exportSettings.exportDataSourceAsComment(),
exportSettings.exportWelspec() ); exportSettings.exportWelspec() );
} }
else if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL ) else if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL )
{ {
for ( auto wellPath : topLevelWellPaths ) for ( auto wellPath : topLevelWellPaths )
{ {
@ -318,7 +318,8 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions( const std::v
exportSettings.exportWelspec() ); exportSettings.exportWelspec() );
} }
} }
else if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE ) else if ( exportSettings.fileSplit ==
RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL_AND_COMPLETION_TYPE )
{ {
std::vector<RigCompletionData::CompletionType> completionTypes; std::vector<RigCompletionData::CompletionType> completionTypes;
completionTypes.push_back( RigCompletionData::CompletionType::FISHBONES ); completionTypes.push_back( RigCompletionData::CompletionType::FISHBONES );
@ -380,8 +381,8 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions( const std::v
} }
// Export sim wells // Export sim wells
if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL || if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL ||
exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE ) exportSettings.fileSplit == RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL_AND_COMPLETION_TYPE )
{ {
for ( auto simWell : simWells ) for ( auto simWell : simWells )
{ {
@ -568,7 +569,7 @@ RigCompletionData RicWellPathExportCompletionDataFeatureImpl::combineEclipseCell
combinedDFactor = dFactorCalculator.weightedMean() / completions.size(); combinedDFactor = dFactorCalculator.weightedMean() / completions.size();
} }
if ( settings.compdatExport == RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES ) if ( settings.compdatExport == RicExportCompletionDataSettingsUi::CompdatExport::TRANSMISSIBILITIES )
{ {
resultCompletion.setCombinedValuesExplicitTrans( combinedTrans, resultCompletion.setCombinedValuesExplicitTrans( combinedTrans,
combinedKh, combinedKh,
@ -578,7 +579,8 @@ RigCompletionData RicWellPathExportCompletionDataFeatureImpl::combineEclipseCell
cellDirection, cellDirection,
completionType ); completionType );
} }
else if ( settings.compdatExport == RicExportCompletionDataSettingsUi::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS ) else if ( settings.compdatExport ==
RicExportCompletionDataSettingsUi::CompdatExport::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS )
{ {
// calculate trans for main bore - but as Eclipse will do it! // calculate trans for main bore - but as Eclipse will do it!
double transmissibilityEclipseCalculation = double transmissibilityEclipseCalculation =
@ -954,7 +956,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatAndWpimultTables(
QString gridName = gridCompletions.first; QString gridName = gridCompletions.first;
exportCompdatTableUsingFormatter( formatter, gridName, completions ); exportCompdatTableUsingFormatter( formatter, gridName, completions );
if ( exportType == RicExportCompletionDataSettingsUi::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS ) if ( exportType == RicExportCompletionDataSettingsUi::CompdatExport::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS )
{ {
exportWpimultTableUsingFormatter( formatter, gridName, completions ); exportWpimultTableUsingFormatter( formatter, gridName, completions );
} }

5
ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
View File

@ -68,7 +68,7 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
{ {
std::shared_ptr<QFile> unifiedExportFile; std::shared_ptr<QFile> unifiedExportFile;
std::shared_ptr<QFile> unifiedLgrExportFile; std::shared_ptr<QFile> unifiedLgrExportFile;
if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::UNIFIED_FILE ) if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::ExportSplit::UNIFIED_FILE )
{ {
{ {
QString fileName; QString fileName;
@ -115,7 +115,8 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
completion->componentType() == RiaDefines::WellPathComponentType::FISHBONES; completion->componentType() == RiaDefines::WellPathComponentType::FISHBONES;
} ); } );
if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL && !unifiedWellPathFile ) if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::ExportSplit::SPLIT_ON_WELL &&
!unifiedWellPathFile )
{ {
QString wellFileName = QString( "%1_UnifiedCompletions_MSW_%2" ) QString wellFileName = QString( "%1_UnifiedCompletions_MSW_%2" )
.arg( wellPath->name(), exportSettings.caseToApply->caseUserDescription() ); .arg( wellPath->name(), exportSettings.caseToApply->caseUserDescription() );