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

PNS formatting code.

This commit is contained in:
Maciej Suminski 2014-05-31 16:04:25 +02:00
parent b1a19b1225
commit 2619ceae03
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/router/pns_line_placer.cpp
View File

@ -402,7 +402,7 @@ bool PNS_LINE_PLACER::handleViaPlacement( PNS_LINE& aHead )
} }
bool PNS_LINE_PLACER::rhWalkOnly ( const VECTOR2I& aP, PNS_LINE& aNewHead ) bool PNS_LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, PNS_LINE& aNewHead )
{ {
SHAPE_LINE_CHAIN line = m_direction.BuildInitialTrace( m_p_start, aP ); SHAPE_LINE_CHAIN line = m_direction.BuildInitialTrace( m_p_start, aP );
PNS_LINE initTrack( m_head, line ), walkFull; PNS_LINE initTrack( m_head, line ), walkFull;
@ -829,9 +829,9 @@ void PNS_LINE_PLACER::Move( const VECTOR2I& aP, PNS_ITEM* aEndItem )
if( !current.PointCount() ) if( !current.PointCount() )
m_currentEnd = m_p_start; m_currentEnd = m_p_start;
else else
m_currentEnd = current.CLine().CPoint(-1); m_currentEnd = current.CLine().CPoint( -1 );
PNS_NODE *latestNode = m_currentNode; PNS_NODE* latestNode = m_currentNode;
m_lastNode = latestNode->Branch(); m_lastNode = latestNode->Branch();
if( eiDepth >= 0 && aEndItem && latestNode->Depth() > eiDepth && if( eiDepth >= 0 && aEndItem && latestNode->Depth() > eiDepth &&

21
pcbnew/router/pns_router.cpp
View File

@ -235,7 +235,6 @@ PNS_ITEM* PNS_ROUTER::syncVia( VIA* aVia )
aVia->GetDrillValue(), aVia->GetDrillValue(),
aVia->GetNetCode() ); aVia->GetNetCode() );
v->SetDrill ( aVia->GetDrill() );
v->SetParent( aVia ); v->SetParent( aVia );
return v; return v;
@ -463,7 +462,7 @@ bool PNS_ROUTER::StartDragging( const VECTOR2I& aP, PNS_ITEM* aStartItem )
if( !aStartItem || aStartItem->OfKind( PNS_ITEM::SOLID ) ) if( !aStartItem || aStartItem->OfKind( PNS_ITEM::SOLID ) )
return false; return false;
m_dragger = new PNS_DRAGGER ( this ); m_dragger = new PNS_DRAGGER( this );
m_dragger->SetWorld( m_world ); m_dragger->SetWorld( m_world );
if( m_dragger->Start ( aP, aStartItem ) ) if( m_dragger->Start ( aP, aStartItem ) )
@ -485,7 +484,7 @@ bool PNS_ROUTER::StartRouting( const VECTOR2I& aP, PNS_ITEM* aStartItem )
m_placer = new PNS_LINE_PLACER( this ); m_placer = new PNS_LINE_PLACER( this );
m_placer->SetLayer( m_currentLayer ); m_placer->SetLayer( m_currentLayer );
m_placer->SetWidth ( m_settings.GetTrackWidth() ); m_placer->SetWidth( m_settings.GetTrackWidth() );
m_placer->Start( aP, aStartItem ); m_placer->Start( aP, aStartItem );
m_currentEnd = aP; m_currentEnd = aP;
m_currentEndItem = NULL; m_currentEndItem = NULL;
@ -575,7 +574,7 @@ void PNS_ROUTER::Move( const VECTOR2I& aP, PNS_ITEM* endItem )
break; break;
case DRAG_SEGMENT: case DRAG_SEGMENT:
moveDragging (aP, endItem ); moveDragging( aP, endItem );
break; break;
default: default:
@ -598,7 +597,7 @@ void PNS_ROUTER::moveDragging( const VECTOR2I& aP, PNS_ITEM* aEndItem )
void PNS_ROUTER::markViolations( PNS_NODE* aNode, PNS_ITEMSET& aCurrent, void PNS_ROUTER::markViolations( PNS_NODE* aNode, PNS_ITEMSET& aCurrent,
PNS_NODE::ITEM_VECTOR& aRemoved ) PNS_NODE::ITEM_VECTOR& aRemoved )
{ {
BOOST_FOREACH( PNS_ITEM *item, aCurrent.Items() ) BOOST_FOREACH( PNS_ITEM* item, aCurrent.Items() )
{ {
PNS_NODE::OBSTACLES obstacles; PNS_NODE::OBSTACLES obstacles;
@ -606,11 +605,11 @@ void PNS_ROUTER::markViolations( PNS_NODE* aNode, PNS_ITEMSET& aCurrent,
if( item->OfKind( PNS_ITEM::LINE ) ) if( item->OfKind( PNS_ITEM::LINE ) )
{ {
PNS_LINE *l = static_cast<PNS_LINE*>( item ); PNS_LINE* l = static_cast<PNS_LINE*>( item );
if( l->EndsWithVia() ) if( l->EndsWithVia() )
{ {
PNS_VIA v ( l->Via() ); PNS_VIA v( l->Via() );
aNode->QueryColliding( &v, obstacles, PNS_ITEM::ANY ); aNode->QueryColliding( &v, obstacles, PNS_ITEM::ANY );
} }
} }
@ -685,8 +684,8 @@ void PNS_ROUTER::movePlacing( const VECTOR2I& aP, PNS_ITEM* aEndItem )
if( current.EndsWithVia() ) if( current.EndsWithVia() )
DisplayItem( &current.Via() ); DisplayItem( &current.Via() );
PNS_ITEMSET tmp ( &current ); PNS_ITEMSET tmp( &current );
updateView ( m_placer->CurrentNode ( true ), tmp ); updateView( m_placer->CurrentNode( true ), tmp );
} }
@ -836,7 +835,7 @@ void PNS_ROUTER::FlipPosture()
if( m_state == ROUTE_TRACK ) if( m_state == ROUTE_TRACK )
{ {
m_placer->FlipPosture(); m_placer->FlipPosture();
m_placer->Move ( m_currentEnd, m_currentEndItem ); m_placer->Move( m_currentEnd, m_currentEndItem );
} }
} }
@ -915,5 +914,5 @@ void PNS_ROUTER::DumpLog()
} }
if( logger ) if( logger )
logger->Save ( "/tmp/shove.log" ); logger->Save( "/tmp/shove.log" );
} }

2
pcbnew/router/router_tool.cpp
View File

@ -264,7 +264,7 @@ int ROUTER_TOOL::getDefaultWidth( int aNetCode )
void ROUTER_TOOL::getNetclassDimensions( int aNetCode, int& aWidth, void ROUTER_TOOL::getNetclassDimensions( int aNetCode, int& aWidth,
int& aViaDiameter, int& aViaDrill ) int& aViaDiameter, int& aViaDrill )
{ {
BOARD* board = getModel<BOARD>( PCB_T ); BOARD* board = getModel<BOARD>( PCB_T );
BOARD_DESIGN_SETTINGS &bds = board->GetDesignSettings(); BOARD_DESIGN_SETTINGS &bds = board->GetDesignSettings();