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

#11844 Quick Access adjustments

Browse Source 
Show the Quick Access menu only for objects that implements RimFieldQuickAccessInterface
Show the fields made available by RimFieldQuickAccessInterface
This commit is contained in:
Magne Sjaastad
2024-11-01 14:30:37 +01:00
parent 4cf6a26083
commit a05645e966
5 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/QuickAccess/RimFieldQuickAccessGroup.cpp
View File

@@ -60,8 +60,6 @@ void RimFieldQuickAccessGroup::addFields( const std::vector<caf::PdmFieldHandle*
for ( auto field : fields )
{
if ( findField( field ) ) continue;
addField( field );
}
}
@@ -73,8 +71,8 @@ void RimFieldQuickAccessGroup::addField( caf::PdmFieldHandle* field )
{
if ( !field ) return;
if ( !m_ownerView ) return;
if ( !isOwnerViewMatching( field ) ) return;
if ( findField( field ) ) return;
auto fieldReference = new RimFieldQuickAccess();
fieldReference->setField( field );

59
ApplicationLibCode/ProjectDataModel/QuickAccess/RimFieldReference.cpp
View File

@@ -17,6 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimFieldReference.h"
#include "RimFieldQuickAccessInterface.h"
CAF_PDM_SOURCE_INIT( RimFieldReference, "RimFieldReference" );
@@ -36,10 +37,19 @@ void RimFieldReference::setObject( caf::PdmObject* object )
{
m_object = object;
auto keywordAndNames = RimFieldReference::fieldKeywordAndNames( object );
if ( !keywordAndNames.empty() )
if ( auto quickInterface = dynamic_cast<RimFieldQuickAccessInterface*>( m_object() ) )
{
m_fieldKeyword = keywordAndNames[0].first;
for ( const auto& [groupName, fields] : quickInterface->quickAccessFields() )
{
for ( auto field : fields )
{
if ( field )
{
m_fieldKeyword = field->keyword();
return;
}
}
}
}
}
@@ -131,29 +141,30 @@ QList<caf::PdmOptionItemInfo> RimFieldReference::calculateValueOptions( const ca
if ( fieldNeedingOptions == &m_fieldKeyword )
{
auto keywordAndNames = RimFieldReference::fieldKeywordAndNames( m_object );
for ( const auto& [keyword, name] : keywordAndNames )
if ( auto quickInterface = dynamic_cast<RimFieldQuickAccessInterface*>( m_object() ) )
{
options.push_back( caf::PdmOptionItemInfo( name, keyword ) );
for ( const auto& [groupName, fields] : quickInterface->quickAccessFields() )
{
for ( auto field : fields )
{
auto text = field->keyword();
if ( auto uiCapability = field->uiCapability() )
{
text = uiCapability->uiName();
}
options.push_back( caf::PdmOptionItemInfo( text, field->keyword() ) );
}
}
}
}
else if ( fieldNeedingOptions == &m_object )
{
if ( m_objectsForSelection.empty() )
if ( m_object )
{
if ( m_object )
{
QString text = m_object()->uiName();
options.push_back( caf::PdmOptionItemInfo( text, m_object ) );
}
}
else
{
for ( auto obj : m_objectsForSelection )
{
QString text = obj->uiName();
options.push_back( caf::PdmOptionItemInfo( text, obj ) );
}
QString text = m_object()->uiName();
options.push_back( caf::PdmOptionItemInfo( text, m_object ) );
}
}
@@ -178,14 +189,6 @@ caf::PdmObject* RimFieldReference::object() const
return m_object;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFieldReference::setObjectsForSelection( const std::vector<caf::PdmObject*>& objectsForSelection )
{
m_objectsForSelection = objectsForSelection;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationLibCode/ProjectDataModel/QuickAccess/RimFieldReference.h
View File

@@ -43,7 +43,6 @@ public:
caf::PdmFieldHandle* field() const;
caf::PdmObject* object() const;
void setObjectsForSelection( const std::vector<caf::PdmObject*>& objectsForSelection );
private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
@@ -57,6 +56,4 @@ private:
private:
caf::PdmPtrField<caf::PdmObject*> m_object;
caf::PdmField<QString> m_fieldKeyword;
std::vector<caf::PdmObject*> m_objectsForSelection;
};