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

Eeschema: Consider buses for junctions 

Allows buses to acquire junctions based on their connections.  Buses
can only have junctions with other buses.  Also allows buses to be
draggable junctions for collections
This commit is contained in:
Seth Hillbrand 2017-12-12 21:12:06 -08:00 committed by Wayne Stambaugh
parent 23d71cfa93
commit 1396ab0941
3 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,7 +483,7 @@ bool SCH_EDIT_FRAME::SchematicCleanUp( bool aAppend )
PICKED_ITEMS_LIST itemList; PICKED_ITEMS_LIST itemList;
SCH_SCREEN* screen = GetScreen(); SCH_SCREEN* screen = GetScreen();
auto remove_item = [ &itemList, screen ]( SCH_ITEM* aItem ) -> void auto remove_item = [ &itemList ]( SCH_ITEM* aItem ) -> void
{ {
aItem->SetFlags( STRUCT_DELETED ); aItem->SetFlags( STRUCT_DELETED );
itemList.PushItem( ITEM_PICKER( aItem, UR_DELETED ) ); itemList.PushItem( ITEM_PICKER( aItem, UR_DELETED ) );
@ -493,9 +493,9 @@ bool SCH_EDIT_FRAME::SchematicCleanUp( bool aAppend )
for( item = screen->GetDrawItems(); item; item = item->Next() ) for( item = screen->GetDrawItems(); item; item = item->Next() )
{ {
if( ( item->Type() != SCH_LINE_T ) && if( ( item->Type() != SCH_LINE_T )
( item->Type() != SCH_JUNCTION_T ) && && ( item->Type() != SCH_JUNCTION_T )
( item->Type() != SCH_NO_CONNECT_T )) && ( item->Type() != SCH_NO_CONNECT_T ) )
continue; continue;
if( item->GetFlags() & STRUCT_DELETED ) if( item->GetFlags() & STRUCT_DELETED )
@ -503,14 +503,15 @@ bool SCH_EDIT_FRAME::SchematicCleanUp( bool aAppend )
// Remove unneeded junctions // Remove unneeded junctions
if( ( item->Type() == SCH_JUNCTION_T ) if( ( item->Type() == SCH_JUNCTION_T )
&& ( !screen->IsJunctionNeeded( item->GetPosition() ) ) ) && ( !screen->IsJunctionNeeded( item->GetPosition() ) ) )
{ {
remove_item( item ); remove_item( item );
continue; continue;
} }
// Remove zero-length lines // Remove zero-length lines
if( item->Type() == SCH_LINE_T if( item->Type() == SCH_LINE_T
&& ( (SCH_LINE*) item )->IsNull() ) && ( (SCH_LINE*) item )->IsNull() )
{ {
remove_item( item ); remove_item( item );
continue; continue;
@ -524,24 +525,26 @@ bool SCH_EDIT_FRAME::SchematicCleanUp( bool aAppend )
// Merge overlapping lines // Merge overlapping lines
if( item->Type() == SCH_LINE_T ) if( item->Type() == SCH_LINE_T )
{ {
SCH_LINE* firstLine = (SCH_LINE*) item; SCH_LINE* firstLine = (SCH_LINE*) item;
SCH_LINE* secondLine = (SCH_LINE*) secondItem; SCH_LINE* secondLine = (SCH_LINE*) secondItem;
SCH_LINE* line = NULL; SCH_LINE* line = NULL;
bool needed = false; bool needed = false;
if( !secondLine->IsParallel( firstLine ) ) if( !secondLine->IsParallel( firstLine ) )
continue; continue;
// Check if a junction needs to be kept // Remove identical lines
// This can only happen if: if( firstLine->IsEndPoint( secondLine->GetStartPoint() )
// 1) the endpoints overlap, && firstLine->IsEndPoint( secondLine->GetEndPoint() ) )
// 2) the lines are not pointing in the same direction AND {
// 3) IsJunction Needed is false remove_item( secondItem );
if( secondLine->IsEndPoint( firstLine->GetStartPoint() ) continue;
&& !secondLine->IsSameQuadrant( firstLine, firstLine->GetStartPoint() ) ) }
// If the end points overlap, check if we still need the junction
if( secondLine->IsEndPoint( firstLine->GetStartPoint() ) )
needed = screen->IsJunctionNeeded( firstLine->GetStartPoint() ); needed = screen->IsJunctionNeeded( firstLine->GetStartPoint() );
else if( secondLine->IsEndPoint( firstLine->GetEndPoint() ) else if( secondLine->IsEndPoint( firstLine->GetEndPoint() ) )
&& !secondLine->IsSameQuadrant( firstLine, firstLine->GetEndPoint() ) )
needed = screen->IsJunctionNeeded( firstLine->GetEndPoint() ); needed = screen->IsJunctionNeeded( firstLine->GetEndPoint() );
if( !needed && ( line = (SCH_LINE*) secondLine->MergeOverlap( firstLine ) ) ) if( !needed && ( line = (SCH_LINE*) secondLine->MergeOverlap( firstLine ) ) )
@ -558,12 +561,15 @@ bool SCH_EDIT_FRAME::SchematicCleanUp( bool aAppend )
remove_item( secondItem ); remove_item( secondItem );
} }
} }
for( item = screen->GetDrawItems(); item; item = secondItem ) for( item = screen->GetDrawItems(); item; item = secondItem )
{ {
secondItem = item->Next(); secondItem = item->Next();
if( item->GetFlags() & STRUCT_DELETED ) if( item->GetFlags() & STRUCT_DELETED )
screen->Remove( item ); screen->Remove( item );
} }
SaveCopyInUndoList( itemList, UR_CHANGED, aAppend ); SaveCopyInUndoList( itemList, UR_CHANGED, aAppend );
return !!( itemList.GetCount() ); return !!( itemList.GetCount() );

37
eeschema/sch_collectors.cpp
View File

@ -325,42 +325,11 @@ bool SCH_COLLECTOR::IsNode( bool aIncludePins ) const
bool SCH_COLLECTOR::IsDraggableJunction() const bool SCH_COLLECTOR::IsDraggableJunction() const
{ {
int wireEndCount = 0;
int wireMidPoint = 0;
int junctionCount = 0;
for( size_t i = 0; i < m_List.size(); i++ ) for( size_t i = 0; i < m_List.size(); i++ )
{ if( ( (SCH_ITEM*) m_List[ i ] )->Type() == SCH_JUNCTION_T )
SCH_ITEM* item = (SCH_ITEM*) m_List[ i ]; return true;
KICAD_T type = item->Type();
if( type == SCH_JUNCTION_T ) return false;
{
junctionCount++;
continue;
}
if( type == SCH_LINE_T )
{
if( item->GetLayer() != LAYER_WIRE )
return false;
SCH_LINE* line = (SCH_LINE*) item;
if( line->IsEndPoint( m_RefPos ) )
wireEndCount++;
else
wireMidPoint++;
continue;
}
// Any other item types indicate that this collection is not a draggable junction.
return false;
}
return (wireEndCount >= 3) || ((wireEndCount >= 1) && (wireMidPoint == 1))
|| ((wireMidPoint >= 2) && (junctionCount == 1));
} }

73
eeschema/sch_screen.cpp
View File

@ -55,8 +55,6 @@
#include <lib_pin.h> #include <lib_pin.h>
#include <symbol_lib_table.h> #include <symbol_lib_table.h>
#include <boost/foreach.hpp>
#define EESCHEMA_FILE_STAMP "EESchema" #define EESCHEMA_FILE_STAMP "EESchema"
/* Default zoom values. Limited to these values to keep a decent size /* Default zoom values. Limited to these values to keep a decent size
@ -349,11 +347,11 @@ void SCH_SCREEN::MarkConnections( SCH_LINE* aSegment )
bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew ) bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew )
{ {
bool has_line = false; bool has_nonparallel[2] = { false };
bool has_nonparallel = false; int end_count[2] = { 0 };
int end_count = 0; int pin_count = 0;
int pin_count = 0;
std::vector< SCH_LINE* > lines; std::vector<SCH_LINE*> lines[2];
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() ) for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
{ {
@ -364,44 +362,63 @@ bool SCH_SCREEN::IsJunctionNeeded( const wxPoint& aPosition, bool aNew )
return false; return false;
if( ( item->Type() == SCH_LINE_T ) if( ( item->Type() == SCH_LINE_T )
&& ( item->GetLayer() == LAYER_WIRE ) && ( item->HitTest( aPosition, 0 ) ) )
&& ( item->HitTest( aPosition, 0 ) ) ) {
lines.push_back( (SCH_LINE*) item ); if( item->GetLayer() == LAYER_WIRE )
lines[0].push_back( (SCH_LINE*) item );
else if( item->GetLayer() == LAYER_BUS )
lines[1].push_back( (SCH_LINE*) item );
}
if( ( item->Type() == SCH_COMPONENT_T ) if( ( item->Type() == SCH_COMPONENT_T )
&& ( item->IsConnected( aPosition ) ) ) && ( item->IsConnected( aPosition ) ) )
pin_count++; pin_count++;
} }
BOOST_FOREACH( SCH_LINE* line, lines) for( int i = 0; i < 2; i++ )
{ {
if( !line->IsEndPoint( aPosition ) ) bool removed_overlapping = false;
has_line = true; end_count[i] = lines[i].size();
else
end_count++; for( auto line = lines[i].begin(); line < lines[i].end(); line++ )
BOOST_REVERSE_FOREACH( SCH_LINE* second_line, lines )
{ {
if( line == second_line ) // Consider ending on a line to be equivalent to two endpoints because
break; // we will want to split the line if anything else connects
if( line->IsEndPoint( second_line->GetStartPoint() ) if( !(*line)->IsEndPoint( aPosition ) )
&& line->IsEndPoint( second_line->GetEndPoint() ) ) end_count[i]++;
end_count--;
if( !line->IsParallel( second_line ) ) for( auto second_line = lines[i].end() - 1; second_line > line; second_line-- )
has_nonparallel = true; {
if( !(*line)->IsParallel( *second_line ) )
has_nonparallel[i] = true;
else if( !removed_overlapping
&& (*line)->IsSameQuadrant( *second_line, aPosition ) )
{
/**
* Overlapping lines that point in the same direction should not be counted
* as extra end_points. We remove the overlapping lines, being careful to only
* remove them once.
*/
removed_overlapping = true;
end_count[i]--;
}
}
} }
} }
// If there is line intersecting a pin //
if( pin_count && has_line )
return true;
// If there are three or more endpoints // If there are three or more endpoints
if( pin_count + end_count > 2 ) if( pin_count + end_count[0] > 2 )
return true; return true;
// If there is at least one segment that ends on a non-parallel line or // If there is at least one segment that ends on a non-parallel line or
// junction of two other lines // junction of two other lines
if( has_nonparallel && (has_line || end_count > 2 ) ) if( has_nonparallel[0] && end_count[0] > 2 )
return true;
// Check for bus - bus junction requirements
if( has_nonparallel[1] && end_count[1] > 2 )
return true; return true;
return false; return false;