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

Repair initialization order in FOOTPRINT_VIEWER_FRAME. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5267
This commit is contained in:
Jeff Young 2020-08-19 20:11:10 +01:00
parent 4cd994611b
commit a13f6c3922
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/footprint_viewer_frame.cpp
View File

@ -169,6 +169,12 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
fpPanel->SetSizer( fpSizer ); fpPanel->SetSizer( fpSizer );
fpPanel->Fit(); fpPanel->Fit();
// Create GAL canvas
m_canvasType = LoadCanvasTypeSetting();
auto drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
GetGalDisplayOptions(), m_canvasType );
SetCanvas( drawPanel );
SetBoard( new BOARD() ); SetBoard( new BOARD() );
// In viewer, the default net clearance is not known (it depends on the actual board). // In viewer, the default net clearance is not known (it depends on the actual board).
// So we do not show the default clearance, by setting it to 0 // So we do not show the default clearance, by setting it to 0
@ -187,12 +193,6 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
LoadSettings( config() ); LoadSettings( config() );
GetGalDisplayOptions().m_axesEnabled = true; GetGalDisplayOptions().m_axesEnabled = true;
// Create GAL canvas
m_canvasType = LoadCanvasTypeSetting();
auto drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
GetGalDisplayOptions(), m_canvasType );
SetCanvas( drawPanel );
// Create the manager and dispatcher & route draw panel events to the dispatcher // Create the manager and dispatcher & route draw panel events to the dispatcher
m_toolManager = new TOOL_MANAGER; m_toolManager = new TOOL_MANAGER;
m_toolManager->SetEnvironment( GetBoard(), drawPanel->GetView(), m_toolManager->SetEnvironment( GetBoard(), drawPanel->GetView(),