← Back to branch summary

~pierre-parent-k/kicad/length-tunning

« back to all changes in this revision

Viewing changes to pcbnew/dragsegm.cpp

  • Committer: Pierre Parent
  • Date: 2014-07-06 10:32:13 UTC
  • mfrom: (4798.1.179 kicad)
  • Revision ID: pierre.parent@insa-rouen.fr-20140706103213-wjsdy0hc9q6wbz5v
Merge with lp:kicad 4977

Show diffs side-by-side

added added

removed removed

Lines of Context:
pcbnew/dragsegm.cpp
335
335
}
336
336
 
337
337
 
338
 
void Collect_TrackSegmentsToDrag( BOARD* aPcb, const wxPoint& aRefPos, LAYER_MSK aLayerMask,
 
338
void Collect_TrackSegmentsToDrag( BOARD* aPcb, const wxPoint& aRefPos, LSET aLayerMask,
339
339
                                  int aNetCode, int aMaxDist )
340
340
{
341
341
    TRACK* track = aPcb->m_Track->GetStartNetCode( aNetCode );
345
345
        if( track->GetNetCode() != aNetCode )   // not the same netcode: all candidates tested
346
346
            break;
347
347
 
348
 
        if( ( aLayerMask & track->GetLayerMask() ) == 0 )
 
348
        if( !( aLayerMask & track->GetLayerSet() ).any() )
349
349
            continue;                       // Cannot be connected, not on the same layer
350
350
 
351
351
        if( track->IsDragging() )
394
394
            // If a connected via is found at location aRefPos,
395
395
            // collect also tracks connected by this via.
396
396
            if( track->Type() == PCB_VIA_T )
397
 
                Collect_TrackSegmentsToDrag( aPcb, aRefPos, track->GetLayerMask(),
 
397
                Collect_TrackSegmentsToDrag( aPcb, aRefPos, track->GetLayerSet(),
398
398
                                             aNetCode, track->GetWidth() / 2 );
399
399
        }
400
400
    }