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

When clearing annotations, keep units 

Clearing annotations should only clear the settings that can be set by
the matching annotate function.  Even in components where the units are
functionally the same, the unit choice should be retained as there are
often other considerations when chosing the unit.

Fixes: lp:1769457
* https://bugs.launchpad.net/kicad/+bug/1769457
This commit is contained in:
Seth Hillbrand 2018-06-07 21:34:17 -07:00
parent 68f6e3ad44
commit 7558c71aca
1 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
eeschema/sch_component.cpp
View File

@ -1062,69 +1062,43 @@ void SCH_COMPONENT::SwapData( SCH_ITEM* aItem )
void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath ) void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
{ {
bool keepMulti = false;
wxArrayString reference_fields; wxArrayString reference_fields;
static const wxChar separators[] = wxT( " " ); static const wxChar separators[] = wxT( " " );
PART_SPTR part = m_part.lock(); PART_SPTR part = m_part.lock();
if( part && part->UnitsLocked() )
keepMulti = true;
// Build a reference with no annotation, // Build a reference with no annotation,
// i.e. a reference ended by only one '?' // i.e. a reference ended by only one '?'
wxString defRef = m_prefix; wxString defRef = m_prefix;
if( IsReferenceStringValid( defRef ) ) if( !IsReferenceStringValid( defRef ) )
{
while( defRef.Last() == '?' )
defRef.RemoveLast();
}
else
{ // This is a malformed reference: reinit this reference { // This is a malformed reference: reinit this reference
m_prefix = defRef = wxT("U"); // Set to default ref prefix m_prefix = defRef = wxT("U"); // Set to default ref prefix
} }
while( defRef.Last() == '?' )
defRef.RemoveLast();
defRef.Append( wxT( "?" ) ); defRef.Append( wxT( "?" ) );
wxString multi = wxT( "1" ); wxString path;
// For components with units locked, if( aSheetPath )
// we cannot remove all annotations: part selection must be kept path = GetPath( aSheetPath );
// For all components: if aSheetPath is not NULL,
// remove annotation only for the given path for( unsigned int ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ )
if( keepMulti || aSheetPath )
{ {
wxString NewHref; // Break hierarchical reference in path, ref and multi selection:
wxString path; reference_fields = wxStringTokenize( m_PathsAndReferences[ii], separators );
if( aSheetPath ) // For all components: if aSheetPath is not NULL,
path = GetPath( aSheetPath ); // remove annotation only for the given path
if( aSheetPath == NULL || reference_fields[0].Cmp( path ) == 0 )
for( unsigned int ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ )
{ {
// Break hierarchical reference in path, ref and multi selection: wxString NewHref = reference_fields[0];
reference_fields = wxStringTokenize( m_PathsAndReferences[ii], separators ); NewHref << wxT( " " ) << defRef << wxT( " " ) << reference_fields[2];
m_PathsAndReferences[ii] = NewHref;
if( aSheetPath == NULL || reference_fields[0].Cmp( path ) == 0 )
{
if( keepMulti ) // Get and keep part selection
multi = reference_fields[2];
NewHref = reference_fields[0];
NewHref << wxT( " " ) << defRef << wxT( " " ) << multi;
m_PathsAndReferences[ii] = NewHref;
}
} }
} }
else
{
// Clear reference strings, but does not free memory because a new annotation
// will reuse it
m_PathsAndReferences.Empty();
m_unit = 1;
}
// These 2 changes do not work in complex hierarchy. // These 2 changes do not work in complex hierarchy.
// When a clear annotation is made, the calling function must call a // When a clear annotation is made, the calling function must call a