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

Eeschema: Improve wire merging 

CHANGED: wires now merge along the full length rather than just
endpoints.  Wires also merge at oblique angles when aligned.
This commit is contained in:
Seth Hillbrand 2017-11-17 08:35:20 -08:00 committed by jean-pierre charras
parent 10de79260d
commit b6884d3423
1 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
eeschema/sch_line.cpp
View File

@ -424,66 +424,6 @@ void SCH_LINE::Rotate( wxPoint aPosition )
*/
bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
{
wxCHECK_MSG( aLine != NULL && aLine->Type() == SCH_LINE_T, false,
wxT( "Cannot test line segment for overlap." ) );
if( this == aLine || GetLayer() != aLine->GetLayer() )
return false;
// Search for a common end:
if( m_start == aLine->m_start )
{
if( m_end == aLine->m_end ) // Trivial case
return true;
}
else if( m_start == aLine->m_end )
{
if( m_end == aLine->m_start ) // Trivial case
return true;
}
else if( m_end == aLine->m_end )
{
std::swap( aLine->m_start, aLine->m_end );
}
else if( m_end != aLine->m_start )
{
// No common end point, segments cannot be merged.
return false;
}
bool colinear = false;
/* Test alignment: */
if( m_start.y == m_end.y ) // Horizontal segment
{
if( aLine->m_start.y == aLine->m_end.y )
{
colinear = true;
}
}
else if( m_start.x == m_end.x ) // Vertical segment
{
if( aLine->m_start.x == aLine->m_end.x )
{
colinear = true;
}
}
else
{
if( atan2( (double) ( m_start.x - m_end.x ), (double) ( m_start.y - m_end.y ) )
== atan2( (double) ( aLine->m_start.x - aLine->m_end.x ),
(double) ( aLine->m_start.y - aLine->m_end.y ) ) )
{
colinear = true;
}
}
// Make a segment which merge the 2 segments
// we must find the extremums
// i.e. the more to the left and to the right points, or
// for horizontal segments the uppermost and the lowest point
if( colinear )
{
auto less = []( const wxPoint& lhs, const wxPoint& rhs ) -> bool
{
if( lhs.x == rhs.x )
@ -491,13 +431,85 @@ bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
return lhs.x < rhs.x;
};
wxPoint top_left = std::min( { m_start, m_end, aLine->m_start, aLine->m_end }, less );
wxPoint bottom_right = std::max( { m_start, m_end, aLine->m_start, aLine->m_end }, less );
wxCHECK_MSG( aLine != NULL && aLine->Type() == SCH_LINE_T, false,
wxT( "Cannot test line segment for overlap." ) );
m_start = top_left;
m_end = bottom_right;
if( this == aLine || GetLayer() != aLine->GetLayer() )
return false;
SCH_LINE leftmost = SCH_LINE( *aLine );
SCH_LINE rightmost = SCH_LINE( *this );
// We place the start to the left and below the end of both lines
if( leftmost.m_start != std::min( { leftmost.m_start, leftmost.m_end }, less ) )
std::swap( leftmost.m_start, leftmost.m_end );
if( rightmost.m_start != std::min( { rightmost.m_start, rightmost.m_end }, less ) )
std::swap( rightmost.m_start, rightmost.m_end );
// -leftmost is the line that starts farthest to the left
// -other is the line that is _not_ leftmost
// -rightmost is the line that ends farthest to the right. This may or
// may not be 'other' as the second line may be completely covered by
// the first.
if( less( rightmost.m_start, leftmost.m_start ) )
std::swap( leftmost, rightmost );
SCH_LINE other = SCH_LINE( rightmost );
if( less( rightmost.m_end, leftmost.m_end ) )
rightmost = leftmost;
// If we end one before the beginning of the other, no overlap is possible
if( less( leftmost.m_end, other.m_start ) )
{
return false;
}
// Search for a common end:
if( ( leftmost.m_start == other.m_start )
&& ( leftmost.m_end == other.m_end ) ) // Trivial case
{
m_start = leftmost.m_start;
m_end = leftmost.m_end;
return true;
}
bool colinear = false;
/* Test alignment: */
if( ( leftmost.m_start.y == leftmost.m_end.y )
&& ( other.m_start.y == other.m_end.y ) ) // Horizontal segment
{
colinear = ( leftmost.m_start.y == other.m_start.y );
}
else if( ( leftmost.m_start.x == leftmost.m_end.x )
&& ( other.m_start.x == other.m_end.x ) ) // Vertical segment
{
colinear = ( leftmost.m_start.x == other.m_start.x );
}
else
{
// We use long long here to avoid overflow -- it enforces promotion
// Don't use double as we need to make a direct comparison
// The slope of the left-most line is dy/dx. Then we check that the slope
// from the left most start to the right most start is the same as well as
// the slope from the left most start to right most end.
long long dx = leftmost.m_end.x - leftmost.m_start.x;
long long dy = leftmost.m_end.y - leftmost.m_start.y;
colinear = ( ( ( other.m_start.y - leftmost.m_start.y ) * dx ==
( other.m_start.x - leftmost.m_start.x ) * dy ) &&
( ( other.m_end.y - leftmost.m_start.y ) * dx ==
( other.m_end.x - leftmost.m_start.x ) * dy ) );
}
// Make a new segment that merges the 2 segments
if( colinear )
{
m_start = leftmost.m_start;
m_end = rightmost.m_end;
return true;
}
return false;
}