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

Code formatting.

This commit is contained in:
Maciej Suminski 2015-05-18 13:48:11 +02:00
parent 2043d4696f
commit 15cefcda9f
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
pcbnew/router/router_tool.cpp
View File

@ -245,7 +245,7 @@ public:
Add( ACT_CustomTrackWidth ); Add( ACT_CustomTrackWidth );
if ( aMode == PNS_MODE_ROUTE_DIFF_PAIR ) if( aMode == PNS_MODE_ROUTE_DIFF_PAIR )
Add( ACT_SetDpDimensions ); Add( ACT_SetDpDimensions );
AppendSeparator(); AppendSeparator();
@ -270,6 +270,7 @@ void ROUTER_TOOL::Reset( RESET_REASON aReason )
} }
int ROUTER_TOOL::getDefaultWidth( int aNetCode ) int ROUTER_TOOL::getDefaultWidth( int aNetCode )
{ {
int w, d1, d2; int w, d1, d2;
@ -351,12 +352,13 @@ void ROUTER_TOOL::handleCommonEvents( const TOOL_EVENT& aEvent )
else if( aEvent.IsAction( &COMMON_ACTIONS::trackViaSizeChanged ) ) else if( aEvent.IsAction( &COMMON_ACTIONS::trackViaSizeChanged ) )
{ {
PNS_SIZES_SETTINGS sizes ( m_router->Sizes() ); PNS_SIZES_SETTINGS sizes( m_router->Sizes() );
sizes.ImportCurrent ( m_board->GetDesignSettings() ); sizes.ImportCurrent( m_board->GetDesignSettings() );
m_router->UpdateSizes ( sizes ); m_router->UpdateSizes( sizes );
} }
} }
int ROUTER_TOOL::getStartLayer( const PNS_ITEM* aItem ) int ROUTER_TOOL::getStartLayer( const PNS_ITEM* aItem )
{ {
int tl = getView()->GetTopLayer(); int tl = getView()->GetTopLayer();
@ -373,6 +375,8 @@ int ROUTER_TOOL::getStartLayer( const PNS_ITEM* aItem )
return tl; return tl;
} }
void ROUTER_TOOL::switchLayerOnViaPlacement() void ROUTER_TOOL::switchLayerOnViaPlacement()
{ {
int al = m_frame->GetActiveLayer(); int al = m_frame->GetActiveLayer();
@ -387,11 +391,12 @@ void ROUTER_TOOL::switchLayerOnViaPlacement()
if( newLayer ) if( newLayer )
{ {
m_router->SwitchLayer ( *newLayer ); m_router->SwitchLayer( *newLayer );
m_frame->SetActiveLayer ( ToLAYER_ID( *newLayer ) ); m_frame->SetActiveLayer( ToLAYER_ID( *newLayer ) );
} }
} }
bool ROUTER_TOOL::onViaCommand( VIATYPE_T aType ) bool ROUTER_TOOL::onViaCommand( VIATYPE_T aType )
{ {
BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings(); BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings();
@ -411,6 +416,7 @@ bool ROUTER_TOOL::onViaCommand( VIATYPE_T aType )
// Cannot place microvias or blind vias if not allowed (obvious) // Cannot place microvias or blind vias if not allowed (obvious)
if( ( aType == VIA_BLIND_BURIED ) && ( !bds.m_BlindBuriedViaAllowed ) ) if( ( aType == VIA_BLIND_BURIED ) && ( !bds.m_BlindBuriedViaAllowed ) )
return false; return false;
if( ( aType == VIA_MICROVIA ) && ( !bds.m_MicroViasAllowed ) ) if( ( aType == VIA_MICROVIA ) && ( !bds.m_MicroViasAllowed ) )
return false; return false;
@ -428,8 +434,8 @@ bool ROUTER_TOOL::onViaCommand( VIATYPE_T aType )
} }
sizes.SetViaType ( aType ); sizes.SetViaType( aType );
m_router->ToggleViaPlacement( ); m_router->ToggleViaPlacement();
m_router->UpdateSizes( sizes ); m_router->UpdateSizes( sizes );
m_router->Move( m_endSnapPoint, m_endItem ); // refresh m_router->Move( m_endSnapPoint, m_endItem ); // refresh
@ -440,8 +446,8 @@ bool ROUTER_TOOL::onViaCommand( VIATYPE_T aType )
bool ROUTER_TOOL::prepareInteractive() bool ROUTER_TOOL::prepareInteractive()
{ {
int routingLayer = getStartLayer ( m_startItem ); int routingLayer = getStartLayer( m_startItem );
m_frame->SetActiveLayer( ToLAYER_ID ( routingLayer ) ); m_frame->SetActiveLayer( ToLAYER_ID( routingLayer ) );
// fixme: switch on invisible layer // fixme: switch on invisible layer
@ -457,17 +463,17 @@ bool ROUTER_TOOL::prepareInteractive()
m_ctls->ForceCursorPosition( false ); m_ctls->ForceCursorPosition( false );
m_ctls->SetAutoPan( true ); m_ctls->SetAutoPan( true );
PNS_SIZES_SETTINGS sizes ( m_router->Sizes() ); PNS_SIZES_SETTINGS sizes( m_router->Sizes() );
sizes.Init ( m_board, m_startItem ); sizes.Init( m_board, m_startItem );
sizes.AddLayerPair ( m_frame->GetScreen()->m_Route_Layer_TOP, sizes.AddLayerPair( m_frame->GetScreen()->m_Route_Layer_TOP,
m_frame->GetScreen()->m_Route_Layer_BOTTOM ); m_frame->GetScreen()->m_Route_Layer_BOTTOM );
m_router->UpdateSizes( sizes ); m_router->UpdateSizes( sizes );
if ( !m_router->StartRouting( m_startSnapPoint, m_startItem, routingLayer ) ) if( !m_router->StartRouting( m_startSnapPoint, m_startItem, routingLayer ) )
{ {
wxMessageBox ( m_router->FailureReason(), _( "Error" ) ); wxMessageBox( m_router->FailureReason(), _( "Error" ) );
highlightNet ( false ); highlightNet( false );
return false; return false;
} }
@ -477,6 +483,7 @@ bool ROUTER_TOOL::prepareInteractive()
return true; return true;
} }
bool ROUTER_TOOL::finishInteractive( bool aSaveUndoBuffer ) bool ROUTER_TOOL::finishInteractive( bool aSaveUndoBuffer )
{ {
m_router->StopRouting(); m_router->StopRouting();
@ -501,11 +508,12 @@ bool ROUTER_TOOL::finishInteractive( bool aSaveUndoBuffer )
return true; return true;
} }
void ROUTER_TOOL::performRouting() void ROUTER_TOOL::performRouting()
{ {
bool saveUndoBuffer = true; bool saveUndoBuffer = true;
if ( !prepareInteractive( ) ) if( !prepareInteractive( ) )
return; return;
while( OPT_TOOL_EVENT evt = Wait() ) while( OPT_TOOL_EVENT evt = Wait() )
@ -520,7 +528,7 @@ void ROUTER_TOOL::performRouting()
else if( evt->IsMotion() ) else if( evt->IsMotion() )
{ {
updateEndItem( *evt ); updateEndItem( *evt );
m_router->SetOrthoMode ( evt->Modifier ( MD_CTRL ) ); m_router->SetOrthoMode( evt->Modifier( MD_CTRL ) );
m_router->Move( m_endSnapPoint, m_endItem ); m_router->Move( m_endSnapPoint, m_endItem );
} }
else if( evt->IsClick( BUT_LEFT ) ) else if( evt->IsClick( BUT_LEFT ) )
@ -540,15 +548,15 @@ void ROUTER_TOOL::performRouting()
} }
else if( evt->IsAction( &ACT_PlaceThroughVia ) ) else if( evt->IsAction( &ACT_PlaceThroughVia ) )
{ {
onViaCommand ( VIA_THROUGH ); onViaCommand( VIA_THROUGH );
} }
else if( evt->IsAction( &ACT_PlaceBlindVia ) ) else if( evt->IsAction( &ACT_PlaceBlindVia ) )
{ {
onViaCommand ( VIA_BLIND_BURIED ); onViaCommand( VIA_BLIND_BURIED );
} }
else if( evt->IsAction( &ACT_PlaceMicroVia ) ) else if( evt->IsAction( &ACT_PlaceMicroVia ) )
{ {
onViaCommand ( VIA_MICROVIA ); onViaCommand( VIA_MICROVIA );
} }
else if( evt->IsAction( &ACT_SwitchPosture ) ) else if( evt->IsAction( &ACT_SwitchPosture ) )
{ {
@ -570,9 +578,10 @@ void ROUTER_TOOL::performRouting()
handleCommonEvents( *evt ); handleCommonEvents( *evt );
} }
finishInteractive ( saveUndoBuffer ); finishInteractive( saveUndoBuffer );
} }
int ROUTER_TOOL::DpDimensionsDialog( const TOOL_EVENT& aEvent ) int ROUTER_TOOL::DpDimensionsDialog( const TOOL_EVENT& aEvent )
{ {
Activate(); Activate();
@ -589,6 +598,7 @@ int ROUTER_TOOL::DpDimensionsDialog( const TOOL_EVENT& aEvent )
return 0; return 0;
} }
int ROUTER_TOOL::SettingsDialog( const TOOL_EVENT& aEvent ) int ROUTER_TOOL::SettingsDialog( const TOOL_EVENT& aEvent )
{ {
Activate(); Activate();
@ -609,12 +619,14 @@ int ROUTER_TOOL::RouteSingleTrace( const TOOL_EVENT& aEvent )
return mainLoop( PNS_MODE_ROUTE_SINGLE ); return mainLoop( PNS_MODE_ROUTE_SINGLE );
} }
int ROUTER_TOOL::RouteDiffPair( const TOOL_EVENT& aEvent ) int ROUTER_TOOL::RouteDiffPair( const TOOL_EVENT& aEvent )
{ {
m_frame->SetToolID( ID_TRACK_BUTT, wxCURSOR_PENCIL, _( "Router Differential Pair" ) ); m_frame->SetToolID( ID_TRACK_BUTT, wxCURSOR_PENCIL, _( "Router Differential Pair" ) );
return mainLoop( PNS_MODE_ROUTE_DIFF_PAIR ); return mainLoop( PNS_MODE_ROUTE_DIFF_PAIR );
} }
int ROUTER_TOOL::mainLoop( PNS_ROUTER_MODE aMode ) int ROUTER_TOOL::mainLoop( PNS_ROUTER_MODE aMode )
{ {
PCB_EDIT_FRAME* frame = getEditFrame<PCB_EDIT_FRAME>(); PCB_EDIT_FRAME* frame = getEditFrame<PCB_EDIT_FRAME>();
@ -625,13 +637,13 @@ int ROUTER_TOOL::mainLoop( PNS_ROUTER_MODE aMode )
Activate(); Activate();
m_router->SetMode ( aMode ); m_router->SetMode( aMode );
m_ctls->SetSnapping( true ); m_ctls->SetSnapping( true );
m_ctls->ShowCursor( true ); m_ctls->ShowCursor( true );
std::auto_ptr<ROUTER_TOOL_MENU> ctxMenu ( new ROUTER_TOOL_MENU( board, aMode ) ); std::auto_ptr<ROUTER_TOOL_MENU> ctxMenu( new ROUTER_TOOL_MENU( board, aMode ) );
SetContextMenu ( ctxMenu.get() ); SetContextMenu( ctxMenu.get() );
// Main loop: keep receiving events // Main loop: keep receiving events
while( OPT_TOOL_EVENT evt = Wait() ) while( OPT_TOOL_EVENT evt = Wait() )
@ -676,6 +688,7 @@ int ROUTER_TOOL::mainLoop( PNS_ROUTER_MODE aMode )
return 0; return 0;
} }
void ROUTER_TOOL::performDragging() void ROUTER_TOOL::performDragging()
{ {
PCB_EDIT_FRAME* frame = getEditFrame<PCB_EDIT_FRAME>(); PCB_EDIT_FRAME* frame = getEditFrame<PCB_EDIT_FRAME>();
@ -737,7 +750,8 @@ void ROUTER_TOOL::performDragging()
highlightNet( false ); highlightNet( false );
} }
int ROUTER_TOOL::InlineDrag ( const TOOL_EVENT& aEvent )
int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
{ {
return 0; return 0;
} }