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

Cleanup

Browse Source
This commit is contained in:
Magne Sjaastad
2024-10-11 13:52:04 +02:00
parent f086f33402
commit 56836b5c58
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/ProjectDataModel/RimFieldQuickAccess.cpp
View File

@@ -38,11 +38,11 @@ RimFieldQuickAccess::RimFieldQuickAccess()
m_selectObjectButton.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() );
m_selectObjectButton.xmlCapability()->disableIO();
CAF_PDM_InitField( &m_removeObjectButton, "RemoveObject", false, "...", ":/Erase.svg", "Remove Item" );
m_removeObjectButton.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() );
m_removeObjectButton.xmlCapability()->disableIO();
CAF_PDM_InitField( &m_removeItemButton, "RemoveItem", false, "...", ":/Erase.svg", "Remove Quick Access" );
m_removeItemButton.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() );
m_removeItemButton.xmlCapability()->disableIO();
m_toBeDeleted = false;
m_markedForRemoval = false;
}
//--------------------------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ void RimFieldQuickAccess::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
}
uiOrdering.add( &m_selectObjectButton, { .newRow = false } );
uiOrdering.add( &m_removeObjectButton, { .newRow = false } );
uiOrdering.add( &m_removeItemButton, { .newRow = false } );
uiOrdering.skipRemainingFields();
}
@@ -84,9 +84,9 @@ caf::PdmFieldHandle* RimFieldQuickAccess::field() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimFieldQuickAccess::toBeDeleted() const
bool RimFieldQuickAccess::markedForRemoval() const
{
return m_toBeDeleted;
return m_markedForRemoval;
}
//--------------------------------------------------------------------------------------------------
@@ -107,10 +107,10 @@ void RimFieldQuickAccess::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
}
}
if ( changedField == &m_removeObjectButton )
if ( changedField == &m_removeItemButton )
{
m_removeObjectButton = false;
m_removeItemButton = false;
m_toBeDeleted = true;
m_markedForRemoval = true;
}
}

10
ApplicationLibCode/ProjectDataModel/RimFieldQuickAccess.h
View File

@@ -26,10 +26,6 @@ class RimFieldReference;
//==================================================================================================
///
/// This class is used to store a reference to a field in a PdmObject, and is similar to caf::PdmPtrField<caf::PdmObjectHandle*> that is
/// used for a non-owning reference to an object. Consider creating a caf::PdmPtrField<caf::PdmFieldHandle*> instead of this class.
///
/// Investigate if PdmFieldCapability::attributes can be used to store the field name for a caf::PdmPtrField<caf::PdmObjectHandle*>
///
//==================================================================================================
class RimFieldQuickAccess : public caf::PdmObject
@@ -42,7 +38,7 @@ public:
void setField( caf::PdmFieldHandle* field );
caf::PdmFieldHandle* field() const;
bool toBeDeleted() const;
bool markedForRemoval() const;
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
@@ -51,6 +47,6 @@ private:
caf::PdmChildField<RimFieldReference*> m_fieldReference;
caf::PdmField<bool> m_selectObjectButton;
caf::PdmField<bool> m_removeObjectButton;
bool m_toBeDeleted;
caf::PdmField<bool> m_removeItemButton;
bool m_markedForRemoval;
};

2
ApplicationLibCode/ProjectDataModel/RimPinnedFieldCollection.cpp
View File

@@ -146,7 +146,7 @@ void RimPinnedFieldCollection::deleteMarkedObjects()
{
for ( auto fieldRef : m_fieldReferences )
{
if ( fieldRef->toBeDeleted() )
if ( fieldRef->markedForRemoval() )
{
m_toBeDeleted.insert( fieldRef );
}