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

eeschema: Correct junction test routine 

New v6 can test multiple points not previously considered.  This
corrects the test to ensure that junctions are correctly added when
lines are present.

Fixes #3729 | https://gitlab.com/kicad/code/kicad/issues/3729
This commit is contained in:
Seth Hillbrand 2020-01-03 05:38:50 -08:00
parent 3fb085a0b4
commit d1a05e27a5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/sch_screen.cpp
View File

@ -398,13 +398,13 @@ bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew )
for( int i : { WIRES, BUSSES } ) for( int i : { WIRES, BUSSES } )
{ {
bool removed_overlapping = false; bool removed_overlapping = false;
end_count[i] = lines[i].size(); bool mid_point = false;
for( auto line = lines[i].begin(); line < lines[i].end(); line++ ) for( auto line = lines[i].begin(); line < lines[i].end(); line++ )
{ {
// Consider ending on a line to be equivalent to two endpoints because
// we will want to split the line if anything else connects
if( !(*line)->IsEndPoint( aPosition ) ) if( !(*line)->IsEndPoint( aPosition ) )
mid_point = true;
else
end_count[i]++; end_count[i]++;
for( auto second_line = lines[i].end() - 1; second_line > line; second_line-- ) for( auto second_line = lines[i].end() - 1; second_line > line; second_line-- )
@ -414,16 +414,21 @@ bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew )
else if( !removed_overlapping else if( !removed_overlapping
&& (*line)->IsSameQuadrant( *second_line, aPosition ) ) && (*line)->IsSameQuadrant( *second_line, aPosition ) )
{ {
/**
* Overlapping lines that point in the same direction should not be counted
* as extra end_points. We remove the overlapping lines, being careful to only
* remove them once.
*/
removed_overlapping = true; removed_overlapping = true;
end_count[i]--;
} }
} }
} }
/// A line with a midpoint should be counted as two endpoints for this calculation
/// because the junction will split the line into two if there is another item
/// present at the point.
if( mid_point )
end_count[i] += 2;
///Overlapping lines that point in the same direction should not be counted
/// as extra end_points.
if( removed_overlapping )
end_count[i]--;
} }
// If there are three or more endpoints // If there are three or more endpoints