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

Fix a bug in the schematic symbol rescuer. 

If a library disappears all together or a symbol name is changed, force
the rescuer to add it to the rescue library.  The current rescue code
only looked for differences if they existed between libraries.  This was
causing symbols to be unceremoniously dumped from the symbol library
table remapping.

Don't search for cache rescue candidates in the symbol library table
rescuer.
This commit is contained in:
Wayne Stambaugh 2017-11-09 18:07:16 -05:00
parent a2e7e7aed4
commit 6d63873128
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eeschema/project_rescue.cpp
View File

@ -51,13 +51,13 @@ static bool sort_by_libid( const SCH_COMPONENT* ref, SCH_COMPONENT* cmp )
/** /**
* Fill a vector with all of the project's components, to ease iterating over them. * Fill a vector with all of the project's symbols, to ease iterating over them.
* *
* The list is sorted by lib id, therefore components using the same library * The list is sorted by #LIB_ID, therefore components using the same library
* symbol are grouped, allowing later faster calculations (one library search by group * symbol are grouped, allowing later faster calculations (one library search by group
* of symbols) * of symbols)
* *
* @param aComponents - a vector that will take the components * @param aComponents - a vector that will take the symbols
*/ */
static void get_components( std::vector<SCH_COMPONENT*>& aComponents ) static void get_components( std::vector<SCH_COMPONENT*>& aComponents )
{ {
@ -253,17 +253,15 @@ void RESCUE_CACHE_CANDIDATE::FindRescues( RESCUER& aRescuer,
// Search the symbol names candidates only once for this group: // Search the symbol names candidates only once for this group:
old_part_name = part_name; old_part_name = part_name;
cache_match = find_component( part_name, aRescuer.GetPrj()->SchLibs(), true ); cache_match = find_component( part_name, aRescuer.GetPrj()->SchLibs(), true );
LIB_ID id( wxEmptyString, part_name ); lib_match = find_component( part_name, aRescuer.GetPrj()->SchLibs(), false );
lib_match = aRescuer.GetPrj()->SchLibs()->FindLibPart( id );
// Test whether there is a conflict // Test whether there is a conflict or if the symbol can only be found in the cache.
if( !cache_match || !lib_match ) if( ( cache_match && lib_match
&& !cache_match->PinsConflictWith( *lib_match, true, true, true, true, false ) )
|| (!cache_match && lib_match ) )
continue; continue;
if( !cache_match->PinsConflictWith( *lib_match, true, true, true, true, false ) ) // Check if the symbol has already been rescued.
continue;
// May have been rescued already.
wxString new_name = part_name; wxString new_name = part_name;
if( new_name.Find( part_name_suffix ) == wxNOT_FOUND ) if( new_name.Find( part_name_suffix ) == wxNOT_FOUND )
@ -366,11 +364,10 @@ void RESCUE_SYMBOL_LIB_TABLE_CANDIDATE::FindRescues(
lib_match = aRescuer.GetFrame()->GetLibPart( part_id ); lib_match = aRescuer.GetFrame()->GetLibPart( part_id );
// Test whether there is a conflict // Test whether there is a conflict or if the symbol can only be found in the cache.
if( !cache_match || !lib_match ) if( ( cache_match && lib_match
continue; && !cache_match->PinsConflictWith( *lib_match, true, true, true, true, false ) )
|| (!cache_match && lib_match ) )
if( !cache_match->PinsConflictWith( *lib_match, true, true, true, true, false ) )
continue; continue;
// May have been rescued already. // May have been rescued already.
@ -718,7 +715,6 @@ SYMBOL_LIB_TABLE_RESCUER::SYMBOL_LIB_TABLE_RESCUER( SCH_EDIT_FRAME& aEditFrame,
void SYMBOL_LIB_TABLE_RESCUER::FindCandidates() void SYMBOL_LIB_TABLE_RESCUER::FindCandidates()
{ {
RESCUE_SYMBOL_LIB_TABLE_CANDIDATE::FindRescues( *this, m_all_candidates ); RESCUE_SYMBOL_LIB_TABLE_CANDIDATE::FindRescues( *this, m_all_candidates );
RESCUE_CACHE_CANDIDATE::FindRescues( *this, m_all_candidates );
} }