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

Fix a few minor issues in SYMBOL_PREVIEW_WIDGET. 

Fixes: lp:1802808
https://bugs.launchpad.net/kicad/+bug/1802808
This commit is contained in:
jean-pierre charras 2018-11-12 20:40:41 +01:00
parent fdff010199
commit 0a71212929
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eeschema/widgets/symbol_preview_widget.cpp
View File

@ -55,18 +55,23 @@ SYMBOL_PREVIEW_WIDGET::SYMBOL_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aKiway,
m_galDisplayOptions, canvasType ); m_galDisplayOptions, canvasType );
m_preview->SetStealsFocus( false ); m_preview->SetStealsFocus( false );
// Do not display the grid: the look is not good for a small canvas area.
// But mainly, due to some strange bug I (JPC) was unable to fix, the grid creates
// strange artifacts on Windows when eeschema is run from Kicad manager (but not in stand alone...).
m_preview->GetGAL()->SetGridVisibility( false );
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( *wxWHITE );
SetForegroundColour( *wxBLACK ); SetForegroundColour( *wxBLACK );
m_status = new wxStaticText( this, -1, wxEmptyString ); m_status = new wxStaticText( this, wxID_ANY, wxEmptyString );
m_statusSizer = new wxBoxSizer( wxVERTICAL ); m_statusSizer = new wxBoxSizer( wxVERTICAL );
m_statusSizer->Add( 0, 0, 1 ); m_statusSizer->Add( 0, 0, 1 ); // add a spacer
m_statusSizer->Add( m_status, 0, wxALL | wxALIGN_CENTER, 0 ); m_statusSizer->Add( m_status, 0, wxALIGN_CENTER );
m_statusSizer->Add( 0, 0, 1 ); m_statusSizer->Add( 0, 0, 1 ); // add a spacer
auto outer_sizer = new wxBoxSizer( wxVERTICAL ); auto outer_sizer = new wxBoxSizer( wxVERTICAL );
outer_sizer->Add( m_preview, 1, wxALL | wxEXPAND, 0 ); outer_sizer->Add( m_preview, 1, wxTOP | wxEXPAND, 5 );
outer_sizer->Add( m_statusSizer, 1, wxALL | wxALIGN_CENTER, 0 ); outer_sizer->Add( m_statusSizer, 1, wxALIGN_CENTER );
m_statusSizer->ShowItems( false ); m_statusSizer->ShowItems( false );
@ -96,13 +101,13 @@ void SYMBOL_PREVIEW_WIDGET::SetStatusText( wxString const& aText )
void SYMBOL_PREVIEW_WIDGET::onSize( wxSizeEvent& aEvent ) void SYMBOL_PREVIEW_WIDGET::onSize( wxSizeEvent& aEvent )
{ {
aEvent.Skip();
if( m_previewItem ) if( m_previewItem )
{ {
fitOnDrawArea(); fitOnDrawArea();
m_preview->ForceRefresh(); m_preview->ForceRefresh();
} }
aEvent.Skip();
} }
@ -112,12 +117,12 @@ void SYMBOL_PREVIEW_WIDGET::fitOnDrawArea()
return; return;
// set the view scale to fit the item on screen // set the view scale to fit the item on screen
// Calculate the draw scale to fit the drawing area
KIGFX::VIEW* view = m_preview->GetView(); KIGFX::VIEW* view = m_preview->GetView();
// Calculate the drawing area size, in internal units, for a scaling factor = 1.0 // Calculate the drawing area size, in internal units, for a scaling factor = 1.0
view->SetScale( 1.0 ); view->SetScale( 1.0 );
VECTOR2D clientSize = view->ToWorld( m_preview->GetClientSize(), false ); VECTOR2D clientSize = view->ToWorld( m_preview->GetClientSize(), false );
// Calculate the draw scale to fit the drawing area
double scale = std::min( fabs( clientSize.x / m_itemBBox.GetWidth() ), double scale = std::min( fabs( clientSize.x / m_itemBBox.GetWidth() ),
fabs( clientSize.y / m_itemBBox.GetHeight() ) ); fabs( clientSize.y / m_itemBBox.GetHeight() ) );
@ -175,14 +180,18 @@ void SYMBOL_PREVIEW_WIDGET::DisplaySymbol( const LIB_ID& aSymbolID, int aUnit )
// Get the symbole size, in internal units // Get the symbole size, in internal units
m_itemBBox = part->GetUnitBoundingBox( aUnit, 0 ); m_itemBBox = part->GetUnitBoundingBox( aUnit, 0 );
if( !m_preview->IsShown() )
{
m_preview->Show();
m_statusSizer->ShowItems( false );
Layout(); // Ensure panel size is up to date.
}
// Calculate the draw scale to fit the drawing area // Calculate the draw scale to fit the drawing area
fitOnDrawArea(); fitOnDrawArea();
} }
m_preview->ForceRefresh(); m_preview->ForceRefresh();
m_preview->Show();
m_statusSizer->ShowItems( false );
} }
@ -222,5 +231,3 @@ void SYMBOL_PREVIEW_WIDGET::DisplayPart( LIB_PART* aPart, int aUnit )
m_preview->Show(); m_preview->Show();
m_statusSizer->ShowItems( false ); m_statusSizer->ShowItems( false );
} }