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

Be cognizant of connectivity dirtiness when cloning wires. 

While the root case is wires, it really applies to all SCH_ITEMs.

Fixes https://gitlab.com/kicad/code/kicad/issues/9628
This commit is contained in:
Jeff Young 2021-11-25 00:50:00 +00:00
parent f11cc904d2
commit 5d751bef74
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,9 +298,10 @@ bool SCH_EDIT_FRAME::BreakSegment( SCH_LINE* aSegment, const wxPoint& aPoint,
if( aScreen == nullptr ) if( aScreen == nullptr )
aScreen = GetScreen(); aScreen = GetScreen();
SCH_LINE* newSegment = new SCH_LINE( *aSegment ); SCH_LINE* newSegment = static_cast<SCH_LINE*>( aSegment->Duplicate() );
newSegment->SetStartPoint( aPoint ); newSegment->SetStartPoint( aPoint );
newSegment->SetConnectivityDirty( true );
AddToScreen( newSegment, aScreen ); AddToScreen( newSegment, aScreen );
SaveCopyInUndoList( aScreen, newSegment, UNDO_REDO::NEWITEM, true ); SaveCopyInUndoList( aScreen, newSegment, UNDO_REDO::NEWITEM, true );

4
eeschema/sch_item.cpp
View File

@ -55,7 +55,7 @@ SCH_ITEM::SCH_ITEM( const SCH_ITEM& aItem ) :
{ {
m_layer = aItem.m_layer; m_layer = aItem.m_layer;
m_fieldsAutoplaced = aItem.m_fieldsAutoplaced; m_fieldsAutoplaced = aItem.m_fieldsAutoplaced;
m_connectivity_dirty = false; // Item is unconnected until it is placed, so it's clean m_connectivity_dirty = aItem.m_connectivity_dirty;
} }
@ -63,7 +63,7 @@ SCH_ITEM& SCH_ITEM::operator=( const SCH_ITEM& aItem )
{ {
m_layer = aItem.m_layer; m_layer = aItem.m_layer;
m_fieldsAutoplaced = aItem.m_fieldsAutoplaced; m_fieldsAutoplaced = aItem.m_fieldsAutoplaced;
m_connectivity_dirty = false; // Item is unconnected until it is placed, so it's clean m_connectivity_dirty = aItem.m_connectivity_dirty;
return *this; return *this;
} }

34
eeschema/sch_line.cpp
View File

@ -118,7 +118,10 @@ PLOT_DASH_TYPE SCH_LINE::GetLineStyleByName( const wxString& aStyleName )
//find the name by value //find the name by value
auto resultIt = std::find_if( lineStyleNames.begin(), lineStyleNames.end(), auto resultIt = std::find_if( lineStyleNames.begin(), lineStyleNames.end(),
[aStyleName]( const auto& it ) { return it.second == aStyleName; } ); [aStyleName]( const auto& it )
{
return it.second == aStyleName;
} );
if( resultIt != lineStyleNames.end() ) if( resultIt != lineStyleNames.end() )
id = resultIt->first; id = resultIt->first;
@ -518,13 +521,14 @@ bool SCH_LINE::IsParallel( const SCH_LINE* aLine ) const
SCH_LINE* SCH_LINE::MergeOverlap( SCH_SCREEN* aScreen, SCH_LINE* aLine, bool aCheckJunctions ) SCH_LINE* SCH_LINE::MergeOverlap( SCH_SCREEN* aScreen, SCH_LINE* aLine, bool aCheckJunctions )
{ {
auto less = []( const wxPoint& lhs, const wxPoint& rhs ) -> bool auto less =
{ []( const wxPoint& lhs, const wxPoint& rhs ) -> bool
if( lhs.x == rhs.x ) {
return lhs.y < rhs.y; if( lhs.x == rhs.x )
return lhs.y < rhs.y;
return lhs.x < rhs.x; return lhs.x < rhs.x;
}; };
wxCHECK_MSG( aLine != nullptr && aLine->Type() == SCH_LINE_T, nullptr, wxCHECK_MSG( aLine != nullptr && aLine->Type() == SCH_LINE_T, nullptr,
wxT( "Cannot test line segment for overlap." ) ); wxT( "Cannot test line segment for overlap." ) );
@ -532,11 +536,11 @@ SCH_LINE* SCH_LINE::MergeOverlap( SCH_SCREEN* aScreen, SCH_LINE* aLine, bool aCh
if( this == aLine || GetLayer() != aLine->GetLayer() ) if( this == aLine || GetLayer() != aLine->GetLayer() )
return nullptr; return nullptr;
auto leftmost_start = aLine->m_start; wxPoint leftmost_start = aLine->m_start;
auto leftmost_end = aLine->m_end; wxPoint leftmost_end = aLine->m_end;
auto rightmost_start = m_start; wxPoint rightmost_start = m_start;
auto rightmost_end = m_end; wxPoint rightmost_end = m_end;
// We place the start to the left and below the end of both lines // We place the start to the left and below the end of both lines
if( leftmost_start != std::min( { leftmost_start, leftmost_end }, less ) ) if( leftmost_start != std::min( { leftmost_start, leftmost_end }, less ) )
@ -572,9 +576,10 @@ SCH_LINE* SCH_LINE::MergeOverlap( SCH_SCREEN* aScreen, SCH_LINE* aLine, bool aCh
// Search for a common end: // Search for a common end:
if( ( leftmost_start == other_start ) && ( leftmost_end == other_end ) ) // Trivial case if( ( leftmost_start == other_start ) && ( leftmost_end == other_end ) ) // Trivial case
{ {
auto ret = new SCH_LINE( *aLine ); SCH_LINE* ret = new SCH_LINE( *aLine );
ret->SetStartPoint( leftmost_start ); ret->SetStartPoint( leftmost_start );
ret->SetEndPoint( leftmost_end ); ret->SetEndPoint( leftmost_end );
ret->SetConnectivityDirty( true );
if( IsSelected() || aLine->IsSelected() ) if( IsSelected() || aLine->IsSelected() )
ret->SetSelected(); ret->SetSelected();
@ -623,9 +628,10 @@ SCH_LINE* SCH_LINE::MergeOverlap( SCH_SCREEN* aScreen, SCH_LINE* aLine, bool aCh
// Make a new segment that merges the 2 segments // Make a new segment that merges the 2 segments
leftmost_end = rightmost_end; leftmost_end = rightmost_end;
auto ret = new SCH_LINE( *aLine ); SCH_LINE* ret = new SCH_LINE( *aLine );
ret->SetStartPoint( leftmost_start ); ret->SetStartPoint( leftmost_start );
ret->SetEndPoint( leftmost_end ); ret->SetEndPoint( leftmost_end );
ret->SetConnectivityDirty( true );
if( IsSelected() || aLine->IsSelected() ) if( IsSelected() || aLine->IsSelected() )
ret->SetSelected(); ret->SetSelected();
@ -804,7 +810,7 @@ bool SCH_LINE::operator <( const SCH_ITEM& aItem ) const
if( Type() != aItem.Type() ) if( Type() != aItem.Type() )
return Type() < aItem.Type(); return Type() < aItem.Type();
auto line = static_cast<const SCH_LINE*>( &aItem ); const SCH_LINE* line = static_cast<const SCH_LINE*>( &aItem );
if( GetLayer() != line->GetLayer() ) if( GetLayer() != line->GetLayer() )
return GetLayer() < line->GetLayer(); return GetLayer() < line->GetLayer();