haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to get the scoring logic right (again). 

Also adds matching against a library name.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15875
This commit is contained in:
Jeff Young 2023-10-23 18:23:24 +01:00
parent 4c1da16d6f
commit 0cf6679bfe
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/lib_tree_model.cpp
View File

@ -255,6 +255,8 @@ LIB_TREE_NODE_LIB::LIB_TREE_NODE_LIB( LIB_TREE_NODE* aParent, wxString const& aN
m_Desc = aDesc; m_Desc = aDesc;
m_Parent = aParent; m_Parent = aParent;
m_LibId.SetLibNickname( aName ); m_LibId.SetLibNickname( aName );
m_SearchTerms.emplace_back( SEARCH_TERM( aName, 8 ) );
} }
@ -268,7 +270,10 @@ LIB_TREE_NODE_LIB_ID& LIB_TREE_NODE_LIB::AddItem( LIB_TREE_ITEM* aItem )
void LIB_TREE_NODE_LIB::UpdateScore( EDA_COMBINED_MATCHER* aMatcher, const wxString& aLib ) void LIB_TREE_NODE_LIB::UpdateScore( EDA_COMBINED_MATCHER* aMatcher, const wxString& aLib )
{ {
// We need to score leaf nodes, which are usually (but not always) children. // If we're matching then we default to not-matched; otherwise we default to whatever m_Score
// was initialized to (currently 1)
if( aMatcher )
m_Score = 0;
if( m_Children.size() ) if( m_Children.size() )
{ {
@ -278,11 +283,10 @@ void LIB_TREE_NODE_LIB::UpdateScore( EDA_COMBINED_MATCHER* aMatcher, const wxStr
m_Score = std::max( m_Score, child->m_Score ); m_Score = std::max( m_Score, child->m_Score );
} }
} }
else if( aMatcher ) else
{ {
// No children; we are a leaf. if( aMatcher )
m_Score = aMatcher->ScoreTerms( m_SearchTerms );
m_Score = aMatcher->ScoreTerms( m_SearchTerms );
} }
} }