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

Symbol Fields Table: Highlight proper symbols even if they aren't annotated

This commit is contained in:
dsa-t 2021-12-03 20:35:54 +00:00 committed by Wayne Stambaugh
parent f24bdf4067
commit cb482eb8eb
4 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/view/view.cpp
View File

@ -42,6 +42,10 @@
#include <profile.h> #include <profile.h>
#ifdef KICAD_GAL_PROFILE
#include <wx/log.h>
#endif
namespace KIGFX { namespace KIGFX {
class VIEW; class VIEW;

44
eeschema/cross-probing.cpp
View File

@ -40,9 +40,8 @@
#include <netclass.h> #include <netclass.h>
#include <wx/log.h> #include <wx/log.h>
SCH_ITEM* SCH_EDITOR_CONTROL::FindSymbolAndItem( const wxString& aReference, SCH_ITEM* SCH_EDITOR_CONTROL::FindSymbolAndItem( const wxString* aPath, const wxString* aReference,
bool aSearchHierarchy, bool aSearchHierarchy, SCH_SEARCH_T aSearchType,
SCH_SEARCH_T aSearchType,
const wxString& aSearchText ) const wxString& aSearchText )
{ {
SCH_SHEET_PATH* sheetWithSymbolFound = nullptr; SCH_SHEET_PATH* sheetWithSymbolFound = nullptr;
@ -65,7 +64,20 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindSymbolAndItem( const wxString& aReference,
{ {
SCH_SYMBOL* candidate = static_cast<SCH_SYMBOL*>( item ); SCH_SYMBOL* candidate = static_cast<SCH_SYMBOL*>( item );
if( aReference.CmpNoCase( candidate->GetRef( &sheet ) ) == 0 ) // Search by path if specified, otherwise search by reference
bool found = false;
if( aPath )
{
wxString path = sheet.PathAsString() + candidate->m_Uuid.AsString();
found = ( *aPath == path );
}
else
{
found = ( aReference && aReference->CmpNoCase( candidate->GetRef( &sheet ) ) == 0 );
}
if( found )
{ {
symbol = candidate; symbol = candidate;
sheetWithSymbolFound = &sheet; sheetWithSymbolFound = &sheet;
@ -233,24 +245,30 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindSymbolAndItem( const wxString& aReference,
/* Print diag */ /* Print diag */
wxString msg; wxString msg;
wxString displayRef;
if( aReference )
displayRef = *aReference;
else if( aPath )
displayRef = *aPath;
if( symbol ) if( symbol )
{ {
if( aSearchType == HIGHLIGHT_PIN ) if( aSearchType == HIGHLIGHT_PIN )
{ {
if( foundItem ) if( foundItem )
msg.Printf( _( "%s pin %s found" ), aReference, aSearchText ); msg.Printf( _( "%s pin %s found" ), displayRef, aSearchText );
else else
msg.Printf( _( "%s found but pin %s not found" ), aReference, aSearchText ); msg.Printf( _( "%s found but pin %s not found" ), displayRef, aSearchText );
} }
else else
{ {
msg.Printf( _( "%s found" ), aReference ); msg.Printf( _( "%s found" ), displayRef );
} }
} }
else else
{ {
msg.Printf( _( "%s not found" ), aReference ); msg.Printf( _( "%s not found" ), displayRef );
} }
m_frame->SetStatusText( msg ); m_frame->SetStatusText( msg );
@ -327,7 +345,7 @@ void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
if( idcmd == nullptr ) // Highlight symbol only (from CvPcb or Pcbnew) if( idcmd == nullptr ) // Highlight symbol only (from CvPcb or Pcbnew)
{ {
// Highlight symbol part_ref, or clear Highlight, if part_ref is not existing // Highlight symbol part_ref, or clear Highlight, if part_ref is not existing
editor->FindSymbolAndItem( part_ref, true, HIGHLIGHT_SYMBOL, wxEmptyString ); editor->FindSymbolAndItem( nullptr, &part_ref, true, HIGHLIGHT_SYMBOL, wxEmptyString );
return; return;
} }
@ -342,21 +360,21 @@ void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
{ {
// Highlighting the reference itself isn't actually that useful, and it's harder to // Highlighting the reference itself isn't actually that useful, and it's harder to
// see. Highlight the parent and display the message. // see. Highlight the parent and display the message.
editor->FindSymbolAndItem( part_ref, true, HIGHLIGHT_SYMBOL, msg ); editor->FindSymbolAndItem( nullptr, &part_ref, true, HIGHLIGHT_SYMBOL, msg );
} }
else if( strcmp( idcmd, "$VAL:" ) == 0 ) else if( strcmp( idcmd, "$VAL:" ) == 0 )
{ {
// Highlighting the value itself isn't actually that useful, and it's harder to see. // Highlighting the value itself isn't actually that useful, and it's harder to see.
// Highlight the parent and display the message. // Highlight the parent and display the message.
editor->FindSymbolAndItem( part_ref, true, HIGHLIGHT_SYMBOL, msg ); editor->FindSymbolAndItem( nullptr, &part_ref, true, HIGHLIGHT_SYMBOL, msg );
} }
else if( strcmp( idcmd, "$PAD:" ) == 0 ) else if( strcmp( idcmd, "$PAD:" ) == 0 )
{ {
editor->FindSymbolAndItem( part_ref, true, HIGHLIGHT_PIN, msg ); editor->FindSymbolAndItem( nullptr, &part_ref, true, HIGHLIGHT_PIN, msg );
} }
else else
{ {
editor->FindSymbolAndItem( part_ref, true, HIGHLIGHT_SYMBOL, wxEmptyString ); editor->FindSymbolAndItem( nullptr, &part_ref, true, HIGHLIGHT_SYMBOL, wxEmptyString );
} }
} }

6
eeschema/dialogs/dialog_symbol_fields_table.cpp
View File

@ -1147,8 +1147,10 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableCellClick( wxGridEvent& event )
{ {
SCH_EDITOR_CONTROL* editor = m_parent->GetToolManager()->GetTool<SCH_EDITOR_CONTROL>(); SCH_EDITOR_CONTROL* editor = m_parent->GetToolManager()->GetTool<SCH_EDITOR_CONTROL>();
editor->FindSymbolAndItem( refs[ 0 ].GetRef() + refs[ 0 ].GetRefNumber(), true, wxString path = refs[0].GetPath();
HIGHLIGHT_SYMBOL, wxEmptyString ); wxString reference = refs[0].GetRef() + refs[0].GetRefNumber();
editor->FindSymbolAndItem( &path, &reference, true, HIGHLIGHT_SYMBOL, wxEmptyString );
} }
} }
else else

9
eeschema/tools/sch_editor_control.h
View File

@ -147,14 +147,17 @@ public:
/** /**
* Find a symbol in the schematic and an item in this symbol. * Find a symbol in the schematic and an item in this symbol.
* *
* @param aReference The symbol reference designator to find. * @param aPath The symbol path to find. Pass nullptr to search by aReference.
* @param aReference The symbol reference designator to find, or to display in
* status bar if aPath is specified
* @param aSearchHierarchy If false, search the current sheet only. Otherwise, * @param aSearchHierarchy If false, search the current sheet only. Otherwise,
* the entire hierarchy * the entire hierarchy
* @param aSearchType A #SCH_SEARCH_T value used to determine what to search for. * @param aSearchType A #SCH_SEARCH_T value used to determine what to search for.
* @param aSearchText The text to search for, either in value, reference or elsewhere. * @param aSearchText The text to search for, either in value, reference or elsewhere.
*/ */
SCH_ITEM* FindSymbolAndItem( const wxString& aReference, bool aSearchHierarchy, SCH_ITEM* FindSymbolAndItem( const wxString* aPath, const wxString* aReference,
SCH_SEARCH_T aSearchType, const wxString& aSearchText ); bool aSearchHierarchy, SCH_SEARCH_T aSearchType,
const wxString& aSearchText );
private: private:
///< copy selection to clipboard or to m_localClipboard if aUseLocalClipboard is true ///< copy selection to clipboard or to m_localClipboard if aUseLocalClipboard is true