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

minor compil warnings and drawings fix

This commit is contained in:
jean-pierre charras 2018-09-06 17:55:37 +02:00 committed by Jeff Young
parent 3c82ad3220
commit 906c52deff
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eeschema/class_libentry.cpp
View File

@ -342,7 +342,6 @@ void LIB_PART::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOffset,
int aMulti, int aConvert, const PART_DRAW_OPTIONS& aOpts ) int aMulti, int aConvert, const PART_DRAW_OPTIONS& aOpts )
{ {
BASE_SCREEN* screen = aPanel ? aPanel->GetScreen() : NULL; BASE_SCREEN* screen = aPanel ? aPanel->GetScreen() : NULL;
GRSetDrawMode( aDc, aOpts.draw_mode ); GRSetDrawMode( aDc, aOpts.draw_mode );
/* draw background for filled items using background option /* draw background for filled items using background option
@ -410,7 +409,7 @@ void LIB_PART::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOffset,
if( drawItem.Type() == LIB_FIELD_T ) if( drawItem.Type() == LIB_FIELD_T )
{ {
LIB_FIELD& field = dynamic_cast<LIB_FIELD&>( drawItem ); LIB_FIELD& field = static_cast<LIB_FIELD&>( drawItem );
if( field.IsVisible() && !aOpts.draw_visible_fields ) if( field.IsVisible() && !aOpts.draw_visible_fields )
continue; continue;
@ -421,7 +420,7 @@ void LIB_PART::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOffset,
if( drawItem.Type() == LIB_PIN_T ) if( drawItem.Type() == LIB_PIN_T )
{ {
LIB_PIN& pin = dynamic_cast<LIB_PIN&>( drawItem ); LIB_PIN& pin = static_cast<LIB_PIN&>( drawItem );
uintptr_t flags = 0; uintptr_t flags = 0;
if( aOpts.show_pin_text ) if( aOpts.show_pin_text )

2
eeschema/lib_draw_item.cpp
View File

@ -146,10 +146,10 @@ void LIB_ITEM::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC,
m_Fill = fillMode; m_Fill = fillMode;
} }
else else
#endif
{ {
drawGraphic( aPanel, aDC, aOffset, aColor, aDrawMode, aData, aTransform ); drawGraphic( aPanel, aDC, aOffset, aColor, aDrawMode, aData, aTransform );
} }
#endif
} }

2
eeschema/sch_painter.cpp
View File

@ -677,7 +677,7 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer, bool isDangling, bool isMovin
// Four locations around a pin where text can be drawn // Four locations around a pin where text can be drawn
enum { INSIDE = 0, OUTSIDE, ABOVE, BELOW }; enum { INSIDE = 0, OUTSIDE, ABOVE, BELOW };
int size[4] = { 0, 0, 0, 0 }; int size[4] = { 0, 0, 0, 0 };
int thickness[4]; int thickness[4] = { numLineWidth, numLineWidth, numLineWidth, numLineWidth };
COLOR4D colour[4]; COLOR4D colour[4];
wxString text[4]; wxString text[4];

2
pcbnew/pcb_painter.h
View File

@ -136,7 +136,7 @@ public:
m_sketchBoardGfx = aEnabled; m_sketchBoardGfx = aEnabled;
} }
inline bool IsBackgroundDark() const inline bool IsBackgroundDark() const override
{ {
auto luma = m_layerColors[ LAYER_PCB_BACKGROUND ].GetBrightness(); auto luma = m_layerColors[ LAYER_PCB_BACKGROUND ].GetBrightness();