mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-09-14 02:03:12 +02:00
Range checking.
This commit is contained in:
parent
558627289b
commit
a8df4b16e2
@ -521,8 +521,10 @@ bool FOOTPRINT::Deserialize( const google::protobuf::Any &aContainer )
|
|||||||
|
|
||||||
for( int layerMsg : footprint.definition().private_layers() )
|
for( int layerMsg : footprint.definition().private_layers() )
|
||||||
{
|
{
|
||||||
auto layer = static_cast<types::BoardLayer>( layerMsg );
|
auto layer = FromProtoEnum<PCB_LAYER_ID, types::BoardLayer>( static_cast<types::BoardLayer>( layerMsg ) );
|
||||||
privateLayers.set( FromProtoEnum<PCB_LAYER_ID, types::BoardLayer>( layer ) );
|
|
||||||
|
if( layer > UNDEFINED_LAYER )
|
||||||
|
privateLayers.set( layer );
|
||||||
}
|
}
|
||||||
|
|
||||||
SetPrivateLayers( privateLayers );
|
SetPrivateLayers( privateLayers );
|
||||||
|
@ -1046,14 +1046,14 @@ PAD* CADSTAR_PCB_ARCHIVE_LOADER::getKiCadPad( const COMPONENT_PAD& aCadstarPad,
|
|||||||
pad->SetLocalSolderPasteMarginRatio( 0.0 );
|
pad->SetLocalSolderPasteMarginRatio( 0.0 );
|
||||||
bool complexPadErrorLogged = false;
|
bool complexPadErrorLogged = false;
|
||||||
|
|
||||||
for( auto& reassign : csPadcode.Reassigns )
|
for( auto& [layer, shape] : csPadcode.Reassigns )
|
||||||
{
|
{
|
||||||
PCB_LAYER_ID kiLayer = getKiCadLayer( reassign.first );
|
PCB_LAYER_ID kiLayer = getKiCadLayer( layer );
|
||||||
CADSTAR_PAD_SHAPE shape = reassign.second;
|
|
||||||
|
|
||||||
if( shape.Size == 0 )
|
if( shape.Size == 0 )
|
||||||
{
|
{
|
||||||
padLayerSet.reset( kiLayer );
|
if( kiLayer > UNDEFINED_LAYER )
|
||||||
|
padLayerSet.reset( kiLayer );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -96,7 +96,8 @@ void RATSNEST_VIEW_ITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const
|
|||||||
// If we are in "other layers off" mode, the active layer is the only visible layer
|
// If we are in "other layers off" mode, the active layer is the only visible layer
|
||||||
if( rs->m_ContrastModeDisplay == HIGH_CONTRAST_MODE::HIDDEN )
|
if( rs->m_ContrastModeDisplay == HIGH_CONTRAST_MODE::HIDDEN )
|
||||||
{
|
{
|
||||||
visibleLayers.set( rs->GetPrimaryHighContrastLayer() );
|
if( rs->GetPrimaryHighContrastLayer() > UNDEFINED_LAYER )
|
||||||
|
visibleLayers.set( rs->GetPrimaryHighContrastLayer() );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user