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

Fix bug 711751.

This commit is contained in:
jean-pierre charras 2011-02-02 11:52:00 +01:00
parent c9b27ee785
commit 740c03e717
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/locate.cpp
View File

@ -112,22 +112,16 @@ D_PAD* Locate_Pad_Connecte( BOARD* Pcb, TRACK* ptr_piste, int extr )
/* /*
* Locate pad pointed to by the coordinates ref_pos.x,, ref_pos.y or * Locate a pad pointed to by the coordinates ref_pos.x, ref_pos.y
* the mouse, search done on all tracks. * aLayerMask is allowed layers ( bitmap mask)
* Input:
* - mouse coord or ref_pos
* Returns: * Returns:
* Pointer to the pad if found. * Pointer to a pad if found or NULL
* NULL pointer if pad NOT FOUND
* Num_empr = number of fingerprint pad
*
* Priority is the active layer
*/ */
D_PAD* Locate_Any_Pad( BOARD* Pcb, const wxPoint& ref_pos, int aLayerMask ) D_PAD* Locate_Any_Pad( BOARD* Pcb, const wxPoint& ref_pos, int aLayerMask )
{ {
D_PAD* pad = NULL; D_PAD* pad = NULL;
for( MODULE* module=Pcb->m_Modules; module && ( pad == NULL ); module = module->Next() ) for( MODULE* module=Pcb->m_Modules; module && ( pad == NULL ); module = module->Next() )
{ {
if( aLayerMask ) if( aLayerMask )
pad = Locate_Pads( module, ref_pos, aLayerMask ); pad = Locate_Pads( module, ref_pos, aLayerMask );
@ -139,14 +133,12 @@ D_PAD* Locate_Any_Pad( BOARD* Pcb, const wxPoint& ref_pos, int aLayerMask )
} }
/* Locate pad pointed to by the coordinate ref_pos.x,, ref_pos.y or /* Locate the pad pointed to by the coordinate ref_pos.x,, ref_pos.y
* the mouse on the current footprint.
* Input: * Input:
* - General parameters of the footprint update by characters() * - the footprint to test
* - = Masque_layer layer(s) (bit_masque) which must be the pad * - masque_layer layer(s) (bit_masque) which must be the pad
* Returns: * Returns:
* A pointer to the pad if found * A pointer to the pad if found or NULL
* NULL pointer if pad NOT FOUND
*/ */
D_PAD* Locate_Pads( MODULE* module, const wxPoint& ref_pos, int masque_layer ) D_PAD* Locate_Pads( MODULE* module, const wxPoint& ref_pos, int masque_layer )
{ {

3
pcbnew/magnetic_tracks_functions.cpp
View File

@ -152,7 +152,8 @@ bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame, int aCurrentTool, wxSize g
if( doPad ) if( doPad )
{ {
D_PAD* pad = Locate_Any_Pad( m_Pcb, pos, screen->m_Active_Layer ); int layer_mask = g_TabOneLayerMask[screen->m_Active_Layer];
D_PAD* pad = Locate_Any_Pad( m_Pcb, pos, layer_mask );
if( pad ) if( pad )
{ {