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

Support showing Value field in symbol chooser 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13527
This commit is contained in:
Jon Evans 2023-01-19 22:14:10 -05:00
parent 27109bfc8a
commit 6cce99e0d0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib_tree_model_adapter.cpp
View File

@ -87,7 +87,7 @@ LIB_TREE_MODEL_ADAPTER::LIB_TREE_MODEL_ADAPTER( EDA_BASE_FRAME* aParent,
m_shownColumns = cfg->m_LibTree.columns; m_shownColumns = cfg->m_LibTree.columns;
if( m_shownColumns.empty() ) if( m_shownColumns.empty() )
m_shownColumns = m_availableColumns; m_shownColumns = { wxT( "Item" ), wxT( "Description" ) };
if( m_shownColumns[0] != wxT( "Item" ) ) if( m_shownColumns[0] != wxT( "Item" ) )
m_shownColumns.insert( m_shownColumns.begin(), wxT( "Item" ) ); m_shownColumns.insert( m_shownColumns.begin(), wxT( "Item" ) );

5
eeschema/symbol_tree_model_adapter.cpp
View File

@ -53,7 +53,10 @@ SYMBOL_TREE_MODEL_ADAPTER::Create( EDA_BASE_FRAME* aParent, LIB_TABLE* aLibs )
SYMBOL_TREE_MODEL_ADAPTER::SYMBOL_TREE_MODEL_ADAPTER( EDA_BASE_FRAME* aParent, LIB_TABLE* aLibs ) : SYMBOL_TREE_MODEL_ADAPTER::SYMBOL_TREE_MODEL_ADAPTER( EDA_BASE_FRAME* aParent, LIB_TABLE* aLibs ) :
LIB_TREE_MODEL_ADAPTER( aParent, "pinned_symbol_libs" ), LIB_TREE_MODEL_ADAPTER( aParent, "pinned_symbol_libs" ),
m_libs( (SYMBOL_LIB_TABLE*) aLibs ) m_libs( (SYMBOL_LIB_TABLE*) aLibs )
{} {
// Symbols may have different value from name
m_availableColumns.emplace_back( wxT( "Value" ) );
}
SYMBOL_TREE_MODEL_ADAPTER::~SYMBOL_TREE_MODEL_ADAPTER() SYMBOL_TREE_MODEL_ADAPTER::~SYMBOL_TREE_MODEL_ADAPTER()

2
include/lib_tree_model_adapter.h
View File

@ -421,6 +421,7 @@ protected:
LIB_TREE_NODE_ROOT m_tree; LIB_TREE_NODE_ROOT m_tree;
std::map<unsigned, wxString> m_colIdxMap; std::map<unsigned, wxString> m_colIdxMap;
std::vector<wxString> m_availableColumns;
private: private:
EDA_BASE_FRAME* m_parent; EDA_BASE_FRAME* m_parent;
@ -436,7 +437,6 @@ private:
std::vector<wxDataViewColumn*> m_columns; std::vector<wxDataViewColumn*> m_columns;
std::map<wxString, wxDataViewColumn*> m_colNameMap; std::map<wxString, wxDataViewColumn*> m_colNameMap;
std::map<wxString, int> m_colWidths; std::map<wxString, int> m_colWidths;
std::vector<wxString> m_availableColumns;
std::vector<wxString> m_shownColumns; // Stored in display order std::vector<wxString> m_shownColumns; // Stored in display order
}; };