OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 18:32:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

#4749 Rename fields and some cleanup

Browse Source
This commit is contained in:
Jacob Støren committed 2019-09-23 14:04:23 +02:00
1 parent 9f8393a5c3
commit 264cc4b40b
4 files changed
+51 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
+3 -5
View File
@@ -394,11 +394,11 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions( const caf:
}
else if ( &m_yValuesSummaryAddressUiField == fieldNeedingOptions )
{
appendOptionItemsForSummaryAddresses( &options, m_yValuesSummaryCase(), nullptr );
appendOptionItemsForSummaryAddresses( &options, m_yValuesSummaryCase());
}
else if ( &m_xValuesSummaryAddressUiField == fieldNeedingOptions )
{
appendOptionItemsForSummaryAddresses( &options, m_xValuesSummaryCase(), nullptr );
appendOptionItemsForSummaryAddresses( &options, m_xValuesSummaryCase() );
}
return options;
}
@@ -685,8 +685,7 @@ void RimSummaryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase,
RimSummaryFilter_OBSOLETE* summaryFilter )
RimSummaryCase* summaryCase )
{
if ( summaryCase )
{
@@ -698,7 +697,6 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList<caf::PdmOption
for ( auto& address : allAddresses )
{
if ( address.isErrorResult() ) continue;
if ( summaryFilter && !summaryFilter->isIncludedByFilter( address ) ) continue;
std::string name = address.uiText();
QString s = QString::fromStdString( name );