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

Shortened code using VIEW & PAINTER classes in MODULE_TOOLS methods

This commit is contained in:
Maciej Suminski 2017-01-17 13:34:56 +01:00
parent 3dc2050498
commit ee2b1ac321
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/tools/module_tools.cpp
View File

@ -521,10 +521,9 @@ int MODULE_TOOLS::PasteItems( const TOOL_EVENT& aEvent )
int MODULE_TOOLS::ModuleTextOutlines( const TOOL_EVENT& aEvent ) int MODULE_TOOLS::ModuleTextOutlines( const TOOL_EVENT& aEvent )
{ {
KIGFX::PCB_PAINTER* painter = KIGFX::VIEW* view = getView();
static_cast<KIGFX::PCB_PAINTER*>( m_frame->GetGalCanvas()->GetView()->GetPainter() );
KIGFX::PCB_RENDER_SETTINGS* settings = KIGFX::PCB_RENDER_SETTINGS* settings =
static_cast<KIGFX::PCB_RENDER_SETTINGS*>( painter->GetSettings() ); static_cast<KIGFX::PCB_RENDER_SETTINGS*>( view->GetPainter()->GetSettings() );
const LAYER_NUM layers[] = { ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE ), const LAYER_NUM layers[] = { ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE ),
ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ), ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ),
@ -542,11 +541,11 @@ int MODULE_TOOLS::ModuleTextOutlines( const TOOL_EVENT& aEvent )
for( BOARD_ITEM* item = module->GraphicalItems(); item; item = item ->Next() ) for( BOARD_ITEM* item = module->GraphicalItems(); item; item = item ->Next() )
{ {
if( item->Type() == PCB_MODULE_TEXT_T ) if( item->Type() == PCB_MODULE_TEXT_T )
getView()->Update( item, KIGFX::GEOMETRY ); view->Update( item, KIGFX::GEOMETRY );
} }
getView()->Update( &module->Reference(), KIGFX::GEOMETRY ); view->Update( &module->Reference(), KIGFX::GEOMETRY );
getView()->Update( &module->Value(), KIGFX::GEOMETRY ); view->Update( &module->Value(), KIGFX::GEOMETRY );
} }
m_frame->GetGalCanvas()->Refresh(); m_frame->GetGalCanvas()->Refresh();
@ -557,10 +556,9 @@ int MODULE_TOOLS::ModuleTextOutlines( const TOOL_EVENT& aEvent )
int MODULE_TOOLS::ModuleEdgeOutlines( const TOOL_EVENT& aEvent ) int MODULE_TOOLS::ModuleEdgeOutlines( const TOOL_EVENT& aEvent )
{ {
KIGFX::PCB_PAINTER* painter = KIGFX::VIEW* view = getView();
static_cast<KIGFX::PCB_PAINTER*>( m_frame->GetGalCanvas()->GetView()->GetPainter() );
KIGFX::PCB_RENDER_SETTINGS* settings = KIGFX::PCB_RENDER_SETTINGS* settings =
static_cast<KIGFX::PCB_RENDER_SETTINGS*>( painter->GetSettings() ); static_cast<KIGFX::PCB_RENDER_SETTINGS*>( view->GetPainter()->GetSettings() );
const LAYER_ID layers[] = { F_Adhes, B_Adhes, F_Paste, B_Paste, const LAYER_ID layers[] = { F_Adhes, B_Adhes, F_Paste, B_Paste,
F_SilkS, B_SilkS, F_Mask, B_Mask, F_SilkS, B_SilkS, F_Mask, B_Mask,
@ -576,7 +574,7 @@ int MODULE_TOOLS::ModuleEdgeOutlines( const TOOL_EVENT& aEvent )
for( BOARD_ITEM* item = module->GraphicalItems(); item; item = item ->Next() ) for( BOARD_ITEM* item = module->GraphicalItems(); item; item = item ->Next() )
{ {
if( item->Type() == PCB_MODULE_EDGE_T ) if( item->Type() == PCB_MODULE_EDGE_T )
getView()->Update( item, KIGFX::GEOMETRY ); view->Update( item, KIGFX::GEOMETRY );
} }
} }