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

wxPoint->VECTOR2I correction for master

This commit is contained in:
Seth Hillbrand 2022-02-19 19:14:41 -08:00
parent 24ac516135
commit d1a4daefbb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/tools/sch_line_wire_bus_tool.cpp
View File

@ -998,7 +998,7 @@ int SCH_LINE_WIRE_BUS_TOOL::TrimOverLappingWires( const TOOL_EVENT& aEvent )
for( unsigned ii = 0; ii < aSelection->GetSize(); ii++ ) for( unsigned ii = 0; ii < aSelection->GetSize(); ii++ )
{ {
SCH_ITEM* item = dynamic_cast<SCH_ITEM*>( aSelection->GetItem( ii ) ); SCH_ITEM* item = dynamic_cast<SCH_ITEM*>( aSelection->GetItem( ii ) );
std::vector<wxPoint> pts = item->GetConnectionPoints(); std::vector<VECTOR2I> pts = item->GetConnectionPoints();
if( !item || !item->IsConnectable() || ( item->Type() == SCH_LINE_T ) ) if( !item || !item->IsConnectable() || ( item->Type() == SCH_LINE_T ) )
continue; continue;
@ -1007,9 +1007,9 @@ int SCH_LINE_WIRE_BUS_TOOL::TrimOverLappingWires( const TOOL_EVENT& aEvent )
/// then we can remove the line between the two points. /// then we can remove the line between the two points.
for( SCH_LINE* line : lines ) for( SCH_LINE* line : lines )
{ {
std::vector<wxPoint> conn_pts; std::vector<VECTOR2I> conn_pts;
for( wxPoint pt : pts ) for( VECTOR2I pt : pts )
{ {
if( IsPointOnSegment( line->GetStartPoint(), line->GetEndPoint(), pt ) ) if( IsPointOnSegment( line->GetStartPoint(), line->GetEndPoint(), pt ) )
conn_pts.push_back( pt ); conn_pts.push_back( pt );