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

Fix compiler warnings.

This commit is contained in:
Jeff Young 2019-10-31 00:05:57 +00:00
parent 48c8ac9663
commit 4662205ecb
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/origin_viewitem.cpp
View File

@ -30,14 +30,22 @@ using namespace KIGFX;
ORIGIN_VIEWITEM::ORIGIN_VIEWITEM( const COLOR4D& aColor, MARKER_STYLE aStyle, int aSize, const VECTOR2D& aPosition ) : ORIGIN_VIEWITEM::ORIGIN_VIEWITEM( const COLOR4D& aColor, MARKER_STYLE aStyle, int aSize, const VECTOR2D& aPosition ) :
BOARD_ITEM( nullptr, NOT_USED ), // this item is never added to a BOARD so it needs no type BOARD_ITEM( nullptr, NOT_USED ), // this item is never added to a BOARD so it needs no type
m_position( aPosition ), m_size( aSize ), m_color( aColor ), m_style( aStyle ), m_drawAtZero( false ) m_position( aPosition ),
m_size( aSize ),
m_color( aColor ),
m_style( aStyle ),
m_drawAtZero( false )
{ {
} }
ORIGIN_VIEWITEM::ORIGIN_VIEWITEM( const VECTOR2D& aPosition, STATUS_FLAGS flags ) : ORIGIN_VIEWITEM::ORIGIN_VIEWITEM( const VECTOR2D& aPosition, STATUS_FLAGS flags ) :
BOARD_ITEM( nullptr, NOT_USED ), // this item is never added to a BOARD so it needs no type BOARD_ITEM( nullptr, NOT_USED ), // this item is never added to a BOARD so it needs no type
m_position( aPosition ), m_size( NOT_USED ), m_color( UNSPECIFIED_COLOR ), m_style( NONE ), m_drawAtZero( false ) m_position( aPosition ),
m_size( NOT_USED ),
m_color( UNSPECIFIED_COLOR ),
m_style( NO_GRAPHIC ),
m_drawAtZero( false )
{ {
SetFlags( flags ); SetFlags( flags );
} }
@ -76,7 +84,7 @@ void ORIGIN_VIEWITEM::ViewDraw( int, VIEW* aView ) const
switch( m_style ) switch( m_style )
{ {
case NONE: case NO_GRAPHIC:
break; break;
case CROSS: case CROSS:

2
include/origin_viewitem.h
View File

@ -44,7 +44,7 @@ class ORIGIN_VIEWITEM : public BOARD_ITEM
{ {
public: public:
///> Marker symbol styles ///> Marker symbol styles
enum MARKER_STYLE { NONE, CROSS, X, DOT, CIRCLE_CROSS, CIRCLE_X, CIRCLE_DOT }; enum MARKER_STYLE { NO_GRAPHIC, CROSS, X, DOT, CIRCLE_CROSS, CIRCLE_X, CIRCLE_DOT };
ORIGIN_VIEWITEM( const COLOR4D& aColor = COLOR4D( 1.0, 1.0, 1.0, 1.0 ), ORIGIN_VIEWITEM( const COLOR4D& aColor = COLOR4D( 1.0, 1.0, 1.0, 1.0 ),
MARKER_STYLE aStyle = CIRCLE_X, int aSize = 16, MARKER_STYLE aStyle = CIRCLE_X, int aSize = 16,