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

#4749 Marking SummaryFilter classes and fields as OBSOLETE

Browse Source
This commit is contained in:
Jacob Støren 2019-09-23 13:56:40 +02:00
parent 515d06c395
commit 9f8393a5c3
10 changed files with 49 additions and 50 deletions
Show Stats 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 RifReaderEclipseSummary;
class RimSummaryCase; class RimSummaryCase;
class RimSummaryFilter;
class RiuQwtPlotCurve; class RiuQwtPlotCurve;
class RimAsciiDataCurveAutoName; class RimAsciiDataCurveAutoName;

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

@ -171,11 +171,11 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
// Obsolete fields // Obsolete fields
CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter, "VarListFilter", "Filter", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter_OBSOLETE, "VarListFilter", "Filter", "", "", "" );
m_yValuesSummaryFilter.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryFilter.uiCapability()->setUiHidden( true ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_yValuesSummaryFilter.xmlCapability()->setIOWritable(false); m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable(false);
m_yValuesSummaryFilter = new RimSummaryFilter; m_yValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
} }
@ -806,7 +806,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup, RimSummaryCaseCollection* summaryCaseGroup,
RimSummaryFilter* summaryFilter ) RimSummaryFilter_OBSOLETE* summaryFilter )
{ {
if ( !summaryCaseGroup ) return; if ( !summaryCaseGroup ) return;

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

@ -45,7 +45,7 @@ class RimSummaryCase;
class RimSummaryCaseCollection; class RimSummaryCaseCollection;
class RimSummaryCurve; class RimSummaryCurve;
class RimSummaryAddress; class RimSummaryAddress;
class RimSummaryFilter; class RimSummaryFilter_OBSOLETE;
class RimSummaryPlotSourceStepping; class RimSummaryPlotSourceStepping;
class RimSummaryCurveAutoName; class RimSummaryCurveAutoName;
class RimEnsembleCurveFilterCollection; class RimEnsembleCurveFilterCollection;
@ -146,7 +146,7 @@ private:
void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup, RimSummaryCaseCollection* summaryCaseGroup,
RimSummaryFilter* summaryFilter ); RimSummaryFilter_OBSOLETE* summaryFilter );
void updateCurveColors(); void updateCurveColors();
void updateQwtPlotAxis(); void updateQwtPlotAxis();
@ -191,5 +191,5 @@ private:
bool m_isCurveSetFiltered; bool m_isCurveSetFiltered;
// Obsolete fields // Obsolete fields
caf::PdmChildField<RimSummaryFilter*> m_yValuesSummaryFilter; caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_yValuesSummaryFilter_OBSOLETE;
}; };

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

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

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

@ -130,13 +130,13 @@ RimSummaryCurve::RimSummaryCurve()
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false ); 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", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryFilter_OBSOLETE, "VarListFilterX", "Filter", "", "", "" );
m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true ); m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true );
m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true ); m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiHidden( true );
m_xValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false ); m_xValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false );
m_xValuesSummaryFilter_OBSOLETE = new RimSummaryFilter; m_xValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -686,7 +686,7 @@ void RimSummaryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase, RimSummaryCase* summaryCase,
RimSummaryFilter* summaryFilter ) RimSummaryFilter_OBSOLETE* summaryFilter )
{ {
if ( summaryCase ) if ( summaryCase )
{ {

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

@ -32,7 +32,7 @@
class RifSummaryReaderInterface; class RifSummaryReaderInterface;
class RimSummaryCase; class RimSummaryCase;
class RimSummaryFilter; class RimSummaryFilter_OBSOLETE;
class RiuQwtPlotCurve; class RiuQwtPlotCurve;
class RimSummaryCurveAutoName; class RimSummaryCurveAutoName;
class RimSummaryAddress; class RimSummaryAddress;
@ -114,7 +114,7 @@ private:
static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase, RimSummaryCase* summaryCase,
RimSummaryFilter* summaryFilter ); RimSummaryFilter_OBSOLETE* summaryFilter );
private: private:
// Y values // Y values
@ -134,6 +134,6 @@ private:
caf::PdmField<bool> m_isTopZWithinCategory; caf::PdmField<bool> m_isTopZWithinCategory;
// Obsolete fields // Obsolete fields
caf::PdmChildField<RimSummaryFilter*> m_yValuesSummaryFilter_OBSOLETE; caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_yValuesSummaryFilter_OBSOLETE;
caf::PdmChildField<RimSummaryFilter*> m_xValuesSummaryFilter_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()->setUiTreeChildrenHidden( true );
m_summaryFilter.uiCapability()->setUiHidden( true ); m_summaryFilter.uiCapability()->setUiHidden( true );
m_summaryFilter = new RimSummaryFilter; m_summaryFilter = new RimSummaryFilter_OBSOLETE;
CAF_PDM_InitFieldNoDefault( &m_uiFilterResultMultiSelection, CAF_PDM_InitFieldNoDefault( &m_uiFilterResultMultiSelection,
"FilterResultSelection", "FilterResultSelection",

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

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

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

@ -24,35 +24,35 @@
namespace caf namespace caf
{ {
template <> 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_OBSOLETE::SUM_FILTER_VAR_STRING, "SUM_FILTER_VAR_STRING", "All" );
addItem( RimSummaryFilter::SUM_FILTER_FIELD, "SUM_FILTER_FIELD", "Field" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_FIELD, "SUM_FILTER_FIELD", "Field" );
addItem( RimSummaryFilter::SUM_FILTER_WELL, "SUM_FILTER_WELL", "Well" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL, "SUM_FILTER_WELL", "Well" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_GROUP, "SUM_FILTER_WELL_GROUP", "Group" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_GROUP, "SUM_FILTER_WELL_GROUP", "Group" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_COMPLETION, "SUM_FILTER_WELL_COMPLETION", "Completion" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_COMPLETION, "SUM_FILTER_WELL_COMPLETION", "Completion" );
addItem( RimSummaryFilter::SUM_FILTER_WELL_SEGMENT, "SUM_FILTER_SEGMENT", "Segment" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_SEGMENT, "SUM_FILTER_SEGMENT", "Segment" );
addItem( RimSummaryFilter::SUM_FILTER_BLOCK, "SUM_FILTER_BLOCK", "Block" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_BLOCK, "SUM_FILTER_BLOCK", "Block" );
addItem( RimSummaryFilter::SUM_FILTER_REGION, "SUM_FILTER_REGION", "Region" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_REGION, "SUM_FILTER_REGION", "Region" );
addItem( RimSummaryFilter::SUM_FILTER_REGION_2_REGION, "SUM_FILTER_REGION_2_REGION", "Region-Region" ); addItem( RimSummaryFilter_OBSOLETE::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_OBSOLETE::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_OBSOLETE::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_OBSOLETE::SUM_FILTER_BLOCK_LGR, "SUM_FILTER_BLOCK_LGR", "Lgr-Block" );
addItem( RimSummaryFilter::SUM_FILTER_MISC, "SUM_FILTER_MISC", "Misc" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_MISC, "SUM_FILTER_MISC", "Misc" );
addItem( RimSummaryFilter::SUM_FILTER_AQUIFER, "SUM_FILTER_AQUIFER", "Aquifer" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_AQUIFER, "SUM_FILTER_AQUIFER", "Aquifer" );
addItem( RimSummaryFilter::SUM_FILTER_NETWORK, "SUM_FILTER_NETWORK", "Network" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_NETWORK, "SUM_FILTER_NETWORK", "Network" );
addItem( RimSummaryFilter::SUM_FILTER_ANY, "SUM_FILTER_ANY", "All (Advanced)" ); addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_ANY, "SUM_FILTER_ANY", "All (Advanced)" );
setDefault( RimSummaryFilter::SUM_FILTER_VAR_STRING ); setDefault( RimSummaryFilter_OBSOLETE::SUM_FILTER_VAR_STRING );
} }
} // namespace caf } // 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", "", "", "" ); 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(); 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; 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 ) RifEclipseSummaryAddress::SummaryVarCategory sumVarType )
{ {
if ( sumVarType == RifEclipseSummaryAddress::SUMMARY_INVALID ) return false; 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 ); 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& oldValue,
const QVariant& newValue ) const QVariant& newValue )
{ {

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

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