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

Schematic: orthogonal drag bends should depend on move direction 

Prevents overlapping lines when possible.

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/10844
This commit is contained in:
Mike Williams 2022-02-14 22:52:34 +00:00 committed by Seth Hillbrand
parent a455dd8815
commit 9c59c4ee12
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eeschema/tools/sch_move_tool.cpp
View File

@ -373,6 +373,30 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
VECTOR2I delta( m_cursor - prevPos );
m_anchorPos = m_cursor;
// We need to check if the movement will change the net offset direction on the
// X an Y axes. This is because we remerge added bend lines in realtime, and we
// also account for the direction of the move when adding bend lines. So, if the
// move direction changes, we need to split it into a move that gets us back to
// zero, then the rest of the move.
std::vector<VECTOR2I> splitMoves;
if( std::signbit( m_moveOffset.x ) != std::signbit( ( m_moveOffset + delta ).x ) )
{
splitMoves.emplace_back( VECTOR2I( -1 * m_moveOffset.x, 0 ) );
splitMoves.emplace_back( VECTOR2I( delta.x + m_moveOffset.x, 0 ) );
}
else
splitMoves.emplace_back( VECTOR2I( delta.x, 0 ) );
if( std::signbit( m_moveOffset.y ) != std::signbit( ( m_moveOffset + delta ).y ) )
{
splitMoves.emplace_back( VECTOR2I( 0, -1 * m_moveOffset.y ) );
splitMoves.emplace_back( VECTOR2I( 0, delta.y + m_moveOffset.y ) );
}
else
splitMoves.emplace_back( VECTOR2I( 0, delta.y ) );
m_moveOffset += delta;
prevPos = m_cursor;
@ -381,13 +405,14 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
int yBendCount = 1;
// Split the move into X and Y moves so we can correctly drag orthogonal lines
for( VECTOR2I splitDelta : { VECTOR2I( delta.x, 0 ), VECTOR2I( 0, delta.y ) } )
for( VECTOR2I splitDelta : splitMoves )
{
// Skip non-moves
if( splitDelta == VECTOR2I( 0, 0 ) )
continue;
for( EDA_ITEM* item : selection.GetItemsSortedByTypeAndXY() )
for( EDA_ITEM* item :
selection.GetItemsSortedByTypeAndXY( ( delta.x >= 0 ), ( delta.y >= 0 ) ) )
{
// Don't double move pins, fields, etc.
if( item->GetParent() && item->GetParent()->IsSelected() )
@ -596,7 +621,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
int yLength = abs( unselectedEnd.y - selectedEnd.y );
int xMove = ( xLength - ( xBendCount * grid.GetGrid().x ) )
* sign( selectedEnd.x - unselectedEnd.x );
int yMove = ( yLength - ( yBendCount * grid.GetGrid().y ) )
int yMove = ( yLength - ( yBendCount * grid.GetGrid().y ) )
* sign( selectedEnd.y - unselectedEnd.y );
// Create a new wire ending at the unselected end, we'll

12
include/tool/selection.h
View File

@ -117,7 +117,8 @@ public:
*
* @return Vector of sorted items
*/
const std::vector<EDA_ITEM*> GetItemsSortedByTypeAndXY() const
const std::vector<EDA_ITEM*> GetItemsSortedByTypeAndXY( bool leftBeforeRight = true,
bool topBeforeBottom = true ) const
{
std::vector<EDA_ITEM*> sorted_items =
std::vector<EDA_ITEM*>( m_items.begin(), m_items.end() );
@ -131,10 +132,15 @@ public:
if( a->GetPosition().y == b->GetPosition().y )
return a->m_Uuid < b->m_Uuid;
return a->GetPosition().y < b->GetPosition().y;
if( topBeforeBottom )
return a->GetPosition().y < b->GetPosition().y;
else
return a->GetPosition().y > b->GetPosition().y;
}
else
else if( leftBeforeRight )
return a->GetPosition().x < b->GetPosition().x;
else
return a->GetPosition().x > b->GetPosition().x;
}
else
return a->Type() < b->Type();