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

Replace unnecessary global in pl_editor block code

This commit is contained in:
Chris Pavlina 2016-06-11 11:27:12 -04:00
parent d49ecb1b91
commit abf22695c8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pagelayout_editor/block.cpp
View File

@ -40,8 +40,6 @@ static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wx
static void DrawMovingItems( EDA_DRAW_PANEL* aPanel, wxDC* aDC ); static void DrawMovingItems( EDA_DRAW_PANEL* aPanel, wxDC* aDC );
static PL_EDITOR_FRAME* block_frame = NULL;
int PL_EDITOR_FRAME::BlockCommand( EDA_KEY key ) int PL_EDITOR_FRAME::BlockCommand( EDA_KEY key )
{ {
@ -110,7 +108,6 @@ bool PL_EDITOR_FRAME::HandleBlockEnd( wxDC* DC )
if( m_canvas->IsMouseCaptured() ) if( m_canvas->IsMouseCaptured() )
block_frame = this;
switch( GetScreen()->m_BlockLocate.GetCommand() ) switch( GetScreen()->m_BlockLocate.GetCommand() )
{ {
case BLOCK_MOVE: /* Move */ case BLOCK_MOVE: /* Move */
@ -131,7 +128,6 @@ bool PL_EDITOR_FRAME::HandleBlockEnd( wxDC* DC )
if( ! nextcmd ) if( ! nextcmd )
{ {
block_frame = NULL;
GetScreen()->ClearBlockCommand(); GetScreen()->ClearBlockCommand();
m_canvas->EndMouseCapture( GetToolId(), m_canvas->GetCurrentCursor(), wxEmptyString, m_canvas->EndMouseCapture( GetToolId(), m_canvas->GetCurrentCursor(), wxEmptyString,
false ); false );
@ -149,13 +145,14 @@ static void DrawMovingItems( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
// Get items // Get items
WS_DRAW_ITEM_LIST drawList; WS_DRAW_ITEM_LIST drawList;
auto screen = static_cast<PL_EDITOR_SCREEN*>( aPanel->GetScreen() ); auto screen = static_cast<PL_EDITOR_SCREEN*>( aPanel->GetScreen() );
auto frame = static_cast<PL_EDITOR_FRAME*>( aPanel->GetParent() );
drawList.SetPenSize( 0 ); drawList.SetPenSize( 0 );
drawList.SetMilsToIUfactor( IU_PER_MILS ); drawList.SetMilsToIUfactor( IU_PER_MILS );
drawList.SetSheetNumber( screen->m_ScreenNumber ); drawList.SetSheetNumber( screen->m_ScreenNumber );
drawList.SetSheetCount( screen->m_NumberOfScreens ); drawList.SetSheetCount( screen->m_NumberOfScreens );
drawList.SetFileName( block_frame->GetCurrFileName() ); drawList.SetFileName( frame->GetCurrFileName() );
drawList.SetSheetName( block_frame->GetScreenDesc() ); drawList.SetSheetName( frame->GetScreenDesc() );
drawList.BuildWorkSheetGraphicList( block_frame->GetPageSettings(), block_frame->GetTitleBlock(), RED, RED ); drawList.BuildWorkSheetGraphicList( frame->GetPageSettings(), frame->GetTitleBlock(), RED, RED );
std::vector<WS_DRAW_ITEM_BASE*> items; std::vector<WS_DRAW_ITEM_BASE*> items;
drawList.GetAllItems( &items ); drawList.GetAllItems( &items );