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

Make sure toolbar is updated for when a single plot is present

Browse Source 
We try to update the content of the toolbar only when required, as this can take some time to produce the combo box content for large cases. Return false to make sure the UI is rebuild if any invalid text is present.
This commit is contained in:
Magne Sjaastad 2023-11-17 10:46:44 +01:00
parent 5bba0eaea8
commit f092f18614
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp
View File

@ -80,25 +80,29 @@ PdmUiToolBarEditor::~PdmUiToolBarEditor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool PdmUiToolBarEditor::isEditorDataEqualAndValid( const std::vector<caf::PdmFieldHandle*>& fields ) const bool PdmUiToolBarEditor::isEditorDataEqualAndValid( const std::vector<caf::PdmFieldHandle*>& fields ) const
{ {
if ( m_fields.size() == fields.size() && m_fieldViews.size() == fields.size() ) if ( m_fields.size() != fields.size() || m_fieldViews.size() != fields.size() )
{ {
bool equalContent = true; return false;
}
for ( size_t i = 0; i < m_fields.size(); i++ ) for ( size_t i = 0; i < m_fields.size(); i++ )
{
auto currentField = m_fields[i];
if ( currentField != fields[i] )
{ {
if ( m_fields[i] != fields[i] ) return false;
{
equalContent = false;
}
} }
if ( equalContent ) if ( currentField && currentField->uiCapability() )
{ {
return true; auto contentText = currentField->uiCapability()->uiValue();
// If there is no selection in a combo box, the content text is "-1"
// Rebuild the UI to make sure the available items in the combo box is updated
if ( contentText == "-1" ) return false;
} }
} }
return false; return true;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------