Browse Source

Don't cleanup schematic when symbols are rescued.

Schematic cleanup only makes sense after the libraries are fully updated
and loaded.  Before pin caching, this was a minor difference but once we
needed to update pin caches, schematic cleanup can remove junctions from
pin-wire connections incorrectly.

Instead, we use the global OpenProjectFiles() schematic cleanup call to
be sufficient and not call a second time, prior to all libraries being
rescued and loaded.

Fixes: lp:1743148
* https://bugs.launchpad.net/kicad/+bug/1743148
pull/5/merge
Seth Hillbrand 8 years ago
committed by Wayne Stambaugh
parent
commit
2fa5c723d8
  1. 4
      eeschema/bus-wire-junction.cpp
  2. 2
      eeschema/project_rescue.cpp

4
eeschema/bus-wire-junction.cpp

@ -450,7 +450,9 @@ bool SCH_EDIT_FRAME::TrimWire( const wxPoint& aStart, const wxPoint& aEnd, bool
{
next_item = item->Next();
if( item->GetFlags() & STRUCT_DELETED )
// Don't remove wires that are already deleted, are currently being
// dragged or are just created
if( item->GetFlags() & ( STRUCT_DELETED | IS_DRAGGED | IS_NEW ) )
continue;
if( item->Type() != SCH_LINE_T || item->GetLayer() != LAYER_WIRE )

2
eeschema/project_rescue.cpp

@ -586,8 +586,6 @@ bool SCH_EDIT_FRAME::rescueProject( RESCUER& aRescuer, bool aRunningOnDemand )
if( viewer )
viewer->ReCreateListLib();
// Clean up wire ends
SchematicCleanUp();
GetScreen()->ClearUndoORRedoList( GetScreen()->m_UndoList, 1 );
m_canvas->Refresh( true );
OnModify();

Loading…
Cancel
Save