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

Add multiple selected cell edge results

Browse Source
This commit is contained in:
Magne Sjaastad
2022-08-25 12:51:56 +02:00
committed by GitHub
parent f82c530966
commit c31bc3e50e
9 changed files with 230 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp
View File

@@ -190,33 +190,40 @@ bool RicCreateEnsembleWellLogUi::autoCreateEnsembleWellLogs() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::pair<QString, RiaDefines::ResultCatType>> RicCreateEnsembleWellLogUi::properties() const
std::vector<std::pair<QString, RiaDefines::ResultCatType>>
RicCreateEnsembleWellLogUi::properties( const std::vector<QString>& resultNames,
const std::vector<RiaDefines::ResultCatType>& resultCategories,
const RigEclipseCaseData* caseData )
{
std::vector<QString> selectedKeyWords = m_selectedKeywords();
auto findResultCategory = []( const QString& keyword,
const std::vector<RiaDefines::ResultCatType>& categories,
RigEclipseCaseData* caseData ) {
const RigEclipseCaseData* caseData ) {
// Find the result category for a given keyword
RigCaseCellResultsData* resultData = caseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
auto resultData = caseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
for ( auto category : categories )
if ( resultData->hasResultEntry( RigEclipseResultAddress( category, keyword ) ) ) return category;
return RiaDefines::ResultCatType::UNDEFINED;
};
std::vector<RiaDefines::ResultCatType> resultCategories = validResultCategories();
std::vector<std::pair<QString, RiaDefines::ResultCatType>> props;
for ( auto keyword : selectedKeyWords )
for ( auto keyword : resultNames )
{
auto resultCategory = findResultCategory( keyword, resultCategories, m_caseData );
auto resultCategory = findResultCategory( keyword, resultCategories, caseData );
props.push_back( std::make_pair( keyword, resultCategory ) );
}
return props;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::pair<QString, RiaDefines::ResultCatType>> RicCreateEnsembleWellLogUi::properties() const
{
return properties( m_selectedKeywords.value(), validResultCategories(), m_caseData );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.h
View File

@@ -61,6 +61,11 @@ public:
std::vector<std::pair<QString, RiaDefines::ResultCatType>> properties() const;
static std::vector<std::pair<QString, RiaDefines::ResultCatType>>
properties( const std::vector<QString>& resultNames,
const std::vector<RiaDefines::ResultCatType>& resultCategories,
const RigEclipseCaseData* caseData );
void setCaseData( RigEclipseCaseData* caseData );
protected: