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

eeschema: improve RemoveBacktracks() algorithm (lp:1562521) 

Still isn't perfect, but removes an actual bug. It's still possible to get
weird things if you try hard, but they're not corrupt and don't trip
assertions. Consider a temporary fix.
This commit is contained in:
Chris Pavlina 2016-03-29 20:25:15 -04:00
parent 713e8d93f3
commit 67b4ba0225
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
eeschema/bus-wire-junction.cpp
View File

@ -66,34 +66,45 @@ static DLIST< SCH_ITEM > s_wires; // when creating a new set of wires,
*/ */
static void RemoveBacktracks( DLIST<SCH_ITEM>& aWires ) static void RemoveBacktracks( DLIST<SCH_ITEM>& aWires )
{ {
SCH_LINE* last_line = NULL;
EDA_ITEM* first = aWires.GetFirst(); EDA_ITEM* first = aWires.GetFirst();
std::vector<SCH_LINE*> last_lines;
for( EDA_ITEM* p = first; p; ) for( EDA_ITEM* p = first; p; )
{ {
SCH_LINE *line = dynamic_cast<SCH_LINE*>( p ); SCH_LINE *line = static_cast<SCH_LINE*>( p );
if( !line )
{
wxFAIL_MSG( "RemoveBacktracks() requires SCH_LINE items" );
break;
}
p = line->Next(); p = line->Next();
if( last_line ) if( !last_lines.empty() )
{ {
wxASSERT_MSG( last_line->GetEndPoint() == line->GetStartPoint(), SCH_LINE* last_line = last_lines[last_lines.size() - 1];
"RemoveBacktracks() requires contiguous lines" ); bool contiguous = ( last_line->GetEndPoint() == line->GetStartPoint() );
if( IsPointOnSegment( last_line->GetStartPoint(), line->GetStartPoint(), bool backtracks = IsPointOnSegment( last_line->GetStartPoint(),
line->GetEndPoint() ) ) last_line->GetEndPoint(), line->GetEndPoint() );
bool total_backtrack = ( last_line->GetStartPoint() == line->GetEndPoint() );
if( contiguous && backtracks )
{
if( total_backtrack )
{
delete s_wires.Remove( last_line );
delete s_wires.Remove( line );
last_lines.pop_back();
}
else
{ {
last_line->SetEndPoint( line->GetEndPoint() ); last_line->SetEndPoint( line->GetEndPoint() );
delete s_wires.Remove( line ); delete s_wires.Remove( line );
} }
else
last_line = line;
} }
else else
last_line = line; {
last_lines.push_back( line );
}
}
else
{
last_lines.push_back( line );
}
} }
} }