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

Make code easier to read/understand.

This commit is contained in:
Jeff Young 2019-05-17 10:29:52 +01:00
parent de055031a3
commit e33871fbf0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/sch_screen.cpp
View File

@ -349,11 +349,13 @@ void SCH_SCREEN::MarkConnections( SCH_LINE* aSegment )
bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew ) bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew )
{ {
bool has_nonparallel[2] = { false }; enum { WIRES, BUSSES } layers;
int end_count[2] = { 0 };
bool has_nonparallel[ sizeof( layers ) ] = { false };
int end_count[ sizeof( layers ) ] = { 0 };
int pin_count = 0; int pin_count = 0;
std::vector<SCH_LINE*> lines[2]; std::vector<SCH_LINE*> lines[ sizeof( layers ) ];
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() ) for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
{ {
@ -363,21 +365,19 @@ bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew )
if( aNew && ( item->Type() == SCH_JUNCTION_T ) && ( item->HitTest( aPosition ) ) ) if( aNew && ( item->Type() == SCH_JUNCTION_T ) && ( item->HitTest( aPosition ) ) )
return false; return false;
if( ( item->Type() == SCH_LINE_T ) if( ( item->Type() == SCH_LINE_T ) && ( item->HitTest( aPosition, 0 ) ) )
&& ( item->HitTest( aPosition, 0 ) ) )
{ {
if( item->GetLayer() == LAYER_WIRE ) if( item->GetLayer() == LAYER_WIRE )
lines[0].push_back( (SCH_LINE*) item ); lines[ WIRES ].push_back( (SCH_LINE*) item );
else if( item->GetLayer() == LAYER_BUS ) else if( item->GetLayer() == LAYER_BUS )
lines[1].push_back( (SCH_LINE*) item ); lines[ BUSSES ].push_back( (SCH_LINE*) item );
} }
if( ( item->Type() == SCH_COMPONENT_T ) if( ( item->Type() == SCH_COMPONENT_T ) && ( item->IsConnected( aPosition ) ) )
&& ( item->IsConnected( aPosition ) ) )
pin_count++; pin_count++;
} }
for( int i = 0; i < 2; i++ ) for( int i : { WIRES, BUSSES } )
{ {
bool removed_overlapping = false; bool removed_overlapping = false;
end_count[i] = lines[i].size(); end_count[i] = lines[i].size();