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

BOARD::chainMarkedSegments() : fix coding style, bad comments, and better debug messages.

This commit is contained in:
unknown 2015-07-10 18:43:25 +02:00 committed by jean-pierre charras
parent 6ec3d891d4
commit be42bd163b
2 changed files with 100 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
pcbnew/class_board.cpp
View File

@ -182,12 +182,13 @@ void BOARD::Move( const wxPoint& aMoveVector ) // overload
} }
void BOARD::chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS* aList ) void BOARD::chainMarkedSegments( wxPoint aPosition, const LSET& aLayerMask, TRACK_PTRS* aList )
{ {
TRACK* segment; // The current segment being analyzed. TRACK* segment; // The current segment being analyzed.
TRACK* via; // The via identified, eventually destroy TRACK* via; // The via identified, eventually destroy
TRACK* candidate; // The end segment to destroy (or NULL = segment) TRACK* candidate; // The end segment to destroy (or NULL = segment)
int NbSegm; int NbSegm;
LSET layer_set = aLayerMask;
if( !m_Track ) if( !m_Track )
return; return;
@ -201,13 +202,13 @@ void BOARD::chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS*
* on other layers and they change the layer mask. They can be a track * on other layers and they change the layer mask. They can be a track
* end or not. They will be analyzer later and vias on terminal points * end or not. They will be analyzer later and vias on terminal points
* of the track will be considered as part of this track if they do not * of the track will be considered as part of this track if they do not
* connect segments of an other track together and will be considered as * connect segments of another track together and will be considered as
* part of an other track when removing the via, the segments of that other * part of an other track when removing the via, the segments of that other
* track are disconnected. * track are disconnected.
*/ */
for( ; ; ) for( ; ; )
{ {
if( GetPad( aPosition, aLayerMask ) != NULL ) if( GetPad( aPosition, layer_set ) != NULL )
return; return;
/* Test for a via: a via changes the layer mask and can connect a lot /* Test for a via: a via changes the layer mask and can connect a lot
@ -217,11 +218,11 @@ void BOARD::chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS*
* is found we do not know at this time the number of connected items * is found we do not know at this time the number of connected items
* and we do not know if this via is on the track or finish the track * and we do not know if this via is on the track or finish the track
*/ */
via = m_Track->GetVia( NULL, aPosition, aLayerMask ); via = m_Track->GetVia( NULL, aPosition, layer_set );
if( via ) if( via )
{ {
aLayerMask = via->GetLayerSet(); layer_set = via->GetLayerSet();
aList->push_back( via ); aList->push_back( via );
} }
@ -235,7 +236,7 @@ void BOARD::chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS*
candidate = NULL; candidate = NULL;
NbSegm = 0; NbSegm = 0;
while( ( segment = ::GetTrack( segment, NULL, aPosition, aLayerMask ) ) != NULL ) while( ( segment = ::GetTrack( segment, NULL, aPosition, layer_set ) ) != NULL )
{ {
if( segment->GetState( BUSY ) ) // already found and selected: skip it if( segment->GetState( BUSY ) ) // already found and selected: skip it
{ {
@ -251,25 +252,23 @@ void BOARD::chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS*
NbSegm++; NbSegm++;
if( NbSegm == 1 ) /* First time we found a connected item: segment is candidate */ if( NbSegm == 1 ) // First time we found a connected item: segment is candidate
{ {
candidate = segment; candidate = segment;
segment = segment->Next(); segment = segment->Next();
} }
else /* More than 1 segment connected -> this location is an end of the track */ else // More than 1 segment connected -> this location is an end of the track
{ {
return; return;
} }
} }
if( candidate ) // A candidate is found: flag it an push it in list if( candidate ) // A candidate is found: flag it and push it in list
{ {
/* Initialize parameters to search items connected to this /* Initialize parameters to search items connected to this
* candidate: * candidate:
* we must analyze connections to its other end * we must analyze connections to its other end
*/ */
aLayerMask = candidate->GetLayerSet();
if( aPosition == candidate->GetStart() ) if( aPosition == candidate->GetStart() )
{ {
aPosition = candidate->GetEnd(); aPosition = candidate->GetEnd();
@ -279,7 +278,9 @@ void BOARD::chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS*
aPosition = candidate->GetStart(); aPosition = candidate->GetStart();
} }
/* flag this item an push it in list of selected items */ layer_set = candidate->GetLayerSet();
// flag this item and push it in list of selected items
aList->push_back( candidate ); aList->push_back( candidate );
candidate->SetState( BUSY, true ); candidate->SetState( BUSY, true );
} }
@ -1678,7 +1679,7 @@ TRACK* BOARD::GetTrack( TRACK* aTrace, const wxPoint& aPosition,
if( m_designSettings.IsLayerVisible( layer ) == false ) if( m_designSettings.IsLayerVisible( layer ) == false )
continue; continue;
if( track->Type() == PCB_VIA_T ) /* VIA encountered. */ if( track->Type() == PCB_VIA_T ) // VIA encountered.
{ {
if( track->HitTest( aPosition ) ) if( track->HitTest( aPosition ) )
return track; return track;
@ -1697,12 +1698,32 @@ TRACK* BOARD::GetTrack( TRACK* aTrace, const wxPoint& aPosition,
} }
#if defined(DEBUG) && 0
static void dump_tracks( const char* aName, const TRACK_PTRS& aList )
{
printf( "%s: count=%zd\n", aName, aList.size() );
for( unsigned i = 0; i < aList.size(); ++i )
{
TRACK* seg = aList[i];
::VIA* via = dynamic_cast< ::VIA* >( seg );
if( via )
printf( " via[%u]: (%d, %d)\n", i, via->GetStart().x, via->GetStart().y );
else
printf( " seg[%u]: (%d, %d) (%d, %d)\n", i,
seg->GetStart().x, seg->GetStart().y,
seg->GetEnd().x, seg->GetEnd().y );
}
}
#endif
TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount, TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount,
double* aTraceLength, double* aPadToDieLength, double* aTraceLength, double* aPadToDieLength,
bool aReorder ) bool aReorder )
{ {
int NbSegmBusy; int NbSegmBusy;
TRACK_PTRS trackList; TRACK_PTRS trackList;
if( aCount ) if( aCount )
@ -1721,7 +1742,7 @@ TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount,
// Set flags of the initial track segment // Set flags of the initial track segment
aTrace->SetState( BUSY, true ); aTrace->SetState( BUSY, true );
LSET layerMask = aTrace->GetLayerSet(); LSET layer_set = aTrace->GetLayerSet();
trackList.push_back( aTrace ); trackList.push_back( aTrace );
@ -1734,55 +1755,70 @@ TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount,
*/ */
if( aTrace->Type() == PCB_VIA_T ) if( aTrace->Type() == PCB_VIA_T )
{ {
TRACK* Segm1, * Segm2 = NULL, * Segm3 = NULL; TRACK* segm1 = ::GetTrack( m_Track, NULL, aTrace->GetStart(), layer_set );
Segm1 = ::GetTrack( m_Track, NULL, aTrace->GetStart(), layerMask ); TRACK* segm2 = NULL;
TRACK* segm3 = NULL;
if( Segm1 ) if( segm1 )
{ {
Segm2 = ::GetTrack( Segm1->Next(), NULL, aTrace->GetStart(), layerMask ); segm2 = ::GetTrack( segm1->Next(), NULL, aTrace->GetStart(), layer_set );
} }
if( Segm2 ) if( segm2 )
{ {
Segm3 = ::GetTrack( Segm2->Next(), NULL, aTrace->GetStart(), layerMask ); segm3 = ::GetTrack( segm2->Next(), NULL, aTrace->GetStart(), layer_set );
} }
if( Segm3 ) // More than 2 segments are connected to this via. the track" is only this via if( segm3 )
{ {
// More than 2 segments are connected to this via.
// The "track" is only this via.
if( aCount ) if( aCount )
*aCount = 1; *aCount = 1;
return aTrace; return aTrace;
} }
if( Segm1 ) // search for others segments connected to the initial segment start point if( segm1 ) // search for other segments connected to the initial segment start point
{ {
layerMask = Segm1->GetLayerSet(); layer_set = segm1->GetLayerSet();
chainMarkedSegments( aTrace->GetStart(), layerMask, &trackList ); chainMarkedSegments( aTrace->GetStart(), layer_set, &trackList );
} }
if( Segm2 ) // search for others segments connected to the initial segment end point if( segm2 ) // search for other segments connected to the initial segment end point
{ {
layerMask = Segm2->GetLayerSet(); layer_set = segm2->GetLayerSet();
chainMarkedSegments( aTrace->GetStart(), layerMask, &trackList ); chainMarkedSegments( aTrace->GetStart(), layer_set, &trackList );
} }
} }
else // mark the chain using both ends of the initial segment else // mark the chain using both ends of the initial segment
{ {
chainMarkedSegments( aTrace->GetStart(), layerMask, &trackList ); TRACK_PTRS from_start;
chainMarkedSegments( aTrace->GetEnd(), layerMask, &trackList ); TRACK_PTRS from_end;
chainMarkedSegments( aTrace->GetStart(), layer_set, &from_start );
chainMarkedSegments( aTrace->GetEnd(), layer_set, &from_end );
// DBG( dump_tracks( "first_clicked", trackList ); )
// DBG( dump_tracks( "from_start", from_start ); )
// DBG( dump_tracks( "from_end", from_end ); )
// combine into one trackList:
trackList.insert( trackList.end(), from_start.begin(), from_start.end() );
trackList.insert( trackList.end(), from_end.begin(), from_end.end() );
} }
// Now examine selected vias and flag them if they are on the track // Now examine selected vias and flag them if they are on the track
// If a via is connected to only one or 2 segments, it is flagged (is on the track) // If a via is connected to only one or 2 segments, it is flagged (is on the track)
// If a via is connected to more than 2 segments, it is a track end, and it // If a via is connected to more than 2 segments, it is a track end, and it
// is removed from the list // is removed from the list.
// go through the list backwards. // Go through the list backwards.
for( int i = trackList.size() - 1; i>=0; --i ) for( int i = trackList.size() - 1; i>=0; --i )
{ {
TRACK* via = trackList[i]; ::VIA* via = dynamic_cast< ::VIA* >( trackList[i] );
if( via->Type() != PCB_VIA_T ) if( !via )
continue; continue;
if( via == aTrace ) if( via == aTrace )
@ -1790,9 +1826,9 @@ TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount,
via->SetState( BUSY, true ); // Try to flag it. the flag will be cleared later if needed via->SetState( BUSY, true ); // Try to flag it. the flag will be cleared later if needed
layerMask = via->GetLayerSet(); layer_set = via->GetLayerSet();
TRACK* track = ::GetTrack( m_Track, NULL, via->GetStart(), layerMask ); TRACK* track = ::GetTrack( m_Track, NULL, via->GetStart(), layer_set );
// GetTrace does not consider tracks flagged BUSY. // GetTrace does not consider tracks flagged BUSY.
// So if no connected track found, this via is on the current track // So if no connected track found, this via is on the current track
@ -1800,26 +1836,34 @@ TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount,
if( track == NULL ) if( track == NULL )
continue; continue;
/* If a track is found, this via connects also others segments of an /* If a track is found, this via connects also other segments of
* other track. This case happens when the vias ends the selected * another track. This case happens when a via ends the selected
* track but must we consider this via is on the selected track, or * track but must we consider this via is on the selected track, or
* on an other track. * on another track.
* (this is important when selecting a track for deletion: must this * (this is important when selecting a track for deletion: must this
* via be deleted or not?) * via be deleted or not?)
* We consider here this via on the track if others segment connected * We consider this via to be on our track if other segments connected
* to this via remain connected when removing this via. * to this via remain connected when removing this via.
* We search for all others segment connected together: * We search for all other segments connected together:
* if there are on the same layer, the via is on the selected track * if they are on the same layer, then the via is on the selected track;
* if there are on different layers, the via is on an other track * if they are on different layers, the via is on another track.
*/ */
LAYER_NUM layer = track->GetLayer(); LAYER_NUM layer = track->GetLayer();
while( ( track = ::GetTrack( track->Next(), NULL, via->GetStart(), layerMask ) ) != NULL ) while( ( track = ::GetTrack( track->Next(), NULL, via->GetStart(), layer_set ) ) != NULL )
{ {
if( layer != track->GetLayer() ) if( layer != track->GetLayer() )
{ {
// The via connects segments of an other track: it is removed // The via connects segments of another track: it is removed
// from list because it is member of an other track // from list because it is member of another track
DBG(printf( "%s: omit track (%d, %d) (%d, %d) on layer:%d (!= our_layer:%d)\n",
__func__,
track->GetStart().x, track->GetStart().y,
track->GetEnd().x, track->GetEnd().y,
track->GetLayer(), layer
); )
via->SetState( BUSY, false ); via->SetState( BUSY, false );
break; break;
} }
@ -1922,6 +1966,8 @@ TRACK* BOARD::MarkTrace( TRACK* aTrace, int* aCount,
} }
} }
} }
DBG( printf( "%s: NbSegmBusy:%d\n", __func__, NbSegmBusy ); )
} }
if( aTraceLength ) if( aTraceLength )
@ -2091,7 +2137,7 @@ TRACK* BOARD::CreateLockPoint( wxPoint& aPosition, TRACK* aSegment, PICKED_ITEMS
D_PAD * pad = GetPad( newTrack, ENDPOINT_START ); D_PAD * pad = GetPad( newTrack, ENDPOINT_START );
if ( pad ) if( pad )
{ {
newTrack->start = pad; newTrack->start = pad;
newTrack->SetState( BEGIN_ONPAD, true ); newTrack->SetState( BEGIN_ONPAD, true );
@ -2265,7 +2311,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
GetChars( component->GetTimeStamp() ), GetChars( component->GetTimeStamp() ),
GetChars( component->GetFPID().Format() ) ); GetChars( component->GetFPID().Format() ) );
aReporter->Report( msg, REPORTER::RPT_ACTION ); aReporter->Report( msg, REPORTER::RPT_ACTION );
} }
else else
{ {
@ -2297,7 +2343,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{ {
if( aNetlist.GetReplaceFootprints() ) if( aNetlist.GetReplaceFootprints() )
{ {
if( aReporter ) if( aReporter )
{ {
if( component->GetModule() != NULL ) if( component->GetModule() != NULL )
{ {
@ -2340,7 +2386,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
} }
} }
// Test for reference designator field change. // Test for reference designator field change.
if( footprint->GetReference() != component->GetReference() ) if( footprint->GetReference() != component->GetReference() )
{ {
if( aReporter ) if( aReporter )
@ -2373,7 +2419,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
footprint->SetValue( component->GetValue() ); footprint->SetValue( component->GetValue() );
} }
// Test for time stamp change. // Test for time stamp change.
if( footprint->GetPath() != component->GetTimeStamp() ) if( footprint->GetPath() != component->GetTimeStamp() )
{ {
if( aReporter ) if( aReporter )
@ -2393,7 +2439,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
if( footprint == NULL ) if( footprint == NULL )
continue; continue;
// At this point, the component footprint is updated. Now update the nets. // At this point, the component footprint is updated. Now update the nets.
for( pad = footprint->Pads(); pad; pad = pad->Next() ) for( pad = footprint->Pads(); pad; pad = pad->Next() )
{ {
COMPONENT_NET net = component->GetNet( pad->GetPadName() ); COMPONENT_NET net = component->GetNet( pad->GetPadName() );

4
pcbnew/class_board.h
View File

@ -211,10 +211,10 @@ private:
* segment located at \a aPosition on aLayerMask. * segment located at \a aPosition on aLayerMask.
* Vias are put in list but their flags BUSY is not set * Vias are put in list but their flags BUSY is not set
* @param aPosition A wxPoint object containing the position of the starting search. * @param aPosition A wxPoint object containing the position of the starting search.
* @param aLayerMask The allowed layers for segments to search. * @param aLayerSet The allowed layers for segments to search.
* @param aList The track list to fill with points of flagged segments. * @param aList The track list to fill with points of flagged segments.
*/ */
void chainMarkedSegments( wxPoint aPosition, LSET aLayerMask, TRACK_PTRS* aList ); void chainMarkedSegments( wxPoint aPosition, const LSET& aLayerSet, TRACK_PTRS* aList );
public: public:
static inline bool ClassOf( const EDA_ITEM* aItem ) static inline bool ClassOf( const EDA_ITEM* aItem )