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

pcbnew/class_track.h: remove duplicate class members.

This commit is contained in:
jean-pierre charras 2011-12-13 21:28:25 +01:00
parent a63a2006f0
commit b2c11207e4
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/class_board_connected_item.h
View File

@ -24,11 +24,12 @@ class BOARD_CONNECTED_ITEM : public BOARD_ITEM
{ {
friend class CONNECTIONS; friend class CONNECTIONS;
private: public:
// These 2 members are used for temporary storage during connections calculations: // These 2 members are used for temporary storage during connections calculations:
std::vector<TRACK*> m_TracksConnected; // list of other tracks connected to me std::vector<TRACK*> m_TracksConnected; // list of other tracks connected to me
std::vector<D_PAD*> m_PadsConnected; // list of other pads connected to me std::vector<D_PAD*> m_PadsConnected; // list of other pads connected to me
private:
int m_NetCode; // Net number int m_NetCode; // Net number
int m_Subnet; /* In rastnest routines : for the current net, block number int m_Subnet; /* In rastnest routines : for the current net, block number

2
pcbnew/class_track.h
View File

@ -64,8 +64,6 @@ protected:
public: public:
BOARD_CONNECTED_ITEM* start; // pointers to a connected item (pad or track) BOARD_CONNECTED_ITEM* start; // pointers to a connected item (pad or track)
BOARD_CONNECTED_ITEM* end; BOARD_CONNECTED_ITEM* end;
std::vector<TRACK*> m_TracksConnected; // list of other tracks connected to me
std::vector<D_PAD*> m_PadsConnected; // list of pads connected to me
int m_Param; // Auxiliary variable ( used in some computations ) int m_Param; // Auxiliary variable ( used in some computations )

25
pcbnew/connect.cpp
View File

@ -89,6 +89,11 @@ public:
*/ */
void BuildPadsList( int aNetcode = -1 ); void BuildPadsList( int aNetcode = -1 );
/**
* @return the pads list used in connections calculations
*/
std::vector<D_PAD*>& GetPadsList() { return m_sortedPads; }
/** /**
* Function Build_CurrNet_SubNets_Connections * Function Build_CurrNet_SubNets_Connections
* Connections to pads are assumed to be already initialized, * Connections to pads are assumed to be already initialized,
@ -106,13 +111,13 @@ public:
void Build_CurrNet_SubNets_Connections( TRACK* aFirstTrack, TRACK* aLastTrack ); void Build_CurrNet_SubNets_Connections( TRACK* aFirstTrack, TRACK* aLastTrack );
/** /**
* Function BuildCandidatesList * Function BuildTracksCandidatesList
* Fills m_Candidates with all connecting points (track ends or via location) * Fills m_Candidates with all connecting points (track ends or via location)
* with tracks from aBegin to aEnd. * with tracks from aBegin to aEnd.
* if aBegin == NULL, use first track in brd list * if aBegin == NULL, use first track in brd list
* if aEnd == NULL, uses all tracks from aBegin in brd list * if aEnd == NULL, uses all tracks from aBegin in brd list
*/ */
void BuildCandidatesList( TRACK * aBegin = NULL, TRACK * aEnd = NULL); void BuildTracksCandidatesList( TRACK * aBegin = NULL, TRACK * aEnd = NULL);
/** /**
* function SearchConnectedTracks * function SearchConnectedTracks
@ -134,15 +139,15 @@ public:
} }
/** /**
* function SearchConnectedToPads * function SearchTracksConnectedToPads
* Explores the list of pads and adds to m_PadsConnected member * Explores the list of pads and adds to m_PadsConnected member
* of each track connected the pad(s) connected to * of each track connected the pad(s) connected to
*/ */
void SearchConnectedToPads(); void SearchTracksConnectedToPads();
/** /**
* function CollectItemsNearTo * function CollectItemsNearTo
* Used by SearchConnectedToPads * Used by SearchTracksConnectedToPads
* Fills aList with pads near to aPosition * Fills aList with pads near to aPosition
* near means aPosition to pad position <= aDistMax * near means aPosition to pad position <= aDistMax
* @param aList = list to fill * @param aList = list to fill
@ -232,7 +237,7 @@ void CONNECTIONS::BuildPadsList( int aNetcode )
} }
void CONNECTIONS::SearchConnectedToPads() void CONNECTIONS::SearchTracksConnectedToPads()
{ {
std::vector<CONNECTED_POINT*> candidates; std::vector<CONNECTED_POINT*> candidates;
@ -345,7 +350,7 @@ static bool sortConnectedPointByXthenYCoordinates( const CONNECTED_POINT & aRef,
return aRef.GetPoint().x < aTst.GetPoint().x; return aRef.GetPoint().x < aTst.GetPoint().x;
} }
void CONNECTIONS::BuildCandidatesList( TRACK * aBegin, TRACK * aEnd) void CONNECTIONS::BuildTracksCandidatesList( TRACK * aBegin, TRACK * aEnd)
{ {
m_candidates.clear(); m_candidates.clear();
@ -505,7 +510,7 @@ void CONNECTIONS::Build_CurrNet_SubNets_Connections( TRACK* aFirstTrack, TRACK*
// Pads subnets are expected already cleared, because this function // Pads subnets are expected already cleared, because this function
// does not know the full list of pads // does not know the full list of pads
BuildCandidatesList( aFirstTrack, aLastTrack ); BuildTracksCandidatesList( aFirstTrack, aLastTrack );
for( curr_track = aFirstTrack; curr_track != NULL; curr_track = curr_track->Next() ) for( curr_track = aFirstTrack; curr_track != NULL; curr_track = curr_track->Next() )
{ {
// Clear track subnet id (Pads subnets are cleared outside this function) // Clear track subnet id (Pads subnets are cleared outside this function)
@ -807,10 +812,10 @@ void PCB_BASE_FRAME::RecalculateAllTracksNetcode()
CONNECTIONS connections( m_Pcb ); CONNECTIONS connections( m_Pcb );
connections.BuildPadsList(); connections.BuildPadsList();
connections.BuildCandidatesList(); connections.BuildTracksCandidatesList();
// First pass: build connections between track segments and pads. // First pass: build connections between track segments and pads.
connections.SearchConnectedToPads(); connections.SearchTracksConnectedToPads();
/* For tracks connected to at least one pad, /* For tracks connected to at least one pad,
* set the track net code to the pad netcode * set the track net code to the pad netcode