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 #8985 from OPM/8926-remove-useoptionsonly

Browse Source 
AppFwk : Remove obsolete useOptionsOnly
This commit is contained in:
Magne Sjaastad
2022-05-29 13:01:27 +02:00
committed by GitHub
parent 2a57adf222
commit f0ce04597d
276 changed files with 333 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp
View File

@@ -250,13 +250,10 @@ const cvf::StructGridInterface* RimCellFilter::selectedGrid() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
if ( useOptionsOnly ) ( *useOptionsOnly ) = true;
if ( &m_gridIndex == fieldNeedingOptions )
{
RimCase* rimCase = nullptr;

3
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.h
View File

@@ -80,8 +80,7 @@ protected:
const cvf::StructGridInterface* selectedGrid() const;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
caf::PdmField<QString> m_name;
caf::PdmProxyValueField<QString> m_nameProxy;

5
ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.cpp
View File

@@ -52,15 +52,12 @@ std::vector<int> RimPropertyFilter::selectedCategoryValues() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimPropertyFilter::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
QList<caf::PdmOptionItemInfo> RimPropertyFilter::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
if ( &m_selectedCategoryValues == fieldNeedingOptions )
{
if ( useOptionsOnly ) *useOptionsOnly = true;
if ( m_categoryValues.size() == m_categoryNames.size() )
{
for ( size_t i = 0; i < m_categoryValues.size(); i++ )

3
ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.h
View File

@@ -42,8 +42,7 @@ protected:
void setCategoryNamesAndValues( const std::vector<std::pair<QString, int>>& categoryNamesAndValues );
void clearCategories();
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
protected:
caf::PdmField<std::vector<int>> m_selectedCategoryValues;