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

#7107 Objective Function : Remove delete button on curve filter

Browse Source
This commit is contained in:
Magne Sjaastad
2020-12-11 12:49:42 +01:00
parent e847ce7cd3
commit fdc5b484e6
4 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@@ -109,11 +109,6 @@ RimEnsembleCurveFilter::RimEnsembleCurveFilter()
CAF_PDM_InitFieldNoDefault( &m_categories, "Categories", "Categories", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_categories, "Categories", "Categories", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_deleteButton, "DeleteEnsembleFilter", "Delete Filter", "", "", "" );
m_deleteButton = false;
m_deleteButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
m_deleteButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
setDeletable( true ); setDeletable( true );
} }
@@ -369,16 +364,6 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change
curveSet->filterCollection()->updateConnectedEditors(); curveSet->filterCollection()->updateConnectedEditors();
} }
} }
else if ( changedField == &m_deleteButton )
{
m_deleteButton = false;
if ( !curveSet ) return;
curveSet->filterCollection()->removeFilter( this );
curveSet->filterCollection()->updateConnectedEditors();
curveSet->updateAllCurves();
}
else if ( changedField == &m_objectiveValuesSelectSummaryAddressPushButton ) else if ( changedField == &m_objectiveValuesSelectSummaryAddressPushButton )
{ {
RiuSummaryVectorSelectionDialog dlg( nullptr ); RiuSummaryVectorSelectionDialog dlg( nullptr );
@@ -478,7 +463,6 @@ void RimEnsembleCurveFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiO
{ {
uiOrdering.add( &m_categories ); uiOrdering.add( &m_categories );
} }
uiOrdering.add( &m_deleteButton );
uiOrdering.skipRemainingFields( true ); uiOrdering.skipRemainingFields( true );
} }
@@ -501,13 +485,6 @@ void RimEnsembleCurveFilter::defineEditorAttribute( const caf::PdmFieldHandle* f
myAttr->m_minimum = m_lowerLimit; myAttr->m_minimum = m_lowerLimit;
myAttr->m_maximum = m_upperLimit; myAttr->m_maximum = m_upperLimit;
} }
else if ( field == &m_deleteButton )
{
caf::PdmUiPushButtonEditorAttribute* attr = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );
if ( !attr ) return;
attr->m_buttonText = "Delete";
}
else if ( field == &m_objectiveValuesSelectSummaryAddressPushButton ) else if ( field == &m_objectiveValuesSelectSummaryAddressPushButton )
{ {
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ); caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );

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

@@ -93,7 +93,6 @@ private:
private: private:
caf::PdmProxyValueField<QString> m_filterTitle; caf::PdmProxyValueField<QString> m_filterTitle;
caf::PdmField<bool> m_active; caf::PdmField<bool> m_active;
caf::PdmField<bool> m_deleteButton;
caf::PdmField<caf::AppEnum<FilterMode>> m_filterMode; caf::PdmField<caf::AppEnum<FilterMode>> m_filterMode;
caf::PdmField<QString> m_ensembleParameterName; caf::PdmField<QString> m_ensembleParameterName;
caf::PdmChildArrayField<RimSummaryAddress*> m_objectiveValuesSummaryAddresses; caf::PdmChildArrayField<RimSummaryAddress*> m_objectiveValuesSummaryAddresses;

14
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@@ -71,20 +71,6 @@ RimEnsembleCurveFilter* RimEnsembleCurveFilterCollection::addFilter( const QStri
return newFilter; return newFilter;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::removeFilter( RimEnsembleCurveFilter* filter )
{
garbageCollectFilters();
size_t sizeBefore = m_filters.size();
m_filters.removeChildObject( filter );
size_t sizeAfter = m_filters.size();
if ( sizeAfter < sizeBefore ) _removedFilters.push_back( filter );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@@ -38,7 +38,6 @@ public:
RimEnsembleCurveFilterCollection(); RimEnsembleCurveFilterCollection();
RimEnsembleCurveFilter* addFilter( const QString& ensembleParameterName = "" ); RimEnsembleCurveFilter* addFilter( const QString& ensembleParameterName = "" );
void removeFilter( RimEnsembleCurveFilter* filter );
std::vector<RimEnsembleCurveFilter*> filters() const; std::vector<RimEnsembleCurveFilter*> filters() const;
bool isActive() const; bool isActive() const;