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

Merge pull request #4754 from OPM/bugfixes-new-summary-plot-features

Browse Source 
Bugfixes new summary plot features
This commit is contained in:
Jacob Støren
2019-09-23 20:39:56 +02:00
committed by GitHub
parent 0125b13241 264cc4b40b
commit 77062e4c45
11 changed files with 112 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h
View File

@@ -34,7 +34,6 @@
class RifReaderEclipseSummary;
class RimSummaryCase;
class RimSummaryFilter;
class RiuQwtPlotCurve;
class RimAsciiDataCurveAutoName;

125
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -55,6 +55,7 @@
#include "cafPdmUiListEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiLineEditor.h"
#include "cvfScalarMapper.h"
@@ -105,36 +106,25 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
m_showCurves.uiCapability()->setUiHidden( true );
// Y Values
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryGroup, "SummaryGroup", "Ensemble", "", "", "" );
m_yValuesSummaryGroup.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryGroup.uiCapability()->setAutoAddingOptionFromValue( false );
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryCaseCollection, "SummaryGroup", "Ensemble", "", "", "" );
m_yValuesSummaryCaseCollection.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryCaseCollection.uiCapability()->setAutoAddingOptionFromValue( false );
CAF_PDM_InitFieldNoDefault( &m_yValuesSelectedVariableDisplayField, "SelectedVariableDisplayVar", "Vector", "", "", "" );
m_yValuesSelectedVariableDisplayField.xmlCapability()->disableIO();
m_yValuesSelectedVariableDisplayField.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddressUiField, "SelectedVariableDisplayVar", "Vector", "", "", "" );
m_yValuesSummaryAddressUiField.xmlCapability()->disableIO();
m_yValuesSummaryAddressUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter, "VarListFilter", "Filter", "", "", "" );
m_yValuesSummaryFilter.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryFilter.uiCapability()->setUiHidden( true );
m_yValuesSummaryFilter = new RimSummaryFilter;
CAF_PDM_InitFieldNoDefault( &m_yValuesUiFilterResultSelection, "FilterResultSelection", "Filter Result", "", "", "" );
m_yValuesUiFilterResultSelection.xmlCapability()->disableIO();
m_yValuesUiFilterResultSelection.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
m_yValuesUiFilterResultSelection.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
m_yValuesUiFilterResultSelection.uiCapability()->setAutoAddingOptionFromValue( false );
CAF_PDM_InitFieldNoDefault( &m_yValuesCurveVariable, "SummaryAddress", "Summary Address", "", "", "" );
m_yValuesCurveVariable.uiCapability()->setUiHidden( true );
m_yValuesCurveVariable.uiCapability()->setUiTreeChildrenHidden( true );
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddress, "SummaryAddress", "Summary Address", "", "", "" );
m_yValuesSummaryAddress.uiCapability()->setUiHidden( true );
m_yValuesSummaryAddress.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryAddress = new RimSummaryAddress;
CAF_PDM_InitFieldNoDefault( &m_yPushButtonSelectSummaryAddress, "SelectAddress", "", "", "", "" );
caf::PdmUiPushButtonEditor::configureEditorForField( &m_yPushButtonSelectSummaryAddress );
m_yPushButtonSelectSummaryAddress.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_yPushButtonSelectSummaryAddress = false;
m_yValuesCurveVariable = new RimSummaryAddress;
CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum<ColorMode>( SINGLE_COLOR ), "Coloring Mode", "", "", "" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
@@ -178,6 +168,15 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
m_disableStatisticCurves = false;
m_isCurveSetFiltered = false;
// Obsolete fields
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter_OBSOLETE, "VarListFilter", "Filter", "", "", "" );
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable(false);
m_yValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
}
//--------------------------------------------------------------------------------------------------
@@ -221,8 +220,7 @@ void RimEnsembleCurveSet::setColor( cvf::Color3f color )
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::loadDataAndUpdate( bool updateParentPlot )
{
m_yValuesSelectedVariableDisplayField = QString::fromStdString( m_yValuesCurveVariable->address().uiText() );
m_yValuesUiFilterResultSelection = m_yValuesCurveVariable->address();
m_yValuesSummaryAddressUiField = m_yValuesSummaryAddress->address();
updateAllCurves();
@@ -314,7 +312,7 @@ void RimEnsembleCurveSet::deleteCurve( RimSummaryCurve* curve )
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::setSummaryAddress( RifEclipseSummaryAddress address )
{
m_yValuesCurveVariable->setAddress( address );
m_yValuesSummaryAddress->setAddress( address );
}
//--------------------------------------------------------------------------------------------------
@@ -322,7 +320,7 @@ void RimEnsembleCurveSet::setSummaryAddress( RifEclipseSummaryAddress address )
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RimEnsembleCurveSet::summaryAddress() const
{
return m_yValuesCurveVariable->address();
return m_yValuesSummaryAddress->address();
}
//--------------------------------------------------------------------------------------------------
@@ -398,7 +396,7 @@ void RimEnsembleCurveSet::onLegendDefinitionChanged()
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::setSummaryCaseCollection( RimSummaryCaseCollection* sumCaseCollection )
{
m_yValuesSummaryGroup = sumCaseCollection;
m_yValuesSummaryCaseCollection = sumCaseCollection;
}
//--------------------------------------------------------------------------------------------------
@@ -406,7 +404,7 @@ void RimEnsembleCurveSet::setSummaryCaseCollection( RimSummaryCaseCollection* su
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimEnsembleCurveSet::summaryCaseCollection() const
{
return m_yValuesSummaryGroup();
return m_yValuesSummaryCaseCollection();
}
//--------------------------------------------------------------------------------------------------
@@ -448,7 +446,7 @@ EnsembleParameter::Type RimEnsembleCurveSet::currentEnsembleParameterType() cons
{
if ( m_colorMode() == BY_ENSEMBLE_PARAM )
{
RimSummaryCaseCollection* group = m_yValuesSummaryGroup();
RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
QString parameterName = m_ensembleParameter();
if ( group && !parameterName.isEmpty() )
@@ -488,8 +486,8 @@ QString RimEnsembleCurveSet::ensembleParameterUiName( const RimEnsembleCurveSet:
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::updateAllCurves()
{
RimSummaryCaseCollection* group = m_yValuesSummaryGroup();
RimSummaryAddress* addr = m_yValuesCurveVariable();
RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
RimSummaryAddress* addr = m_yValuesSummaryAddress();
if ( group && addr->address().category() != RifEclipseSummaryAddress::SUMMARY_INVALID )
{
@@ -528,15 +526,15 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
updateTextInPlot = true;
}
else if ( changedField == &m_yValuesUiFilterResultSelection )
else if ( changedField == &m_yValuesSummaryAddressUiField )
{
m_yValuesCurveVariable->setAddress( m_yValuesUiFilterResultSelection() );
m_yValuesSummaryAddress->setAddress( m_yValuesSummaryAddressUiField() );
updateAllCurves();
updateTextInPlot = true;
}
else if ( changedField == &m_yValuesSummaryGroup )
else if ( changedField == &m_yValuesSummaryCaseCollection )
{
// Empty address cache
// m_allAddressesCache.clear();
@@ -594,8 +592,8 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
else if ( changedField == &m_yPushButtonSelectSummaryAddress )
{
RiuSummaryCurveDefSelectionDialog dlg( nullptr );
RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryGroup();
RifEclipseSummaryAddress candicateAddress = m_yValuesCurveVariable->address();
RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection();
RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address();
dlg.hideSummaryCases();
dlg.setEnsembleAndAddress( candidateEnsemble, candicateAddress );
@@ -605,8 +603,8 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
auto curveSelection = dlg.curveSelection();
if ( !curveSelection.empty() )
{
m_yValuesSummaryGroup = curveSelection[0].ensemble();
m_yValuesCurveVariable->setAddress( curveSelection[0].summaryAddress() );
m_yValuesSummaryCaseCollection = curveSelection[0].ensemble();
m_yValuesSummaryAddress->setAddress( curveSelection[0].summaryAddress() );
this->loadDataAndUpdate( true );
@@ -637,21 +635,15 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
QString curveDataGroupName = "Summary Vector";
// caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroupWithKeyword(curveDataGroupName, "Summary Vector Y");
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup( "Summary Vector Y" );
curveDataGroup->add( &m_yValuesSummaryGroup );
curveDataGroup->add( &m_yValuesSelectedVariableDisplayField );
curveDataGroup->add( &m_yValuesSummaryCaseCollection );
curveDataGroup->add( &m_yValuesSummaryAddressUiField );
curveDataGroup->add( &m_yPushButtonSelectSummaryAddress, {false, 1, 0});
curveDataGroup->add( &m_plotAxis );
curveDataGroup->add( &m_yPushButtonSelectSummaryAddress );
QString curveVarSelectionGroupName = "Vector Selection Filter Y";
// caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroupWithKeyword("Vector Selection Filter", curveVarSelectionGroupName);
caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroup( curveVarSelectionGroupName );
curveVarSelectionGroup->setCollapsedByDefault( true );
m_yValuesSummaryFilter->uiOrdering( uiConfigName, *curveVarSelectionGroup );
curveVarSelectionGroup->add( &m_yValuesUiFilterResultSelection );
}
}
caf::PdmUiGroup* colorsGroup = uiOrdering.addNewGroup( "Colors" );
m_colorMode.uiCapability()->setUiReadOnly( !m_yValuesSummaryGroup() );
m_colorMode.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
colorsGroup->add( &m_colorMode );
if ( m_colorMode == SINGLE_COLOR )
@@ -660,7 +652,7 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
}
else if ( m_colorMode == BY_ENSEMBLE_PARAM )
{
m_ensembleParameter.uiCapability()->setUiReadOnly( !m_yValuesSummaryGroup() );
m_ensembleParameter.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
colorsGroup->add( &m_ensembleParameter );
}
@@ -758,7 +750,7 @@ void RimEnsembleCurveSet::defineEditorAttribute( const caf::PdmFieldHandle* fiel
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );
if ( attrib )
{
attrib->m_buttonText = "Vector Selection Dialog";
attrib->m_buttonText = "...";
}
}
@@ -770,7 +762,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
{
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_yValuesSummaryGroup )
if ( fieldNeedingOptions == &m_yValuesSummaryCaseCollection )
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimSummaryCaseCollection*> groups = proj->summaryGroups();
@@ -801,9 +793,9 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
options.push_back( caf::PdmOptionItemInfo( ensembleParameterUiName( paramPair ), paramPair.first ) );
}
}
else if ( fieldNeedingOptions == &m_yValuesUiFilterResultSelection )
else if ( fieldNeedingOptions == &m_yValuesSummaryAddressUiField )
{
appendOptionItemsForSummaryAddresses( &options, m_yValuesSummaryGroup(), m_yValuesSummaryFilter() );
appendOptionItemsForSummaryAddresses( &options, m_yValuesSummaryCaseCollection() );
}
return options;
@@ -813,8 +805,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
/// Optimization candidate
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup,
RimSummaryFilter* summaryFilter )
RimSummaryCaseCollection* summaryCaseGroup)
{
if ( !summaryCaseGroup ) return;
@@ -827,7 +818,6 @@ void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOp
for ( auto& addr : addrs )
{
if ( summaryFilter && !summaryFilter->isIncludedByFilter( addr ) ) continue;
addrSet.insert( addr );
}
}
@@ -850,7 +840,7 @@ void RimEnsembleCurveSet::updateCurveColors()
{
if ( m_colorMode == BY_ENSEMBLE_PARAM )
{
RimSummaryCaseCollection* group = m_yValuesSummaryGroup();
RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
QString parameterName = m_ensembleParameter();
@@ -961,7 +951,7 @@ void RimEnsembleCurveSet::updateCurveColors()
firstAncestorOrThisOfType( plot );
if ( plot && plot->qwtPlot() )
{
if ( m_yValuesSummaryGroup() && isCurvesVisible() && m_colorMode == BY_ENSEMBLE_PARAM &&
if ( m_yValuesSummaryCaseCollection() && isCurvesVisible() && m_colorMode == BY_ENSEMBLE_PARAM &&
m_legendConfig->showLegend() )
{
plot->qwtPlot()->addOrUpdateEnsembleCurveSetLegend( this );
@@ -1000,7 +990,7 @@ void RimEnsembleCurveSet::updateEnsembleCurves( const std::vector<RimSummaryCase
if ( m_statistics->hideEnsembleCurves() ) return;
RimSummaryAddress* addr = m_yValuesCurveVariable();
RimSummaryAddress* addr = m_yValuesSummaryAddress();
if ( plot && addr->address().category() != RifEclipseSummaryAddress::SUMMARY_INVALID )
{
if ( isCurvesVisible() )
@@ -1023,7 +1013,6 @@ void RimEnsembleCurveSet::updateEnsembleCurves( const std::vector<RimSummaryCase
curve->qwtPlotCurve()->setItemAttribute( QwtPlotItem::Legend, false );
}
}
m_yValuesSummaryFilter->updateFromAddress( addr->address() );
if ( plot->qwtPlot() ) m_qwtPlotCurveForLegendText->attach( plot->qwtPlot() );
}
@@ -1046,8 +1035,8 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vector<RimSummaryCa
{
using SAddr = RifEclipseSummaryAddress;
RimSummaryCaseCollection* group = m_yValuesSummaryGroup();
RimSummaryAddress* addr = m_yValuesCurveVariable();
RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
RimSummaryAddress* addr = m_yValuesSummaryAddress();
if ( !isCurvesVisible() || m_disableStatisticCurves || !group ||
addr->address().category() == RifEclipseSummaryAddress::SUMMARY_INVALID )
@@ -1073,7 +1062,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vector<RimSummaryCa
std::vector<RifEclipseSummaryAddress> addresses;
if ( m_statistics->isActive() )
{
RifEclipseSummaryAddress dataAddress = m_yValuesCurveVariable->address();
RifEclipseSummaryAddress dataAddress = m_yValuesSummaryAddress->address();
if ( m_statistics->showP10Curve() && m_ensembleStatCase->hasP10Data() )
addresses.push_back(
@@ -1139,7 +1128,7 @@ RimEnsembleCurveSet* RimEnsembleCurveSet::clone() const
{
RimEnsembleCurveSet* copy = dynamic_cast<RimEnsembleCurveSet*>(
this->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
copy->m_yValuesSummaryGroup = m_yValuesSummaryGroup();
copy->m_yValuesSummaryCaseCollection = m_yValuesSummaryCaseCollection();
// Update summary case references
for ( size_t i = 0; i < m_curves.size(); i++ )
@@ -1188,7 +1177,7 @@ void RimEnsembleCurveSet::updateAllTextInPlot()
//--------------------------------------------------------------------------------------------------
std::vector<RimEnsembleCurveSet::NameParameterPair> RimEnsembleCurveSet::ensembleParameters() const
{
RimSummaryCaseCollection* group = m_yValuesSummaryGroup;
RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection;
std::set<QString> paramSet;
if ( group )
@@ -1339,11 +1328,11 @@ QString RimEnsembleCurveSet::createAutoName() const
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfTypeAsserted( plot );
QString curveSetName = m_summaryAddressNameTools->curveNameY( m_yValuesCurveVariable->address(),
QString curveSetName = m_summaryAddressNameTools->curveNameY( m_yValuesSummaryAddress->address(),
plot->activePlotTitleHelperAllCurves() );
if ( curveSetName.isEmpty() )
{
curveSetName = m_summaryAddressNameTools->curveNameY( m_yValuesCurveVariable->address(), nullptr );
curveSetName = m_summaryAddressNameTools->curveNameY( m_yValuesSummaryAddress->address(), nullptr );
}
if ( curveSetName.isEmpty() )

16
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -45,7 +45,7 @@ class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryCurve;
class RimSummaryAddress;
class RimSummaryFilter;
class RimSummaryFilter_OBSOLETE;
class RimSummaryPlotSourceStepping;
class RimSummaryCurveAutoName;
class RimEnsembleCurveFilterCollection;
@@ -145,8 +145,7 @@ private:
const QVariant& newValue ) override;
void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup,
RimSummaryFilter* summaryFilter );
RimSummaryCaseCollection* summaryCaseGroup);
void updateCurveColors();
void updateQwtPlotAxis();
@@ -163,11 +162,9 @@ private:
caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
caf::PdmPtrField<RimSummaryCaseCollection*> m_yValuesSummaryGroup;
caf::PdmChildField<RimSummaryAddress*> m_yValuesCurveVariable;
caf::PdmField<QString> m_yValuesSelectedVariableDisplayField;
caf::PdmChildField<RimSummaryFilter*> m_yValuesSummaryFilter;
caf::PdmField<RifEclipseSummaryAddress> m_yValuesUiFilterResultSelection;
caf::PdmPtrField<RimSummaryCaseCollection*> m_yValuesSummaryCaseCollection;
caf::PdmChildField<RimSummaryAddress*> m_yValuesSummaryAddress;
caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField;
caf::PdmField<bool> m_yPushButtonSelectSummaryAddress;
caf::PdmField<caf::AppEnum<ColorMode>> m_colorMode;
@@ -191,4 +188,7 @@ private:
bool m_disableStatisticCurves;
bool m_isCurveSetFiltered;
// Obsolete fields
caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_yValuesSummaryFilter_OBSOLETE;
};

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.h
View File

@@ -32,7 +32,7 @@
class RifSummaryReaderInterface;
class RimSummaryCase;
class RimSummaryFilter;
class RimSummaryFilter_OBSOLETE;
class RiuQwtPlotCurve;
class RimSummaryCurveAutoName;

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -130,13 +130,13 @@ RimSummaryCurve::RimSummaryCurve()
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false );
m_yValuesSummaryFilter_OBSOLETE = new RimSummaryFilter;
m_yValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryFilter_OBSOLETE, "VarListFilterX", "Filter", "", "", "" );
m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_xValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false );
m_xValuesSummaryFilter_OBSOLETE = new RimSummaryFilter;
m_xValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
}
//--------------------------------------------------------------------------------------------------
@@ -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* 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 );

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -32,7 +32,7 @@
class RifSummaryReaderInterface;
class RimSummaryCase;
class RimSummaryFilter;
class RimSummaryFilter_OBSOLETE;
class RiuQwtPlotCurve;
class RimSummaryCurveAutoName;
class RimSummaryAddress;
@@ -113,8 +113,7 @@ private:
caf::PdmUiEditorAttribute* attribute ) override;
static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase,
RimSummaryFilter* summaryFilter );
RimSummaryCase* summaryCase );
private:
// Y values
@@ -134,6 +133,6 @@ private:
caf::PdmField<bool> m_isTopZWithinCategory;
// Obsolete fields
caf::PdmChildField<RimSummaryFilter*> m_yValuesSummaryFilter_OBSOLETE;
caf::PdmChildField<RimSummaryFilter*> m_xValuesSummaryFilter_OBSOLETE;
caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_yValuesSummaryFilter_OBSOLETE;
caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_xValuesSummaryFilter_OBSOLETE;
};

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@@ -59,7 +59,7 @@ RimSummaryCurveFilter_OBSOLETE::RimSummaryCurveFilter_OBSOLETE()
m_summaryFilter.uiCapability()->setUiTreeChildrenHidden( true );
m_summaryFilter.uiCapability()->setUiHidden( true );
m_summaryFilter = new RimSummaryFilter;
m_summaryFilter = new RimSummaryFilter_OBSOLETE;
CAF_PDM_InitFieldNoDefault( &m_uiFilterResultMultiSelection,
"FilterResultSelection",

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
View File

@@ -32,7 +32,7 @@
#include "RiaDefines.h"
#include "RimSummaryCurveAppearanceCalculator.h"
class RimSummaryFilter;
class RimSummaryFilter_OBSOLETE;
class RimSummaryCurveAutoName;
//==================================================================================================
@@ -62,7 +62,7 @@ private:
caf::PdmField<bool> m_showLegend;
// Filter fields
caf::PdmChildField<RimSummaryFilter*> m_summaryFilter;
caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_summaryFilter;
caf::PdmField<std::vector<RifEclipseSummaryAddress>> m_uiFilterResultMultiSelection;
caf::PdmChildField<RimSummaryCurveAutoName*> m_curveNameConfig;

52
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.cpp
View File

@@ -24,35 +24,35 @@
namespace caf
{
template <>
void caf::AppEnum<RimSummaryFilter::SummaryFilterType>::setUp()
void caf::AppEnum<RimSummaryFilter_OBSOLETE::SummaryFilterType>::setUp()
{
addItem( RimSummaryFilter::SUM_FILTER_VAR_STRING, "SUM_FILTER_VAR_STRING", "All" );
addItem( RimSummaryFilter::SUM_FILTER_FIELD, "SUM_FILTER_FIELD", "Field" );
addItem( RimSummaryFilter::SUM_FILTER_WELL, "SUM_FILTER_WELL", "Well" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_GROUP, "SUM_FILTER_WELL_GROUP", "Group" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_COMPLETION, "SUM_FILTER_WELL_COMPLETION", "Completion" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_SEGMENT, "SUM_FILTER_SEGMENT", "Segment" );
addItem( RimSummaryFilter::SUM_FILTER_BLOCK, "SUM_FILTER_BLOCK", "Block" );
addItem( RimSummaryFilter::SUM_FILTER_REGION, "SUM_FILTER_REGION", "Region" );
addItem( RimSummaryFilter::SUM_FILTER_REGION_2_REGION, "SUM_FILTER_REGION_2_REGION", "Region-Region" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_LGR, "SUM_FILTER_WELL_LGR", "Lgr-Well" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_COMPLETION_LGR, "SUM_FILTER_WELL_COMPLETION_LGR", "Lgr-Completion" );
addItem( RimSummaryFilter::SUM_FILTER_BLOCK_LGR, "SUM_FILTER_BLOCK_LGR", "Lgr-Block" );
addItem( RimSummaryFilter::SUM_FILTER_MISC, "SUM_FILTER_MISC", "Misc" );
addItem( RimSummaryFilter::SUM_FILTER_AQUIFER, "SUM_FILTER_AQUIFER", "Aquifer" );
addItem( RimSummaryFilter::SUM_FILTER_NETWORK, "SUM_FILTER_NETWORK", "Network" );
addItem( RimSummaryFilter::SUM_FILTER_ANY, "SUM_FILTER_ANY", "All (Advanced)" );
setDefault( RimSummaryFilter::SUM_FILTER_VAR_STRING );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_VAR_STRING, "SUM_FILTER_VAR_STRING", "All" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_FIELD, "SUM_FILTER_FIELD", "Field" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL, "SUM_FILTER_WELL", "Well" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_GROUP, "SUM_FILTER_WELL_GROUP", "Group" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_COMPLETION, "SUM_FILTER_WELL_COMPLETION", "Completion" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_SEGMENT, "SUM_FILTER_SEGMENT", "Segment" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_BLOCK, "SUM_FILTER_BLOCK", "Block" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_REGION, "SUM_FILTER_REGION", "Region" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_REGION_2_REGION, "SUM_FILTER_REGION_2_REGION", "Region-Region" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_LGR, "SUM_FILTER_WELL_LGR", "Lgr-Well" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_COMPLETION_LGR, "SUM_FILTER_WELL_COMPLETION_LGR", "Lgr-Completion" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_BLOCK_LGR, "SUM_FILTER_BLOCK_LGR", "Lgr-Block" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_MISC, "SUM_FILTER_MISC", "Misc" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_AQUIFER, "SUM_FILTER_AQUIFER", "Aquifer" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_NETWORK, "SUM_FILTER_NETWORK", "Network" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_ANY, "SUM_FILTER_ANY", "All (Advanced)" );
setDefault( RimSummaryFilter_OBSOLETE::SUM_FILTER_VAR_STRING );
}
} // namespace caf
CAF_PDM_SOURCE_INIT( RimSummaryFilter, "SummaryFilterSettings" );
CAF_PDM_SOURCE_INIT( RimSummaryFilter_OBSOLETE, "SummaryFilterSettings" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryFilter::RimSummaryFilter()
RimSummaryFilter_OBSOLETE::RimSummaryFilter_OBSOLETE()
{
CAF_PDM_InitObject( "Summary Filter", "", "", "" );
@@ -71,7 +71,7 @@ RimSummaryFilter::RimSummaryFilter()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryFilter::~RimSummaryFilter() {}
RimSummaryFilter_OBSOLETE::~RimSummaryFilter_OBSOLETE() {}
//--------------------------------------------------------------------------------------------------
///
@@ -90,7 +90,7 @@ QString cellIJKString( int cellI, int cellJ, int cellK )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryFilter::updateFromAddress( const RifEclipseSummaryAddress& address )
void RimSummaryFilter_OBSOLETE::updateFromAddress( const RifEclipseSummaryAddress& address )
{
RifEclipseSummaryAddress::SummaryVarCategory category = address.category();
@@ -235,7 +235,7 @@ bool isIJKMatch( QString filterString, int cellI, int cellJ, int cellK )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryFilter::isIncludedByFilter( const RifEclipseSummaryAddress& addr ) const
bool RimSummaryFilter_OBSOLETE::isIncludedByFilter( const RifEclipseSummaryAddress& addr ) const
{
if ( !isSumVarTypeMatchingFilterType( m_filterType(), addr.category() ) ) return false;
@@ -325,7 +325,7 @@ bool RimSummaryFilter::isIncludedByFilter( const RifEclipseSummaryAddress& addr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryFilter::isSumVarTypeMatchingFilterType( SummaryFilterType sumFilterType,
bool RimSummaryFilter_OBSOLETE::isSumVarTypeMatchingFilterType( SummaryFilterType sumFilterType,
RifEclipseSummaryAddress::SummaryVarCategory sumVarType )
{
if ( sumVarType == RifEclipseSummaryAddress::SUMMARY_INVALID ) return false;
@@ -411,7 +411,7 @@ bool RimSummaryFilter::isSumVarTypeMatchingFilterType( SummaryFilterType
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
void RimSummaryFilter_OBSOLETE::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_filterType );
@@ -504,7 +504,7 @@ void RimSummaryFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryFilter::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
void RimSummaryFilter_OBSOLETE::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.h
View File

@@ -23,7 +23,7 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
class RimSummaryFilter : public caf::PdmObject
class RimSummaryFilter_OBSOLETE : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
@@ -48,8 +48,8 @@ public:
SUM_FILTER_BLOCK_LGR,
};
RimSummaryFilter();
~RimSummaryFilter() override;
RimSummaryFilter_OBSOLETE();
~RimSummaryFilter_OBSOLETE() override;
void updateFromAddress( const RifEclipseSummaryAddress& address );

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -1617,9 +1617,11 @@ void RimSummaryPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
mainOptions->add( &m_normalizeCurveYValues );
mainOptions->add( &m_plotTemplate );
caf::PdmUiGroup* textCurveFilterGroup = uiOrdering.addNewGroup("Text-Based Curve Creation");
m_textCurveSetEditor->uiOrdering(uiConfigName, *textCurveFilterGroup);
if ( !m_isCrossPlot )
{
caf::PdmUiGroup* textCurveFilterGroup = uiOrdering.addNewGroup( "Text-Based Curve Creation" );
m_textCurveSetEditor->uiOrdering( uiConfigName, *textCurveFilterGroup );
}
uiOrdering.skipRemainingFields( true );
}