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

Sync with main branch r6516

This commit is contained in:
Cirilo Bernardo 2016-01-28 17:14:36 +11:00
parent cd831d9a8a ac54b7d114
commit 8264d393e8
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Documentation/GUI_Translation_HOWTO.odt
View File

Binary file not shown.

BIN
Documentation/GUI_Translation_HOWTO.pdf
View File

Binary file not shown.

8
eeschema/class_libentry.cpp
View File

@ -1754,15 +1754,15 @@ void LIB_PART::SetAliases( const wxArrayString& aAliasList )
} }
// Remove names in the current component that are not in the new alias list. // Remove names in the current component that are not in the new alias list.
LIB_ALIASES::iterator it; LIB_ALIASES::iterator it = m_aliases.begin();
for( it = m_aliases.begin(); it != m_aliases.end(); it++ ) while( it != m_aliases.end() )
{ {
int index = aAliasList.Index( (*it)->GetName(), false ); int index = aAliasList.Index( (*it)->GetName(), false );
if( index != wxNOT_FOUND || (*it)->IsRoot() ) if( index != wxNOT_FOUND || (*it)->IsRoot() )
continue; ++it;
else
it = m_aliases.erase( it ); it = m_aliases.erase( it );
} }
} }

7
pcbnew/drc.cpp
View File

@ -956,6 +956,13 @@ bool DRC::doPadToPadsDrc( D_PAD* aRefPad, D_PAD** aStart, D_PAD** aEnd, int x_li
continue; continue;
} }
// if either pad has no drill and is only on technical layers, not a clearance violation
if( ( ( pad->GetLayerSet() & layerMask ) == 0 && !pad->GetDrillSize().x ) ||
( ( aRefPad->GetLayerSet() & layerMask ) == 0 && !aRefPad->GetDrillSize().x ) )
{
continue;
}
if( !checkClearancePadToPad( aRefPad, pad ) ) if( !checkClearancePadToPad( aRefPad, pad ) )
{ {
// here we have a drc error! // here we have a drc error!