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

Fix minor issues in DIALOG_KEEPOUT_AREA_PROPERTIES. 

Fix keepout zone creation in legacy canvas.
Add a comment in lset.cpp
This commit is contained in:
jean-pierre charras 2017-09-27 09:59:12 +02:00
parent 42be6bb966
commit b4a59eb96d
3 changed files with 268 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/lset.cpp
View File

@ -560,9 +560,10 @@ LSET FlipLayerMask( LSET aMask, int aCopperLayersCount )
{
// the mask does not include all internal layers. Therefore
// the flipped mask for internal copper layers must be built
int innerLayerCnt = aCopperLayersCount -2;
// the flipped mask is the innerLayerCnt bits rewritten in reverse order
// ( bits innerLayerCnt to 1 rewritten in bits 1 to innerLayerCnt )
for( int ii = 0; ii < innerLayerCnt; ii++ )
{
if( internalMask[innerLayerCnt - ii] )

15
pcbnew/dialogs/dialog_keepout_area_properties.cpp
View File

@ -7,7 +7,7 @@
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -163,11 +163,8 @@ void DIALOG_KEEPOUT_AREA_PROPERTIES::initDialog()
COLOR4D layerColor = m_parent->Settings().Colors().GetLayerColor( layer );
row.clear();
row.push_back( m_zonesettings.m_Layers.test( layer ) );
auto iconItem = wxDataViewIconText( msg, makeLayerIcon( layerColor ) );
row.push_back( wxVariant( iconItem ) );
m_layers->AppendItem( row );
@ -180,14 +177,16 @@ void DIALOG_KEEPOUT_AREA_PROPERTIES::initDialog()
m_cbCopperPourCtrl->SetValue( m_zonesettings.GetDoNotAllowCopperPour() );
checkColumn->SetWidth( wxCOL_WIDTH_AUTOSIZE );
checkColumn->SetMinWidth( 50 );
layerColumn->SetMinWidth( 350 );
layerColumn->SetWidth( wxCOL_WIDTH_AUTOSIZE );
m_layers->SetExpanderColumn( layerColumn );
m_layers->SetMinSize( wxSize( 300, -1 ) );
m_layers->Update();
Update();
m_sdbSizerButtonsOK->Enable( m_zonesettings.m_Layers.count() > 0 );
}
@ -217,7 +216,7 @@ void DIALOG_KEEPOUT_AREA_PROPERTIES::OnLayerSelection( wxDataViewEvent& event )
BOARD* board = m_parent->GetBoard();
LSEQ cu_stack = LSET::AllCuMask( board->GetCopperLayerCount() ).UIOrder();
if( row < cu_stack.size() )
if( row < (int)cu_stack.size() )
{
m_zonesettings.m_Layers.set( cu_stack[ row ], selected );
}
@ -296,8 +295,6 @@ wxIcon DIALOG_KEEPOUT_AREA_PROPERTIES::makeLayerIcon( COLOR4D aColor )
iconDC.DrawRectangle( 0, 0, LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
wxIcon icon;
icon.CopyFromBitmap( bitmap );
return icon;
}

13
pcbnew/zones_by_polygon.cpp
View File

@ -4,7 +4,7 @@
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2012 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -561,13 +561,10 @@ int PCB_EDIT_FRAME::Begin_Zone( wxDC* DC )
{
ZONE_EDIT_T edited;
// Init zone params to reasonable values
zone->SetLayer( GetActiveLayer() );
// Prompt user for parameters:
m_canvas->SetIgnoreMouseEvents( true );
if( zone->IsOnCopperLayer() )
if( IsCopperLayer( GetActiveLayer() ) )
{
// Put a zone on a copper layer
if( GetBoard()->GetHighLightNetCode() > 0 )
@ -594,8 +591,6 @@ int PCB_EDIT_FRAME::Begin_Zone( wxDC* DC )
cfg->Read( ZONE_MIN_THICKNESS_WIDTH_STRING_KEY, &tmp );
zoneInfo.m_ZoneMinThickness = KiROUND( tmp * IU_PER_MILS );
zoneInfo.m_CurrentZone_Layer = zone->GetLayer();
if( GetToolId() == ID_PCB_KEEPOUT_AREA_BUTT )
{
zoneInfo.SetIsKeepout( true );
@ -609,12 +604,14 @@ int PCB_EDIT_FRAME::Begin_Zone( wxDC* DC )
}
else
{
zoneInfo.m_CurrentZone_Layer = GetActiveLayer(); // Preselect a layer
zoneInfo.SetIsKeepout( false );
edited = InvokeCopperZonesEditor( this, &zoneInfo );
}
}
else // Put a zone on a non copper layer (technical layer)
{
zone->SetLayer( GetActiveLayer() ); // Preselect a layer
zoneInfo.SetIsKeepout( false );
zoneInfo.m_NetcodeSelection = 0; // No net for non copper zones
edited = InvokeNonCopperZonesEditor( this, zone, &zoneInfo );
@ -675,8 +672,6 @@ int PCB_EDIT_FRAME::Begin_Zone( wxDC* DC )
{
zoneInfo.ExportSetting( *zone );
zone->SetLayer( zoneInfo.m_CurrentZone_Layer );
// A duplicated corner is needed; null segments are removed when the zone is finished.
zone->AppendCorner( GetCrossHairPosition(), -1 );
// Add the duplicate corner: