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:25:22 +02:00
parent 8aa36ee31e
commit 3f88fe197a
56 changed files with 696 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
View File

@@ -165,8 +165,9 @@ void RicExportEclipseSectorModelUi::setCaseData( RigEclipseCaseData* caseData /*
{
for ( QString keyword : mainKeywords() )
{
if ( caseData && caseData->results( RiaDefines::MATRIX_MODEL )
->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, keyword ) ) )
if ( caseData &&
caseData->results( RiaDefines::MATRIX_MODEL )
->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, keyword ) ) )
{
selectedKeywords.v().push_back( keyword );
}
@@ -177,8 +178,9 @@ void RicExportEclipseSectorModelUi::setCaseData( RigEclipseCaseData* caseData /*
std::vector<QString> validSelectedKeywords;
for ( QString keyword : selectedKeywords() )
{
if ( caseData && caseData->results( RiaDefines::MATRIX_MODEL )
->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, keyword ) ) )
if ( caseData &&
caseData->results( RiaDefines::MATRIX_MODEL )
->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, keyword ) ) )
{
validSelectedKeywords.push_back( keyword );
}
@@ -439,7 +441,8 @@ QList<caf::PdmOptionItemInfo>
{
RigCaseCellResultsData* resultData = m_caseData->results( RiaDefines::MATRIX_MODEL );
QList<caf::PdmOptionItemInfo> allOptions =
RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard( RiaDefines::STATIC_NATIVE, resultData );
RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard( RiaDefines::ResultCatType::STATIC_NATIVE,
resultData );
std::set<QString> mainKeywords = this->mainKeywords();
for ( caf::PdmOptionItemInfo option : allOptions )
@@ -447,7 +450,7 @@ QList<caf::PdmOptionItemInfo>
if ( mainKeywords.count( option.optionUiText() ) )
{
if ( resultData->hasResultEntry(
RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, option.optionUiText() ) ) )
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, option.optionUiText() ) ) )
{
options.push_back( option );
}
@@ -458,7 +461,7 @@ QList<caf::PdmOptionItemInfo>
if ( !mainKeywords.count( option.optionUiText() ) && option.optionUiText() != "None" )
{
if ( resultData->hasResultEntry(
RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, option.optionUiText() ) ) )
RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, option.optionUiText() ) ) )
{
if ( option.optionUiText() == "ACTNUM" && exportGrid() )
{
@@ -606,7 +609,7 @@ void RicExportEclipseSectorModelUi::removeInvalidKeywords()
std::vector<QString> validKeywords;
for ( QString keyword : selectedKeywords() )
{
if ( resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, keyword ) ) )
if ( resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, keyword ) ) )
{
validKeywords.push_back( keyword );
}