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

Eliminate "PAD has no layer" warning for valid pads.

This commit is contained in:
Chris Pavlina 2015-05-26 16:33:46 +02:00 committed by Maciej Suminski
parent 4664b094ae
commit 775f08b2bb
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/view/view_item.h
View File

@ -123,7 +123,7 @@ public:
/** /**
* Function ViewGetLayers() * Function ViewGetLayers()
* Returns the all the layers within the VIEW the object is painted on. For instance, a D_PAD * Returns the all the layers within the VIEW the object is painted on. For instance, a D_PAD
* spans one or more copper layers and a few technical layers. ViewDraw() or PAINTER::Draw() is * spans zero or more copper layers and a few technical layers. ViewDraw() or PAINTER::Draw() is
* repeatedly called for each of the layers returned by ViewGetLayers(), depending on the * repeatedly called for each of the layers returned by ViewGetLayers(), depending on the
* rendering order. * rendering order.
* @param aLayers[]: output layer index array * @param aLayers[]: output layer index array

32
pcbnew/class_pad.cpp
View File

@ -47,6 +47,7 @@
#include <class_module.h> #include <class_module.h>
#include <polygon_test_point_inside.h> #include <polygon_test_point_inside.h>
#include <convert_from_iu.h> #include <convert_from_iu.h>
#include <boost/foreach.hpp>
int D_PAD::m_PadSketchModePenSize = 0; // Pen size used to draw pads in sketch mode int D_PAD::m_PadSketchModePenSize = 0; // Pen size used to draw pads in sketch mode
@ -950,28 +951,25 @@ void D_PAD::ViewGetLayers( int aLayers[], int& aCount ) const
aLayers[aCount++] = NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ); aLayers[aCount++] = NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE );
} }
if( IsOnLayer( F_Mask ) ) // Check non-copper layers. This list should include all the layers that the
aLayers[aCount++] = F_Mask; // footprint editor allows a pad to be placed on.
static const LAYER_ID layers_mech[] = { F_Mask, B_Mask, F_Paste, B_Paste,
F_Adhes, B_Adhes, F_SilkS, B_SilkS, Dwgs_User, Eco1_User, Eco2_User };
if( IsOnLayer( B_Mask ) ) BOOST_FOREACH( LAYER_ID each_layer, layers_mech )
aLayers[aCount++] = B_Mask; {
if( IsOnLayer( each_layer ) )
if( IsOnLayer( F_Paste ) ) aLayers[aCount++] = each_layer;
aLayers[aCount++] = F_Paste; }
if( IsOnLayer( B_Paste ) )
aLayers[aCount++] = B_Paste;
if( IsOnLayer( B_Adhes ) )
aLayers[aCount++] = B_Adhes;
if( IsOnLayer( F_Adhes ) )
aLayers[aCount++] = F_Adhes;
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
if( aCount == 0 ) // Should not occur if( aCount == 0 ) // Should not occur
{ {
wxLogWarning( wxT("D_PAD::ViewGetLayers():PAD has no layer") ); wxString msg;
msg.Printf( wxT( "footprint %s, pad %s: could not find valid layer for pad" ),
GetParent()->GetReference(),
GetPadName().IsEmpty() ? "(unnamed)" : GetPadName() );
wxLogWarning( msg );
} }
#endif #endif
} }