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

First-class support for filled shapes.

This commit is contained in:
Jeff Young 2020-11-14 01:16:02 +00:00
parent e6397fa6f7
commit ec020dd19f
42 changed files with 1886 additions and 2563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
View File

@ -587,14 +587,12 @@ void BOARD_ADAPTER::TransformArcToSegments( const wxPoint &aCentre,
if( Is_segment_a_circle( start3DU, end3DU ) ) if( Is_segment_a_circle( start3DU, end3DU ) )
{ {
aDstContainer->Add( new CFILLEDCIRCLE2D( start3DU, aDstContainer->Add( new CFILLEDCIRCLE2D( start3DU, ( aWidth / 2 ) * m_biuTo3Dunits,
( aWidth / 2 ) * m_biuTo3Dunits,
aBoardItem ) ); aBoardItem ) );
} }
else else
{ {
aDstContainer->Add( new CROUNDSEGMENT2D( start3DU, end3DU, aDstContainer->Add( new CROUNDSEGMENT2D( start3DU, end3DU, aWidth * m_biuTo3Dunits,
aWidth * m_biuTo3Dunits,
aBoardItem ) ); aBoardItem ) );
} }
@ -625,40 +623,51 @@ void BOARD_ADAPTER::TransformArcToSegments( const wxPoint &aCentre,
// Based on // Based on
// TransformShapeWithClearanceToPolygon // TransformShapeWithClearanceToPolygon
// board_items_to_polygon_shape_transform.cpp#L431 // board_items_to_polygon_shape_transform.cpp#L431
void BOARD_ADAPTER::AddShapeWithClearanceToContainer( const PCB_SHAPE* aDrawSegment, void BOARD_ADAPTER::AddShapeWithClearanceToContainer( const PCB_SHAPE* aShape,
CGENERICCONTAINER2D *aDstContainer, CGENERICCONTAINER2D *aDstContainer,
PCB_LAYER_ID aLayerId, PCB_LAYER_ID aLayerId,
int aClearanceValue ) int aClearanceValue )
{ {
// The full width of the lines to create // The full width of the lines to create
// The extra 1 protects the inner/outer radius values from degeneracy // The extra 1 protects the inner/outer radius values from degeneracy
const int linewidth = aDrawSegment->GetWidth() + (2 * aClearanceValue) + 1; const int linewidth = aShape->GetWidth() + ( 2 * aClearanceValue ) + 1;
switch( aDrawSegment->GetShape() ) switch( aShape->GetShape() )
{ {
case S_CIRCLE: case S_CIRCLE:
{ {
const SFVEC2F center3DU( aDrawSegment->GetCenter().x * m_biuTo3Dunits, const SFVEC2F center3DU( aShape->GetCenter().x * m_biuTo3Dunits,
-aDrawSegment->GetCenter().y * m_biuTo3Dunits ); -aShape->GetCenter().y * m_biuTo3Dunits );
float inner_radius = ( aDrawSegment->GetRadius() - linewidth / 2 ) * m_biuTo3Dunits; float inner_radius = ( aShape->GetRadius() - linewidth / 2 ) * m_biuTo3Dunits;
float outer_radius = ( aDrawSegment->GetRadius() + linewidth / 2 ) * m_biuTo3Dunits; float outer_radius = ( aShape->GetRadius() + linewidth / 2 ) * m_biuTo3Dunits;
if( inner_radius < 0 ) if( inner_radius < 0 )
inner_radius = 0; inner_radius = 0;
if( aDrawSegment->GetWidth() > 0 ) if( aShape->IsFilled() )
aDstContainer->Add( new CRING2D( center3DU, inner_radius, outer_radius, *aDrawSegment ) ); aDstContainer->Add( new CFILLEDCIRCLE2D( center3DU, outer_radius, *aShape ) );
else else
aDstContainer->Add( new CFILLEDCIRCLE2D( center3DU, outer_radius, *aDrawSegment ) ); aDstContainer->Add( new CRING2D( center3DU, inner_radius, outer_radius, *aShape ) );
} }
break; break;
case S_RECT: case S_RECT:
if( aShape->IsFilled() )
{ {
if( aDrawSegment->GetWidth() > 0 ) SHAPE_POLY_SET polyList;
aShape->TransformShapeWithClearanceToPolygon( polyList, aLayerId, linewidth / 2,
ARC_HIGH_DEF, ERROR_INSIDE );
polyList.Simplify( SHAPE_POLY_SET::PM_FAST );
Convert_shape_line_polygon_to_triangles( polyList, *aDstContainer, m_biuTo3Dunits,
*aShape );
}
else
{ {
std::vector<wxPoint> pts = aDrawSegment->GetRectCorners(); std::vector<wxPoint> pts = aShape->GetRectCorners();
const SFVEC2F topLeft3DU( pts[0].x * m_biuTo3Dunits, -pts[0].y * m_biuTo3Dunits ); const SFVEC2F topLeft3DU( pts[0].x * m_biuTo3Dunits, -pts[0].y * m_biuTo3Dunits );
const SFVEC2F topRight3DU( pts[1].x * m_biuTo3Dunits, -pts[1].y * m_biuTo3Dunits ); const SFVEC2F topRight3DU( pts[1].x * m_biuTo3Dunits, -pts[1].y * m_biuTo3Dunits );
@ -666,68 +675,42 @@ void BOARD_ADAPTER::AddShapeWithClearanceToContainer( const PCB_SHAPE* aDrawSegm
const SFVEC2F botLeft3DU( pts[3].x * m_biuTo3Dunits, -pts[3].y * m_biuTo3Dunits ); const SFVEC2F botLeft3DU( pts[3].x * m_biuTo3Dunits, -pts[3].y * m_biuTo3Dunits );
aDstContainer->Add( new CROUNDSEGMENT2D( topLeft3DU, topRight3DU, aDstContainer->Add( new CROUNDSEGMENT2D( topLeft3DU, topRight3DU,
linewidth * m_biuTo3Dunits, linewidth * m_biuTo3Dunits, *aShape ) );
*aDrawSegment ) );
aDstContainer->Add( new CROUNDSEGMENT2D( topRight3DU, botRight3DU, aDstContainer->Add( new CROUNDSEGMENT2D( topRight3DU, botRight3DU,
linewidth * m_biuTo3Dunits, linewidth * m_biuTo3Dunits, *aShape ) );
*aDrawSegment ) );
aDstContainer->Add( new CROUNDSEGMENT2D( botRight3DU, botLeft3DU, aDstContainer->Add( new CROUNDSEGMENT2D( botRight3DU, botLeft3DU,
linewidth * m_biuTo3Dunits, linewidth * m_biuTo3Dunits, *aShape ) );
*aDrawSegment ) );
aDstContainer->Add( new CROUNDSEGMENT2D( botLeft3DU, topLeft3DU, aDstContainer->Add( new CROUNDSEGMENT2D( botLeft3DU, topLeft3DU,
linewidth * m_biuTo3Dunits, linewidth * m_biuTo3Dunits, *aShape ) );
*aDrawSegment ) );
}
else
{
SHAPE_POLY_SET polyList;
aDrawSegment->TransformShapeWithClearanceToPolygon( polyList, aLayerId,
aClearanceValue,
ARC_HIGH_DEF, ERROR_INSIDE );
polyList.Simplify( SHAPE_POLY_SET::PM_FAST );
Convert_shape_line_polygon_to_triangles( polyList, *aDstContainer, m_biuTo3Dunits,
*aDrawSegment );
}
} }
break; break;
case S_ARC: case S_ARC:
{ {
const unsigned int nr_segments = unsigned int segCount = GetNrSegmentsCircle( aShape->GetBoundingBox().GetSizeMax() );
GetNrSegmentsCircle( aDrawSegment->GetBoundingBox().GetSizeMax() );
TransformArcToSegments( aDrawSegment->GetCenter(), TransformArcToSegments( aShape->GetCenter(), aShape->GetArcStart(), aShape->GetAngle(),
aDrawSegment->GetArcStart(), segCount, linewidth, aDstContainer, *aShape );
aDrawSegment->GetAngle(),
nr_segments,
aDrawSegment->GetWidth(),
aDstContainer,
*aDrawSegment );
} }
break; break;
case S_SEGMENT: case S_SEGMENT:
{ {
const SFVEC2F start3DU( aDrawSegment->GetStart().x * m_biuTo3Dunits, const SFVEC2F start3DU( aShape->GetStart().x * m_biuTo3Dunits,
-aDrawSegment->GetStart().y * m_biuTo3Dunits ); -aShape->GetStart().y * m_biuTo3Dunits );
const SFVEC2F end3DU ( aDrawSegment->GetEnd().x * m_biuTo3Dunits, const SFVEC2F end3DU ( aShape->GetEnd().x * m_biuTo3Dunits,
-aDrawSegment->GetEnd().y * m_biuTo3Dunits ); -aShape->GetEnd().y * m_biuTo3Dunits );
if( Is_segment_a_circle( start3DU, end3DU ) ) if( Is_segment_a_circle( start3DU, end3DU ) )
{ {
aDstContainer->Add( new CFILLEDCIRCLE2D( start3DU, aDstContainer->Add( new CFILLEDCIRCLE2D( start3DU, ( linewidth / 2 ) * m_biuTo3Dunits,
( linewidth / 2 ) * m_biuTo3Dunits, *aShape ) );
*aDrawSegment ) );
} }
else else
{ {
aDstContainer->Add( new CROUNDSEGMENT2D( start3DU, end3DU, aDstContainer->Add( new CROUNDSEGMENT2D( start3DU, end3DU, linewidth * m_biuTo3Dunits,
linewidth * m_biuTo3Dunits, *aShape ) );
*aDrawSegment ) );
} }
} }
break; break;
@ -737,7 +720,7 @@ void BOARD_ADAPTER::AddShapeWithClearanceToContainer( const PCB_SHAPE* aDrawSegm
{ {
SHAPE_POLY_SET polyList; SHAPE_POLY_SET polyList;
aDrawSegment->TransformShapeWithClearanceToPolygon( polyList, aLayerId, aClearanceValue, aShape->TransformShapeWithClearanceToPolygon( polyList, aLayerId, linewidth / 2,
ARC_HIGH_DEF, ERROR_INSIDE ); ARC_HIGH_DEF, ERROR_INSIDE );
polyList.Simplify( SHAPE_POLY_SET::PM_FAST ); polyList.Simplify( SHAPE_POLY_SET::PM_FAST );
@ -746,13 +729,13 @@ void BOARD_ADAPTER::AddShapeWithClearanceToContainer( const PCB_SHAPE* aDrawSegm
break; break;
Convert_shape_line_polygon_to_triangles( polyList, *aDstContainer, m_biuTo3Dunits, Convert_shape_line_polygon_to_triangles( polyList, *aDstContainer, m_biuTo3Dunits,
*aDrawSegment ); *aShape );
} }
break; break;
default: default:
wxFAIL_MSG( "BOARD_ADAPTER::AddShapeWithClearanceToContainer no implementation for " wxFAIL_MSG( "BOARD_ADAPTER::AddShapeWithClearanceToContainer no implementation for "
+ PCB_SHAPE_TYPE_T_asString( aDrawSegment->GetShape()) ); + PCB_SHAPE_TYPE_T_asString( aShape->GetShape()) );
break; break;
} }
} }

9
common/hash_eda.cpp
View File

@ -46,7 +46,7 @@ static inline size_t hash_board_item( const BOARD_ITEM* aItem, int aFlags )
} }
size_t hash_eda( const EDA_ITEM* aItem, int aFlags ) size_t hash_fp_item( const EDA_ITEM* aItem, int aFlags )
{ {
size_t ret = 0; size_t ret = 0;
@ -65,10 +65,10 @@ size_t hash_eda( const EDA_ITEM* aItem, int aFlags )
hash_combine( ret, footprint->GetOrientation() ); hash_combine( ret, footprint->GetOrientation() );
for( BOARD_ITEM* item : footprint->GraphicalItems() ) for( BOARD_ITEM* item : footprint->GraphicalItems() )
hash_combine( ret, hash_eda( item, aFlags ) ); hash_combine( ret, hash_fp_item( item, aFlags ) );
for( PAD* pad : footprint->Pads() ) for( PAD* pad : footprint->Pads() )
hash_combine( ret, hash_eda( static_cast<EDA_ITEM*>( pad ), aFlags ) ); hash_combine( ret, hash_fp_item( static_cast<EDA_ITEM*>( pad ), aFlags ) );
} }
break; break;
@ -142,6 +142,7 @@ size_t hash_eda( const EDA_ITEM* aItem, int aFlags )
ret = hash_board_item( segment, aFlags ); ret = hash_board_item( segment, aFlags );
hash_combine( ret, segment->GetShape() ); hash_combine( ret, segment->GetShape() );
hash_combine( ret, segment->GetWidth() ); hash_combine( ret, segment->GetWidth() );
hash_combine( ret, segment->IsFilled() );
hash_combine( ret, segment->GetRadius() ); hash_combine( ret, segment->GetRadius() );
if( aFlags & HASH_POS ) if( aFlags & HASH_POS )
@ -168,7 +169,7 @@ size_t hash_eda( const EDA_ITEM* aItem, int aFlags )
break; break;
default: default:
wxASSERT_MSG( false, "Unhandled type in function hashModItem() (exporter_gencad.cpp)" ); wxASSERT_MSG( false, "Unhandled type in function hash_fp_item() (exporter_gencad.cpp)" );
} }
return ret; return ret;

11
common/plotters/plotter.cpp
View File

@ -565,11 +565,13 @@ void PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width,
} }
void PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width, void PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width, OUTLINE_MODE tracemode,
OUTLINE_MODE tracemode, void* aData ) void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
{
Circle( pos, diametre, FILL_TYPE::NO_FILL, width ); Circle( pos, diametre, FILL_TYPE::NO_FILL, width );
}
else else
{ {
SetCurrentLineWidth( -1 ); SetCurrentLineWidth( -1 );
@ -579,11 +581,12 @@ void PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width,
} }
void PLOTTER::FilledCircle( const wxPoint& pos, int diametre, void PLOTTER::FilledCircle( const wxPoint& pos, int diametre, OUTLINE_MODE tracemode, void* aData )
OUTLINE_MODE tracemode, void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
{
Circle( pos, diametre, FILL_TYPE::FILLED_SHAPE, 0 ); Circle( pos, diametre, FILL_TYPE::FILLED_SHAPE, 0 );
}
else else
{ {
SetCurrentLineWidth( -1 ); SetCurrentLineWidth( -1 );

2
include/hash_eda.h
View File

@ -55,7 +55,7 @@ enum HASH_FLAGS
* @param aItem is the item for which the hash will be computed. * @param aItem is the item for which the hash will be computed.
* @return Hash value. * @return Hash value.
*/ */
std::size_t hash_eda( const EDA_ITEM* aItem, int aFlags = HASH_FLAGS::HASH_ALL ); std::size_t hash_fp_item( const EDA_ITEM* aItem, int aFlags = HASH_FLAGS::HASH_ALL );
/** /**
* This is a dummy function to take the final case of hash_combine below * This is a dummy function to take the final case of hash_combine below

32
pcbnew/board_items_to_polygon_shape_transform.cpp
View File

@ -406,9 +406,9 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
switch( m_shape ) switch( m_shape )
{ {
case S_CIRCLE: case S_CIRCLE:
if( width == 0 ) if( IsFilled() )
{ {
TransformCircleToPolygon( aCornerBuffer, GetCenter(), GetRadius(), aError, TransformCircleToPolygon( aCornerBuffer, GetCenter(), GetRadius() + width / 2, aError,
aErrorLoc ); aErrorLoc );
} }
else else
@ -422,7 +422,7 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
{ {
std::vector<wxPoint> pts = GetRectCorners(); std::vector<wxPoint> pts = GetRectCorners();
if( width == 0 ) if( IsFilled() )
{ {
aCornerBuffer.NewOutline(); aCornerBuffer.NewOutline();
@ -430,7 +430,7 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
aCornerBuffer.Append( pt ); aCornerBuffer.Append( pt );
} }
if( width > 0 ) if( width > 0 || !IsFilled() )
{ {
// Add in segments // Add in segments
TransformOvalToPolygon( aCornerBuffer, pts[0], pts[1], width, aError, aErrorLoc ); TransformOvalToPolygon( aCornerBuffer, pts[0], pts[1], width, aError, aErrorLoc );
@ -451,11 +451,12 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
break; break;
case S_POLYGON: case S_POLYGON:
if( IsPolyShapeValid() )
{ {
// The polygon is expected to be a simple polygon if( !IsPolyShapeValid() )
// not self intersecting, no hole. break;
FOOTPRINT* footprint = GetParentFootprint(); // NULL for items not in footprints
// The polygon is expected to be a simple polygon; not self intersecting, no hole.
FOOTPRINT* footprint = GetParentFootprint();
double orientation = footprint ? footprint->GetOrientation() : 0.0; double orientation = footprint ? footprint->GetOrientation() : 0.0;
wxPoint offset; wxPoint offset;
@ -472,7 +473,7 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
point += offset; point += offset;
} }
if( IsPolygonFilled() || width == 0 ) if( IsFilled() )
{ {
aCornerBuffer.NewOutline(); aCornerBuffer.NewOutline();
@ -480,17 +481,14 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
aCornerBuffer.Append( point.x, point.y ); aCornerBuffer.Append( point.x, point.y );
} }
if( width > 0 ) if( width > 0 || !IsFilled() )
{ {
wxPoint pt1( poly[ poly.size() - 1] ); wxPoint pt1( poly[ poly.size() - 1] );
for( wxPoint pt2 : poly ) for( wxPoint pt2 : poly )
{ {
if( pt2 != pt1 ) if( pt2 != pt1 )
{ TransformOvalToPolygon( aCornerBuffer, pt1, pt2, width, aError, aErrorLoc );
TransformOvalToPolygon( aCornerBuffer, pt1, pt2, width,
aError, aErrorLoc );
}
pt1 = pt2; pt1 = pt2;
} }
@ -505,13 +503,9 @@ void PCB_SHAPE::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuf
std::vector< wxPoint> poly; std::vector< wxPoint> poly;
converter.GetPoly( poly, m_width ); converter.GetPoly( poly, m_width );
if( width != 0 )
{
for( unsigned ii = 1; ii < poly.size(); ii++ ) for( unsigned ii = 1; ii < poly.size(); ii++ )
{ {
TransformOvalToPolygon( aCornerBuffer, poly[ii-1], poly[ii], width, TransformOvalToPolygon( aCornerBuffer, poly[ii-1], poly[ii], width, aError, aErrorLoc );
aError, aErrorLoc );
}
} }
} }
break; break;

20
pcbnew/dialogs/dialog_graphic_item_properties.cpp
View File

@ -33,6 +33,7 @@
#include <dialogs/html_messagebox.h> #include <dialogs/html_messagebox.h>
#include <pcb_shape.h> #include <pcb_shape.h>
#include <fp_shape.h> #include <fp_shape.h>
#include <confirm.h>
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <dialog_graphic_item_properties_base.h> #include <dialog_graphic_item_properties_base.h>
@ -175,20 +176,28 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
m_endX.SetCoordType( ORIGIN_TRANSFORMS::NOT_A_COORD ); m_endX.SetCoordType( ORIGIN_TRANSFORMS::NOT_A_COORD );
m_endY.Show( false ); m_endY.Show( false );
m_filledCtrl->Show( true );
break; break;
case S_ARC: case S_ARC:
SetTitle( _( "Arc Properties" ) ); SetTitle( _( "Arc Properties" ) );
m_AngleValue = m_item->GetAngle() / 10.0; m_AngleValue = m_item->GetAngle() / 10.0;
m_filledCtrl->Show( false );
break; break;
case S_POLYGON: case S_POLYGON:
SetTitle( _( "Polygon Properties" ) ); SetTitle( _( "Polygon Properties" ) );
m_sizerLeft->Show( false ); m_sizerLeft->Show( false );
m_filledCtrl->Show( true );
break; break;
case S_RECT: case S_RECT:
SetTitle( _( "Rectangle Properties" ) ); SetTitle( _( "Rectangle Properties" ) );
m_filledCtrl->Show( true );
break; break;
case S_SEGMENT: case S_SEGMENT:
@ -198,6 +207,8 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
m_flipStartEnd = m_item->GetStart().x > m_item->GetEnd().x; m_flipStartEnd = m_item->GetStart().x > m_item->GetEnd().x;
SetTitle( _( "Line Segment Properties" ) ); SetTitle( _( "Line Segment Properties" ) );
m_filledCtrl->Show( false );
break; break;
default: default:
@ -246,6 +257,7 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
m_bezierCtrl2X.SetValue( m_item->GetBezControl2().x ); m_bezierCtrl2X.SetValue( m_item->GetBezControl2().x );
m_bezierCtrl2Y.SetValue( m_item->GetBezControl2().y ); m_bezierCtrl2Y.SetValue( m_item->GetBezControl2().y );
m_filledCtrl->SetValue( m_item->IsFilled() );
m_thickness.SetValue( m_item->GetWidth() ); m_thickness.SetValue( m_item->GetWidth() );
m_LayerSelectionCtrl->SetLayerSelection( m_item->GetLayer() ); m_LayerSelectionCtrl->SetLayerSelection( m_item->GetLayer() );
@ -262,6 +274,13 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataFromWindow()
if( !m_thickness.Validate( 0, Millimeter2iu( 1000.0 ) ) ) if( !m_thickness.Validate( 0, Millimeter2iu( 1000.0 ) ) )
return false; return false;
if( m_thickness.GetValue() == 0 && !m_filledCtrl->GetValue() )
{
DisplayError( this, _( "Line width may not be 0 for unfilled shapes." ) );
m_thicknessCtrl->SetFocus();
return false;
}
LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection(); LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection();
BOARD_COMMIT commit( m_parent ); BOARD_COMMIT commit( m_parent );
@ -321,6 +340,7 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataFromWindow()
} }
} }
m_item->SetFilled( m_filledCtrl->GetValue() );
m_item->SetWidth( m_thickness.GetValue() ); m_item->SetWidth( m_thickness.GetValue() );
m_item->SetLayer( ToLAYER_ID( layer ) ); m_item->SetLayer( ToLAYER_ID( layer ) );

15
pcbnew/dialogs/dialog_graphic_item_properties_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -137,7 +137,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind
bUpperRightSizer = new wxBoxSizer( wxVERTICAL ); bUpperRightSizer = new wxBoxSizer( wxVERTICAL );
wxFlexGridSizer* fgUpperRightGridSizer; wxFlexGridSizer* fgUpperRightGridSizer;
fgUpperRightGridSizer = new wxFlexGridSizer( 0, 3, 5, 0 ); fgUpperRightGridSizer = new wxFlexGridSizer( 0, 3, 3, 0 );
fgUpperRightGridSizer->AddGrowableCol( 1 ); fgUpperRightGridSizer->AddGrowableCol( 1 );
fgUpperRightGridSizer->SetFlexibleDirection( wxBOTH ); fgUpperRightGridSizer->SetFlexibleDirection( wxBOTH );
fgUpperRightGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgUpperRightGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -153,7 +153,16 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind
m_angleUnits->Wrap( -1 ); m_angleUnits->Wrap( -1 );
fgUpperRightGridSizer->Add( m_angleUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); fgUpperRightGridSizer->Add( m_angleUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Line thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_filledCtrl = new wxCheckBox( this, wxID_ANY, _("Filled shape"), wxDefaultPosition, wxDefaultSize, 0 );
fgUpperRightGridSizer->Add( m_filledCtrl, 0, wxTOP|wxLEFT, 5 );
fgUpperRightGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );
fgUpperRightGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Line width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_thicknessLabel->Wrap( -1 ); m_thicknessLabel->Wrap( -1 );
fgUpperRightGridSizer->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); fgUpperRightGridSizer->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 );

2918
pcbnew/dialogs/dialog_graphic_item_properties_base.fbp
View File

File diff suppressed because it is too large Load Diff

8
pcbnew/dialogs/dialog_graphic_item_properties_base.h
View File

@ -1,12 +1,11 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE_H__ #pragma once
#define __DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
@ -22,6 +21,7 @@ class PCB_LAYER_BOX_SELECTOR;
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/gbsizer.h> #include <wx/gbsizer.h>
#include <wx/checkbox.h>
#include <wx/bmpcbox.h> #include <wx/bmpcbox.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statline.h> #include <wx/statline.h>
@ -71,6 +71,7 @@ class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public DIALOG_SHIM
wxStaticText* m_angleLabel; wxStaticText* m_angleLabel;
wxTextCtrl* m_angleCtrl; wxTextCtrl* m_angleCtrl;
wxStaticText* m_angleUnits; wxStaticText* m_angleUnits;
wxCheckBox* m_filledCtrl;
wxStaticText* m_thicknessLabel; wxStaticText* m_thicknessLabel;
wxTextCtrl* m_thicknessCtrl; wxTextCtrl* m_thicknessCtrl;
wxStaticText* m_thicknessUnits; wxStaticText* m_thicknessUnits;
@ -93,4 +94,3 @@ class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public DIALOG_SHIM
}; };
#endif //__DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE_H__

19
pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
View File

@ -70,11 +70,8 @@ bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
if( m_shape == NULL ) if( m_shape == NULL )
return false; return false;
// Shows the text info about circle or ring only for S_CIRCLE shape
if( m_shape->GetShape() != S_CIRCLE )
m_staticTextInfo->Show( false );
m_thickness.SetValue( m_shape->GetWidth() ); m_thickness.SetValue( m_shape->GetWidth() );
m_filledCtrl->SetValue( m_shape->IsFilled() );
switch( m_shape->GetShape() ) switch( m_shape->GetShape() )
{ {
@ -93,6 +90,7 @@ bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
m_staticTextPosCtrl2->Show( false ); m_staticTextPosCtrl2->Show( false );
m_staticTextPosCtrl2->SetSize( 0, 0 ); m_staticTextPosCtrl2->SetSize( 0, 0 );
m_radius.Show( false ); m_radius.Show( false );
m_filledCtrl->Show( false );
break; break;
case S_CURVE: // Bezier line case S_CURVE: // Bezier line
@ -106,6 +104,7 @@ bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
m_ctrl2X.SetValue( m_shape->GetBezControl2().x ); m_ctrl2X.SetValue( m_shape->GetBezControl2().x );
m_ctrl2Y.SetValue( m_shape->GetBezControl2().y ); m_ctrl2Y.SetValue( m_shape->GetBezControl2().y );
m_radius.Show( false ); m_radius.Show( false );
m_filledCtrl->Show( false );
break; break;
case S_ARC: // Arc with rounded ends case S_ARC: // Arc with rounded ends
@ -126,6 +125,7 @@ bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
m_staticTextPosCtrl1->SetSize( 0, 0 ); m_staticTextPosCtrl1->SetSize( 0, 0 );
m_staticTextPosCtrl2->Show( false ); m_staticTextPosCtrl2->Show( false );
m_staticTextPosCtrl2->SetSize( 0, 0 ); m_staticTextPosCtrl2->SetSize( 0, 0 );
m_filledCtrl->Show( false );
break; break;
case S_CIRCLE: // ring or circle case S_CIRCLE: // ring or circle
@ -152,6 +152,7 @@ bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
m_staticTextPosCtrl1->SetSize( 0, 0 ); m_staticTextPosCtrl1->SetSize( 0, 0 );
m_staticTextPosCtrl2->Show( false ); m_staticTextPosCtrl2->Show( false );
m_staticTextPosCtrl2->SetSize( 0, 0 ); m_staticTextPosCtrl2->SetSize( 0, 0 );
m_filledCtrl->Show( true );
break; break;
case S_POLYGON: // polygon case S_POLYGON: // polygon
@ -168,8 +169,16 @@ bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataFromWindow() bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataFromWindow()
{ {
if( m_thickness.GetValue() == 0 && !m_filledCtrl->GetValue() )
{
DisplayError( this, _( "Line width may not be 0 for unfilled shapes." ) );
m_thicknessCtrl->SetFocus();
return false;
}
// Transfer data out of the GUI. // Transfer data out of the GUI.
m_shape->SetWidth( m_thickness.GetValue() ); m_shape->SetWidth( m_thickness.GetValue() );
m_shape->SetFilled( m_filledCtrl->GetValue() );
switch( m_shape->GetShape() ) switch( m_shape->GetShape() )
{ {
@ -257,6 +266,7 @@ bool DIALOG_PAD_PRIMITIVE_POLY_PROPS::TransferDataToWindow()
return false; return false;
m_thickness.SetValue( m_shape->GetWidth() ); m_thickness.SetValue( m_shape->GetWidth() );
m_filledCtrl->SetValue( m_shape->IsFilled() );
// Populates the list of corners // Populates the list of corners
int extra_rows = m_currPoints.size() - m_gridCornersList->GetNumberRows(); int extra_rows = m_currPoints.size() - m_gridCornersList->GetNumberRows();
@ -296,6 +306,7 @@ bool DIALOG_PAD_PRIMITIVE_POLY_PROPS::TransferDataFromWindow()
m_shape->SetPolyPoints( m_currPoints ); m_shape->SetPolyPoints( m_currPoints );
m_shape->SetWidth( m_thickness.GetValue() ); m_shape->SetWidth( m_thickness.GetValue() );
m_shape->SetFilled( m_filledCtrl->GetValue() );
return true; return true;
} }

10
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -2104,8 +2104,13 @@ void DIALOG_PAD_PROPERTIES::onDeletePrimitive( wxCommandEvent& event )
void DIALOG_PAD_PROPERTIES::onAddPrimitive( wxCommandEvent& event ) void DIALOG_PAD_PROPERTIES::onAddPrimitive( wxCommandEvent& event )
{ {
// Ask user for shape type // Ask user for shape type
wxString shapelist[] = { _( "Segment" ), _( "Arc" ), _( "Bezier" ), wxString shapelist[] = {
_( "Ring/Circle" ), _( "Polygon" ) }; _( "Segment" ),
_( "Arc" ),
_( "Bezier" ),
_( "Ring/Circle" ),
_( "Polygon" )
};
int type = wxGetSingleChoiceIndex( _( "Shape type:" ), _( "Add Primitive" ), int type = wxGetSingleChoiceIndex( _( "Shape type:" ), _( "Add Primitive" ),
arrayDim( shapelist ), shapelist, 0, this ); arrayDim( shapelist ), shapelist, 0, this );
@ -2119,6 +2124,7 @@ void DIALOG_PAD_PROPERTIES::onAddPrimitive( wxCommandEvent& event )
PCB_SHAPE* primitive = new PCB_SHAPE(); PCB_SHAPE* primitive = new PCB_SHAPE();
primitive->SetShape( listtype[type] ); primitive->SetShape( listtype[type] );
primitive->SetWidth( m_board->GetDesignSettings().GetLineThickness( F_Cu ) ); primitive->SetWidth( m_board->GetDesignSettings().GetLineThickness( F_Cu ) );
primitive->SetFilled( true );
if( listtype[type] == S_POLYGON ) if( listtype[type] == S_POLYGON )
{ {

41
pcbnew/dialogs/dialog_pad_properties_base.cpp
View File

@ -1259,7 +1259,7 @@ DIALOG_PAD_PRIMITIVES_PROPERTIES_BASE::DIALOG_PAD_PRIMITIVES_PROPERTIES_BASE( wx
fgSizerShapeProperties->Add( 0, 0, 1, wxEXPAND, 5 ); fgSizerShapeProperties->Add( 0, 0, 1, wxEXPAND, 5 );
m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Line width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_thicknessLabel->Wrap( -1 ); m_thicknessLabel->Wrap( -1 );
fgSizerShapeProperties->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); fgSizerShapeProperties->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
@ -1276,15 +1276,12 @@ DIALOG_PAD_PRIMITIVES_PROPERTIES_BASE::DIALOG_PAD_PRIMITIVES_PROPERTIES_BASE( wx
fgSizerShapeProperties->Add( 0, 0, 1, wxEXPAND, 5 ); fgSizerShapeProperties->Add( 0, 0, 1, wxEXPAND, 5 );
m_filledCtrl = new wxCheckBox( this, wxID_ANY, _("Filled shape"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizerShapeProperties->Add( m_filledCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
bSizermain->Add( fgSizerShapeProperties, 1, wxEXPAND|wxALL, 10 ); bSizermain->Add( fgSizerShapeProperties, 1, wxEXPAND|wxALL, 10 );
m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Set thickness to 0 for a filled circle."), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfo->Wrap( -1 );
m_staticTextInfo->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
bSizermain->Add( m_staticTextInfo, 0, wxRIGHT|wxLEFT, 15 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizermain->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); bSizermain->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
@ -1457,8 +1454,8 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE( wxWi
m_gridCornersList->SetMargins( 0, 0 ); m_gridCornersList->SetMargins( 0, 0 );
// Columns // Columns
m_gridCornersList->SetColSize( 0, 100 ); m_gridCornersList->SetColSize( 0, 124 );
m_gridCornersList->SetColSize( 1, 100 ); m_gridCornersList->SetColSize( 1, 124 );
m_gridCornersList->EnableDragColMove( false ); m_gridCornersList->EnableDragColMove( false );
m_gridCornersList->EnableDragColSize( true ); m_gridCornersList->EnableDragColSize( true );
m_gridCornersList->SetColLabelSize( 22 ); m_gridCornersList->SetColLabelSize( 22 );
@ -1498,22 +1495,25 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE( wxWi
bLeftSizer->Add( bSizerRightButts, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); bLeftSizer->Add( bSizerRightButts, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
wxFlexGridSizer* fgSizerThickness; wxFlexGridSizer* fgSizerThickness;
fgSizerThickness = new wxFlexGridSizer( 0, 5, 0, 0 ); fgSizerThickness = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizerThickness->AddGrowableCol( 1 ); fgSizerThickness->AddGrowableCol( 1 );
fgSizerThickness->SetFlexibleDirection( wxBOTH ); fgSizerThickness->SetFlexibleDirection( wxBOTH );
fgSizerThickness->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizerThickness->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Outline thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Line width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_thicknessLabel->Wrap( -1 ); m_thicknessLabel->Wrap( -1 );
fgSizerThickness->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); fgSizerThickness->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_thicknessCtrl = new TEXT_CTRL_EVAL( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); m_thicknessCtrl = new TEXT_CTRL_EVAL( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizerThickness->Add( m_thicknessCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerThickness->Add( m_thicknessCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_thicknessUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_thicknessUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_thicknessUnits->Wrap( -1 ); m_thicknessUnits->Wrap( -1 );
fgSizerThickness->Add( m_thicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); fgSizerThickness->Add( m_thicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_filledCtrl = new wxCheckBox( this, wxID_ANY, _("Filled shape"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizerThickness->Add( m_filledCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
bLeftSizer->Add( fgSizerThickness, 0, wxALL|wxEXPAND, 10 ); bLeftSizer->Add( fgSizerThickness, 0, wxALL|wxEXPAND, 10 );
@ -1559,26 +1559,11 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE::DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE( wxWi
wxBoxSizer* bSizer24; wxBoxSizer* bSizer24;
bSizer24 = new wxBoxSizer( wxHORIZONTAL ); bSizer24 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer25;
bSizer25 = new wxBoxSizer( wxVERTICAL );
bSizer25->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 4 );
m_statusLine1 = new wxStaticText( this, wxID_ANY, _("Coordinates are relative to anchor pad, rotated 0.0 deg."), wxDefaultPosition, wxDefaultSize, 0 ); m_statusLine1 = new wxStaticText( this, wxID_ANY, _("Coordinates are relative to anchor pad, rotated 0.0 deg."), wxDefaultPosition, wxDefaultSize, 0 );
m_statusLine1->Wrap( -1 ); m_statusLine1->Wrap( -1 );
m_statusLine1->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_statusLine1->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
bSizer25->Add( m_statusLine1, 0, 0, 5 ); bSizer24->Add( m_statusLine1, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
m_statusLine2 = new wxStaticText( this, wxID_ANY, _("Set thickness to 0 for a filled polygon."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_statusLine2->Wrap( -1 );
m_statusLine2->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
bSizer25->Add( m_statusLine2, 0, wxTOP, 2 );
bSizer24->Add( bSizer25, 1, wxEXPAND|wxLEFT, 10 );
m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizer = new wxStdDialogButtonSizer();
m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizerOK = new wxButton( this, wxID_OK );

209
pcbnew/dialogs/dialog_pad_properties_base.fbp
View File

@ -10857,16 +10857,16 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizermain</property> <property name="name">bSizermain</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">10</property> <property name="border">10</property>
<property name="flag">wxEXPAND|wxALL</property> <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="0"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">7</property> <property name="cols">7</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols">2,4</property> <property name="growablecols">2,4</property>
@ -12868,7 +12868,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Thickness:</property> <property name="label">Line width:</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -13042,13 +13042,11 @@
<property name="width">0</property> <property name="width">0</property>
</object> </object>
</object> </object>
</object> <object class="sizeritem" expanded="1">
</object> <property name="border">5</property>
<object class="sizeritem" expanded="0"> <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL</property>
<property name="border">15</property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -13062,6 +13060,7 @@
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
@ -13072,12 +13071,11 @@
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg"></property> <property name="fg"></property>
<property name="floatable">1</property> <property name="floatable">1</property>
<property name="font">,90,90,11,70,0</property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Set thickness to 0 for a filled circle.</property> <property name="label">Filled shape</property>
<property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -13085,7 +13083,7 @@
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_staticTextInfo</property> <property name="name">m_filledCtrl</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>
<property name="pane_position"></property> <property name="pane_position"></property>
<property name="pane_size"></property> <property name="pane_size"></property>
@ -13096,13 +13094,18 @@
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<property name="wrap">-1</property> </object>
</object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
@ -14313,25 +14316,25 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizerMain</property> <property name="name">bSizerMain</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizerUpper</property> <property name="name">bSizerUpper</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bLeftSizer</property> <property name="name">bLeftSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
@ -14367,7 +14370,7 @@
<property name="col_label_values">&quot;Pos X&quot; &quot;Pos Y&quot;</property> <property name="col_label_values">&quot;Pos X&quot; &quot;Pos Y&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property> <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">2</property> <property name="cols">2</property>
<property name="column_sizes">100,100</property> <property name="column_sizes">124,124</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
@ -14593,12 +14596,12 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">10</property> <property name="border">10</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="0"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">5</property> <property name="cols">4</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property> <property name="growablecols">1</property>
<property name="growablerows"></property> <property name="growablerows"></property>
@ -14641,7 +14644,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Outline thickness:</property> <property name="label">Line width:</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -14672,7 +14675,7 @@
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="0"> <object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -14795,6 +14798,70 @@
<property name="wrap">-1</property> <property name="wrap">-1</property>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">20</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Filled shape</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_filledCtrl</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object> </object>
</object> </object>
</object> </object>
@ -15069,38 +15136,19 @@
<property name="window_style"></property> <property name="window_style"></property>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizer24</property> <property name="name">bSizer24</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">10</property> <property name="border">10</property>
<property name="flag">wxEXPAND|wxLEFT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer25</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">4</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="proportion">0</property>
<object class="spacer" expanded="0">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
@ -15158,69 +15206,6 @@
<property name="wrap">-1</property> <property name="wrap">-1</property>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0">
<property name="border">2</property>
<property name="flag">wxTOP</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font">,90,90,11,70,0</property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Set thickness to 0 for a filled polygon.</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_statusLine2</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size">-1,-1</property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property> <property name="flag">wxEXPAND|wxALL</property>

4
pcbnew/dialogs/dialog_pad_properties_base.h
View File

@ -308,7 +308,7 @@ class DIALOG_PAD_PRIMITIVES_PROPERTIES_BASE : public DIALOG_SHIM
wxStaticText* m_thicknessLabel; wxStaticText* m_thicknessLabel;
wxTextCtrl* m_thicknessCtrl; wxTextCtrl* m_thicknessCtrl;
wxStaticText* m_thicknessUnits; wxStaticText* m_thicknessUnits;
wxStaticText* m_staticTextInfo; wxCheckBox* m_filledCtrl;
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
wxStdDialogButtonSizer* m_sdbSizer; wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK; wxButton* m_sdbSizerOK;
@ -369,12 +369,12 @@ class DIALOG_PAD_PRIMITIVE_POLY_PROPS_BASE : public DIALOG_SHIM
wxStaticText* m_thicknessLabel; wxStaticText* m_thicknessLabel;
TEXT_CTRL_EVAL* m_thicknessCtrl; TEXT_CTRL_EVAL* m_thicknessCtrl;
wxStaticText* m_thicknessUnits; wxStaticText* m_thicknessUnits;
wxCheckBox* m_filledCtrl;
wxPanel* m_panelPoly; wxPanel* m_panelPoly;
wxStaticBitmap* m_warningIcon; wxStaticBitmap* m_warningIcon;
wxStaticText* m_warningText; wxStaticText* m_warningText;
wxStaticLine* m_staticline3; wxStaticLine* m_staticline3;
wxStaticText* m_statusLine1; wxStaticText* m_statusLine1;
wxStaticText* m_statusLine2;
wxStdDialogButtonSizer* m_sdbSizer; wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK; wxButton* m_sdbSizerOK;
wxButton* m_sdbSizerCancel; wxButton* m_sdbSizerCancel;

4
pcbnew/exporters/export_gencad.cpp
View File

@ -671,10 +671,10 @@ static size_t hashFootprint( const FOOTPRINT* aFootprint )
| HASH_FLAGS::HASH_ROT | HASH_FLAGS::HASH_LAYER; | HASH_FLAGS::HASH_ROT | HASH_FLAGS::HASH_LAYER;
for( BOARD_ITEM* i : aFootprint->GraphicalItems() ) for( BOARD_ITEM* i : aFootprint->GraphicalItems() )
ret += hash_eda( i, flags ); ret += hash_fp_item( i, flags );
for( PAD* i : aFootprint->Pads() ) for( PAD* i : aFootprint->Pads() )
ret += hash_eda( i, flags ); ret += hash_fp_item( i, flags );
return ret; return ret;
} }

42
pcbnew/files.cpp
View File

@ -474,48 +474,6 @@ IO_MGR::PCB_FILE_T plugin_type( const wxString& aFileName, int aCtl )
} }
int PCB_EDIT_FRAME::inferLegacyEdgeClearance( BOARD* aBoard )
{
PCB_LAYER_COLLECTOR collector;
collector.SetLayerId( Edge_Cuts );
collector.Collect( aBoard, GENERAL_COLLECTOR::AllBoardItems );
int edgeWidth = -1;
bool mixed = false;
for( int i = 0; i < collector.GetCount(); i++ )
{
if( collector[i]->Type() == PCB_SHAPE_T )
{
int itemWidth = static_cast<PCB_SHAPE*>( collector[i] )->GetWidth();
if( edgeWidth != -1 && edgeWidth != itemWidth )
{
mixed = true;
edgeWidth = std::max( edgeWidth, itemWidth );
}
else
{
edgeWidth = itemWidth;
}
}
}
if( mixed )
{
// If they had different widths then we can't ensure that fills will be the same.
wxMessageBox( _( "If the zones on this board are refilled the Copper Edge Clearance\n"
"setting will be used (see Board Setup > Design Rules). This may\n"
"result in different fills from previous Kicad versions which used\n"
"the line thickness of the board boundary on the Edge Cuts layer." ),
_( "Edge Clearance Warning" ), wxOK|wxICON_WARNING, this );
}
return std::max( 0, edgeWidth / 2 );
}
bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, int aCtl ) bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, int aCtl )
{ {
// This is for python: // This is for python:

1
pcbnew/graphics_cleaner.cpp
View File

@ -307,6 +307,7 @@ void GRAPHICS_CLEANER::mergeRects()
rect = new PCB_SHAPE(); rect = new PCB_SHAPE();
rect->SetShape( S_RECT ); rect->SetShape( S_RECT );
rect->SetFilled( false );
rect->SetStart( top->start ); rect->SetStart( top->start );
rect->SetEnd( bottom->end ); rect->SetEnd( bottom->end );
rect->SetLayer( top->shape->GetLayer() ); rect->SetLayer( top->shape->GetLayer() );

2
pcbnew/import_gfx/graphics_importer_pcbnew.cpp
View File

@ -79,6 +79,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddCircle( const VECTOR2D& aCenter, double aRadiu
{ {
std::unique_ptr<PCB_SHAPE> circle( createDrawing() ); std::unique_ptr<PCB_SHAPE> circle( createDrawing() );
circle->SetShape( S_CIRCLE ); circle->SetShape( S_CIRCLE );
circle->SetFilled( GetLayer() != Edge_Cuts );
circle->SetLayer( GetLayer() ); circle->SetLayer( GetLayer() );
circle->SetWidth( MapLineWidth( aWidth ) ); circle->SetWidth( MapLineWidth( aWidth ) );
circle->SetCenter( MapCoordinate( aCenter ) ); circle->SetCenter( MapCoordinate( aCenter ) );
@ -119,6 +120,7 @@ void GRAPHICS_IMPORTER_PCBNEW::AddPolygon( const std::vector< VECTOR2D >& aVerti
std::unique_ptr<PCB_SHAPE> polygon( createDrawing() ); std::unique_ptr<PCB_SHAPE> polygon( createDrawing() );
polygon->SetShape( S_POLYGON ); polygon->SetShape( S_POLYGON );
polygon->SetFilled( GetLayer() != Edge_Cuts );
polygon->SetLayer( GetLayer() ); polygon->SetLayer( GetLayer() );
polygon->SetPolyPoints( convertedPoints ); polygon->SetPolyPoints( convertedPoints );

2
pcbnew/microwave/microwave_footprint.cpp
View File

@ -166,7 +166,7 @@ FOOTPRINT* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprint
// Close the polygon: // Close the polygon:
polyPoints.push_back( polyPoints[0] ); polyPoints.push_back( polyPoints[0] );
pad->AddPrimitivePoly( polyPoints, 0 ); // add a polygonal basic shape pad->AddPrimitivePoly( polyPoints, 0, true ); // add a polygonal basic shape
} }
break; break;

1
pcbnew/microwave/microwave_polygon.cpp
View File

@ -299,6 +299,7 @@ FOOTPRINT* MICROWAVE_TOOL::createPolygonShape()
// Add a polygonal edge (corners will be added later) on copper layer // Add a polygonal edge (corners will be added later) on copper layer
shape = new FP_SHAPE( footprint ); shape = new FP_SHAPE( footprint );
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
shape->SetLayer( F_Cu ); shape->SetLayer( F_Cu );
footprint->Add( shape, ADD_MODE::INSERT ); footprint->Add( shape, ADD_MODE::INSERT );

9
pcbnew/pad.h
View File

@ -255,11 +255,12 @@ public:
* a arc * a arc
* a bezier curve * a bezier curve
*/ */
void AddPrimitivePoly( const SHAPE_POLY_SET& aPoly, int aThickness ); void AddPrimitivePoly( const SHAPE_POLY_SET& aPoly, int aThickness, bool aFilled );
void AddPrimitivePoly( const std::vector<wxPoint>& aPoly, int aThickness ); void AddPrimitivePoly( const std::vector<wxPoint>& aPoly, int aThickness, bool aFilled );
void AddPrimitiveSegment( const wxPoint& aStart, const wxPoint& aEnd, int aThickness ); void AddPrimitiveSegment( const wxPoint& aStart, const wxPoint& aEnd, int aThickness );
void AddPrimitiveCircle( const wxPoint& aCenter, int aRadius, int aThickness ); void AddPrimitiveCircle( const wxPoint& aCenter, int aRadius, int aThickness, bool aFilled );
void AddPrimitiveRect( const wxPoint& aStart, const wxPoint& aEnd, int aThickness ); void AddPrimitiveRect( const wxPoint& aStart, const wxPoint& aEnd, int aThickness,
bool aFilled );
void AddPrimitiveArc( const wxPoint& aCenter, const wxPoint& aStart, int aArcAngle, void AddPrimitiveArc( const wxPoint& aCenter, const wxPoint& aStart, int aArcAngle,
int aThickness ); int aThickness );
void AddPrimitiveCurve( const wxPoint& aStart, const wxPoint& aEnd, const wxPoint& aCtrl1, void AddPrimitiveCurve( const wxPoint& aStart, const wxPoint& aEnd, const wxPoint& aCtrl1,

18
pcbnew/pad_custom_shape_functions.cpp
View File

@ -36,7 +36,7 @@
* the shape is a polygon (can be with thick outline), segment, circle or arc * the shape is a polygon (can be with thick outline), segment, circle or arc
*/ */
void PAD::AddPrimitivePoly( const SHAPE_POLY_SET& aPoly, int aThickness ) void PAD::AddPrimitivePoly( const SHAPE_POLY_SET& aPoly, int aThickness, bool aFilled )
{ {
std::vector<wxPoint> points; std::vector<wxPoint> points;
@ -48,14 +48,15 @@ void PAD::AddPrimitivePoly( const SHAPE_POLY_SET& aPoly, int aThickness )
for( auto iter = poly_no_hole.CIterate(); iter; iter++ ) for( auto iter = poly_no_hole.CIterate(); iter; iter++ )
points.emplace_back( iter->x, iter->y ); points.emplace_back( iter->x, iter->y );
AddPrimitivePoly( points, aThickness ); AddPrimitivePoly( points, aThickness, aFilled );
} }
void PAD::AddPrimitivePoly( const std::vector<wxPoint>& aPoly, int aThickness ) void PAD::AddPrimitivePoly( const std::vector<wxPoint>& aPoly, int aThickness, bool aFilled )
{ {
PCB_SHAPE* item = new PCB_SHAPE(); PCB_SHAPE* item = new PCB_SHAPE();
item->SetShape( S_POLYGON ); item->SetShape( S_POLYGON );
item->SetFilled( aFilled );
item->SetPolyPoints( aPoly ); item->SetPolyPoints( aPoly );
item->SetWidth( aThickness ); item->SetWidth( aThickness );
m_editPrimitives.emplace_back( item ); m_editPrimitives.emplace_back( item );
@ -66,6 +67,8 @@ void PAD::AddPrimitivePoly( const std::vector<wxPoint>& aPoly, int aThickness )
void PAD::AddPrimitiveSegment( const wxPoint& aStart, const wxPoint& aEnd, int aThickness ) void PAD::AddPrimitiveSegment( const wxPoint& aStart, const wxPoint& aEnd, int aThickness )
{ {
PCB_SHAPE* item = new PCB_SHAPE(); PCB_SHAPE* item = new PCB_SHAPE();
item->SetShape( S_SEGMENT );
item->SetFilled( false );
item->SetStart( aStart ); item->SetStart( aStart );
item->SetEnd( aEnd ); item->SetEnd( aEnd );
item->SetWidth( aThickness ); item->SetWidth( aThickness );
@ -79,6 +82,7 @@ void PAD::AddPrimitiveArc( const wxPoint& aCenter, const wxPoint& aStart, int aA
{ {
PCB_SHAPE* item = new PCB_SHAPE(); PCB_SHAPE* item = new PCB_SHAPE();
item->SetShape( S_ARC ); item->SetShape( S_ARC );
item->SetFilled( false );
item->SetCenter( aCenter ); item->SetCenter( aCenter );
item->SetArcStart( aStart ); item->SetArcStart( aStart );
item->SetAngle( aArcAngle ); item->SetAngle( aArcAngle );
@ -93,6 +97,7 @@ void PAD::AddPrimitiveCurve( const wxPoint& aStart, const wxPoint& aEnd, const w
{ {
PCB_SHAPE* item = new PCB_SHAPE(); PCB_SHAPE* item = new PCB_SHAPE();
item->SetShape( S_CURVE ); item->SetShape( S_CURVE );
item->SetFilled( false );
item->SetStart( aStart ); item->SetStart( aStart );
item->SetEnd( aEnd ); item->SetEnd( aEnd );
item->SetBezControl1( aCtrl1 ); item->SetBezControl1( aCtrl1 );
@ -103,10 +108,11 @@ void PAD::AddPrimitiveCurve( const wxPoint& aStart, const wxPoint& aEnd, const w
} }
void PAD::AddPrimitiveCircle( const wxPoint& aCenter, int aRadius, int aThickness ) void PAD::AddPrimitiveCircle( const wxPoint& aCenter, int aRadius, int aThickness, bool aFilled )
{ {
PCB_SHAPE* item = new PCB_SHAPE(); PCB_SHAPE* item = new PCB_SHAPE();
item->SetShape( S_CIRCLE ); item->SetShape( S_CIRCLE );
item->SetFilled( aFilled );
item->SetStart( aCenter ); item->SetStart( aCenter );
item->SetEnd( wxPoint( aCenter.x + aRadius, aCenter.y ) ); item->SetEnd( wxPoint( aCenter.x + aRadius, aCenter.y ) );
item->SetWidth( aThickness ); item->SetWidth( aThickness );
@ -115,10 +121,12 @@ void PAD::AddPrimitiveCircle( const wxPoint& aCenter, int aRadius, int aThicknes
} }
void PAD::AddPrimitiveRect( const wxPoint& aStart, const wxPoint& aEnd, int aThickness ) void PAD::AddPrimitiveRect( const wxPoint& aStart, const wxPoint& aEnd, int aThickness,
bool aFilled)
{ {
PCB_SHAPE* item = new PCB_SHAPE(); PCB_SHAPE* item = new PCB_SHAPE();
item->SetShape( S_RECT ); item->SetShape( S_RECT );
item->SetFilled( aFilled );
item->SetStart( aStart ); item->SetStart( aStart );
item->SetEnd( aEnd ); item->SetEnd( aEnd );
item->SetWidth( aThickness ); item->SetWidth( aThickness );

5
pcbnew/pcb_edit_frame.h
View File

@ -212,11 +212,6 @@ protected:
*/ */
bool importFile( const wxString& aFileName, int aFileType ); bool importFile( const wxString& aFileName, int aFileType );
/**
* Use the existing edge_cut line thicknesses to infer the edge clearace.
*/
int inferLegacyEdgeClearance( BOARD* aBoard );
/** /**
* Rematch orphaned zones and vias to schematic nets. * Rematch orphaned zones and vias to schematic nets.
*/ */

123
pcbnew/pcb_painter.cpp
View File

@ -1119,23 +1119,37 @@ void PCB_PAINTER::draw( const PCB_SHAPE* aShape, int aLayer )
VECTOR2D start( aShape->GetStart() ); VECTOR2D start( aShape->GetStart() );
VECTOR2D end( aShape->GetEnd() ); VECTOR2D end( aShape->GetEnd() );
m_gal->SetIsFill( !sketch ); if( sketch )
m_gal->SetIsStroke( sketch ); {
m_gal->SetIsFill( false );
m_gal->SetIsStroke( true );
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
}
m_gal->SetFillColor( color ); m_gal->SetFillColor( color );
m_gal->SetStrokeColor( color ); m_gal->SetStrokeColor( color );
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
switch( aShape->GetShape() ) switch( aShape->GetShape() )
{ {
case S_SEGMENT: case S_SEGMENT:
if( sketch )
{
m_gal->DrawSegment( start, end, thickness ); m_gal->DrawSegment( start, end, thickness );
}
else
{
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
m_gal->DrawSegment( start, end, thickness );
}
break; break;
case S_RECT: case S_RECT:
{ {
std::vector<wxPoint> pts = aShape->GetRectCorners(); std::vector<wxPoint> pts = aShape->GetRectCorners();
if( aShape->GetWidth() > 0 ) if( sketch )
{ {
m_gal->DrawSegment( pts[0], pts[1], thickness ); m_gal->DrawSegment( pts[0], pts[1], thickness );
m_gal->DrawSegment( pts[1], pts[2], thickness ); m_gal->DrawSegment( pts[1], pts[2], thickness );
@ -1143,6 +1157,19 @@ void PCB_PAINTER::draw( const PCB_SHAPE* aShape, int aLayer )
m_gal->DrawSegment( pts[3], pts[0], thickness ); m_gal->DrawSegment( pts[3], pts[0], thickness );
} }
else else
{
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
if( thickness > 0 )
{
m_gal->DrawSegment( pts[0], pts[1], thickness );
m_gal->DrawSegment( pts[1], pts[2], thickness );
m_gal->DrawSegment( pts[2], pts[3], thickness );
m_gal->DrawSegment( pts[3], pts[0], thickness );
}
if( aShape->IsFilled() )
{ {
SHAPE_POLY_SET poly; SHAPE_POLY_SET poly;
poly.NewOutline(); poly.NewOutline();
@ -1153,13 +1180,27 @@ void PCB_PAINTER::draw( const PCB_SHAPE* aShape, int aLayer )
m_gal->DrawPolygon( poly ); m_gal->DrawPolygon( poly );
} }
} }
}
break; break;
case S_ARC: case S_ARC:
if( sketch )
{
m_gal->DrawArcSegment( start, aShape->GetRadius(), m_gal->DrawArcSegment( start, aShape->GetRadius(),
DECIDEG2RAD( aShape->GetArcAngleStart() ), DECIDEG2RAD( aShape->GetArcAngleStart() ),
DECIDEG2RAD( aShape->GetArcAngleStart() + aShape->GetAngle() ), // Change this DECIDEG2RAD( aShape->GetArcAngleStart() + aShape->GetAngle() ), // Change this
thickness ); thickness );
}
else
{
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
m_gal->DrawArcSegment( start, aShape->GetRadius(),
DECIDEG2RAD( aShape->GetArcAngleStart() ),
DECIDEG2RAD( aShape->GetArcAngleStart() + aShape->GetAngle() ), // Change this
thickness );
}
break; break;
case S_CIRCLE: case S_CIRCLE:
@ -1170,9 +1211,10 @@ void PCB_PAINTER::draw( const PCB_SHAPE* aShape, int aLayer )
} }
else else
{ {
m_gal->SetIsFill( aShape->IsFilled() );
m_gal->SetIsStroke( thickness > 0 );
m_gal->SetLineWidth( thickness ); m_gal->SetLineWidth( thickness );
m_gal->SetIsFill( aShape->GetWidth() == 0 );
m_gal->SetIsStroke( aShape->GetWidth() > 0 );
m_gal->DrawCircle( start, aShape->GetRadius() ); m_gal->DrawCircle( start, aShape->GetRadius() );
} }
break; break;
@ -1184,14 +1226,36 @@ void PCB_PAINTER::draw( const PCB_SHAPE* aShape, int aLayer )
if( shape.OutlineCount() == 0 ) if( shape.OutlineCount() == 0 )
break; break;
// On Opengl, a not convex filled polygon is usually drawn by using triangles as primitives. if( sketch )
// CacheTriangulation() can create basic triangle primitives to draw the polygon solid shape
// on Opengl.
// GLU tesselation is much slower, so currently we are using our tesselation.
if( m_gal->IsOpenGlEngine() && !shape.IsTriangulationUpToDate() )
{ {
shape.CacheTriangulation(); for( int ii = 0; ii < shape.Outline( 0 ).SegmentCount(); ++ii )
{
SEG seg = shape.Outline( 0 ).Segment( ii );
m_gal->DrawSegment( seg.A, seg.B, thickness );
} }
}
else
{
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
if( thickness > 0 )
{
for( int ii = 0; ii < shape.Outline( 0 ).SegmentCount(); ++ii )
{
SEG seg = shape.Outline( 0 ).Segment( ii );
m_gal->DrawSegment( seg.A, seg.B, thickness );
}
}
if( aShape->IsFilled() )
{
// On Opengl, a not convex filled polygon is usually drawn by using triangles
// as primitives. CacheTriangulation() can create basic triangle primitives to
// draw the polygon solid shape on Opengl. GLU tesselation is much slower, so
// currently we are using our tesselation.
if( m_gal->IsOpenGlEngine() && !shape.IsTriangulationUpToDate() )
shape.CacheTriangulation();
m_gal->Save(); m_gal->Save();
@ -1201,30 +1265,37 @@ void PCB_PAINTER::draw( const PCB_SHAPE* aShape, int aLayer )
m_gal->Rotate( -parentFootprint->GetOrientationRadians() ); m_gal->Rotate( -parentFootprint->GetOrientationRadians() );
} }
m_gal->SetLineWidth( thickness );
if( sketch )
m_gal->SetIsFill( false );
else
m_gal->SetIsFill( aShape->IsPolygonFilled() );
m_gal->SetIsStroke( true );
m_gal->DrawPolygon( shape ); m_gal->DrawPolygon( shape );
m_gal->Restore(); m_gal->Restore();
}
}
break; break;
} }
case S_CURVE: case S_CURVE:
m_gal->SetIsFill( false ); if( sketch )
m_gal->SetIsStroke( true ); {
m_gal->SetLineWidth( thickness ); // Use thickness as filter value to convert the curve to polyline when the curve
// Use thickness as filter value to convert the curve to polyline // is not supported
// when the curve is not supported
m_gal->DrawCurve( VECTOR2D( aShape->GetStart() ), m_gal->DrawCurve( VECTOR2D( aShape->GetStart() ),
VECTOR2D( aShape->GetBezControl1() ), VECTOR2D( aShape->GetBezControl1() ),
VECTOR2D( aShape->GetBezControl2() ), VECTOR2D( aShape->GetBezControl2() ),
VECTOR2D( aShape->GetEnd() ), thickness ); VECTOR2D( aShape->GetEnd() ), thickness );
}
else
{
m_gal->SetIsFill( aShape->IsFilled() );
m_gal->SetIsStroke( thickness > 0 );
m_gal->SetLineWidth( thickness );
// Use thickness as filter value to convert the curve to polyline when the curve
// is not supported
m_gal->DrawCurve( VECTOR2D( aShape->GetStart() ),
VECTOR2D( aShape->GetBezControl1() ),
VECTOR2D( aShape->GetBezControl2() ),
VECTOR2D( aShape->GetEnd() ), thickness );
}
break; break;
case S_LAST: case S_LAST:

34
pcbnew/pcb_shape.cpp
View File

@ -46,6 +46,7 @@ PCB_SHAPE::PCB_SHAPE( BOARD_ITEM* aParent, KICAD_T idtype ) :
BOARD_ITEM( aParent, idtype ) BOARD_ITEM( aParent, idtype )
{ {
m_angle = 0; m_angle = 0;
m_filled = false;
m_Flags = 0; m_Flags = 0;
m_shape = S_SEGMENT; m_shape = S_SEGMENT;
m_width = Millimeter2iu( DEFAULT_LINE_WIDTH ); m_width = Millimeter2iu( DEFAULT_LINE_WIDTH );
@ -609,7 +610,7 @@ const EDA_RECT PCB_SHAPE::GetBoundingBox() const
break; break;
} }
bbox.Inflate((( m_width + 1) / 2) + 1 ); bbox.Inflate( m_width / 2 );
bbox.Normalize(); bbox.Normalize();
return bbox; return bbox;
@ -627,7 +628,7 @@ bool PCB_SHAPE::HitTest( const wxPoint& aPosition, int aAccuracy ) const
int radius = GetRadius(); int radius = GetRadius();
int dist = KiROUND( EuclideanNorm( aPosition - GetCenter() ) ); int dist = KiROUND( EuclideanNorm( aPosition - GetCenter() ) );
if( m_width == 0 ) // Filled circle hit-test if( IsFilled() ) // Filled circle hit-test
{ {
if( dist <= radius + maxdist ) if( dist <= radius + maxdist )
return true; return true;
@ -681,25 +682,27 @@ bool PCB_SHAPE::HitTest( const wxPoint& aPosition, int aAccuracy ) const
break; break;
case S_CURVE: case S_CURVE:
( (PCB_SHAPE*) this)->RebuildBezierToSegmentsPointsList( m_width ); const_cast<PCB_SHAPE*>( this )->RebuildBezierToSegmentsPointsList( m_width );
for( unsigned int i= 1; i < m_bezierPoints.size(); i++) for( unsigned int i= 1; i < m_bezierPoints.size(); i++)
{ {
if( TestSegmentHit( aPosition, m_bezierPoints[ i - 1], m_bezierPoints[i], maxdist ) ) if( TestSegmentHit( aPosition, m_bezierPoints[ i - 1], m_bezierPoints[i], maxdist ) )
return true; return true;
} }
break; break;
case S_SEGMENT: case S_SEGMENT:
if( TestSegmentHit( aPosition, m_start, m_end, maxdist ) ) if( TestSegmentHit( aPosition, m_start, m_end, maxdist ) )
return true; return true;
break; break;
case S_RECT: case S_RECT:
{ {
std::vector<wxPoint> pts = GetRectCorners(); std::vector<wxPoint> pts = GetRectCorners();
if( m_width == 0 ) // Filled rect hit-test if( IsFilled() ) // Filled rect hit-test
{ {
SHAPE_POLY_SET poly; SHAPE_POLY_SET poly;
poly.NewOutline(); poly.NewOutline();
@ -724,15 +727,16 @@ bool PCB_SHAPE::HitTest( const wxPoint& aPosition, int aAccuracy ) const
break; break;
case S_POLYGON: case S_POLYGON:
if( IsFilled() )
{ {
if( !IsPolygonFilled() ) return m_poly.Collide( VECTOR2I( aPosition ), maxdist );
}
else
{ {
SHAPE_POLY_SET::VERTEX_INDEX dummy; SHAPE_POLY_SET::VERTEX_INDEX dummy;
return m_poly.CollideEdge( VECTOR2I( aPosition ), dummy, maxdist ); return m_poly.CollideEdge( VECTOR2I( aPosition ), dummy, maxdist );
} }
else
return m_poly.Collide( VECTOR2I( aPosition ), maxdist );
}
break; break;
default: default:
@ -1077,11 +1081,12 @@ std::vector<SHAPE*> PCB_SHAPE::MakeEffectiveShapes() const
{ {
std::vector<wxPoint> pts = GetRectCorners(); std::vector<wxPoint> pts = GetRectCorners();
if( m_width == 0 ) if( IsFilled() )
{ {
effectiveShapes.emplace_back( new SHAPE_SIMPLE( pts ) ); effectiveShapes.emplace_back( new SHAPE_SIMPLE( pts ) );
} }
else
if( m_width > 0 || !IsFilled() )
{ {
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[0], pts[1], m_width ) ); effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[0], pts[1], m_width ) );
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[1], pts[2], m_width ) ); effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[1], pts[2], m_width ) );
@ -1093,11 +1098,12 @@ std::vector<SHAPE*> PCB_SHAPE::MakeEffectiveShapes() const
case S_CIRCLE: case S_CIRCLE:
{ {
if( m_width == 0 ) if( IsFilled() )
{ {
effectiveShapes.emplace_back( new SHAPE_CIRCLE( GetCenter(), GetRadius() ) ); effectiveShapes.emplace_back( new SHAPE_CIRCLE( GetCenter(), GetRadius() ) );
} }
else
if( m_width > 0 || !IsFilled() )
{ {
// SHAPE_CIRCLE has no ConvertToPolyline() method, so use a 360.0 SHAPE_ARC // SHAPE_CIRCLE has no ConvertToPolyline() method, so use a 360.0 SHAPE_ARC
SHAPE_ARC circle( GetCenter(), GetEnd(), 360.0 ); SHAPE_ARC circle( GetCenter(), GetEnd(), 360.0 );
@ -1132,12 +1138,12 @@ std::vector<SHAPE*> PCB_SHAPE::MakeEffectiveShapes() const
{ {
SHAPE_LINE_CHAIN l = GetPolyShape().COutline( 0 ); SHAPE_LINE_CHAIN l = GetPolyShape().COutline( 0 );
if( IsPolygonFilled() ) if( IsFilled() )
{ {
effectiveShapes.emplace_back( new SHAPE_SIMPLE( l ) ); effectiveShapes.emplace_back( new SHAPE_SIMPLE( l ) );
} }
if( !IsPolygonFilled() || m_width > 0 ) if( m_width > 0 || !IsFilled() )
{ {
for( int i = 0; i < l.SegmentCount(); i++ ) for( int i = 0; i < l.SegmentCount(); i++ )
effectiveShapes.emplace_back( new SHAPE_SEGMENT( l.Segment( i ), m_width ) ); effectiveShapes.emplace_back( new SHAPE_SEGMENT( l.Segment( i ), m_width ) );

23
pcbnew/pcb_shape.h
View File

@ -44,6 +44,7 @@ class PCB_SHAPE : public BOARD_ITEM
{ {
protected: protected:
int m_width; // thickness of lines ... int m_width; // thickness of lines ...
bool m_filled; // Pretty much what it says on the tin...
wxPoint m_start; // Line start point or Circle and Arc center wxPoint m_start; // Line start point or Circle and Arc center
wxPoint m_end; // Line end point or circle and arc start point wxPoint m_end; // Line end point or circle and arc start point
wxPoint m_thirdPoint; // Used only for Arcs: arc end point wxPoint m_thirdPoint; // Used only for Arcs: arc end point
@ -90,10 +91,24 @@ public:
return false; return false;
} }
/** Polygonal shape is not always filled. void SetFilled( bool aFlag ) { m_filled = aFlag; }
* For now it is filled on all layers but Edge_Cut layer
*/ bool IsFilled() const
bool IsPolygonFilled() const { return m_Layer != Edge_Cuts; } {
switch( m_shape )
{
case S_RECT:
case S_CIRCLE:
case S_POLYGON:
return m_filled;
case S_SEGMENT:
case S_ARC:
case S_CURVE:
case S_LAST:
return false;
}
}
void SetWidth( int aWidth ) { m_width = aWidth; } void SetWidth( int aWidth ) { m_width = aWidth; }
int GetWidth() const { return m_width; } int GetWidth() const { return m_width; }

2
pcbnew/plot_board_layers.cpp
View File

@ -344,7 +344,7 @@ void PlotStandardLayer( BOARD *aBoard, PLOTTER* aPlotter, LSET aLayerMask,
int numSegs = GetArcToSegmentCount( margin.x, maxError, 360.0 ); int numSegs = GetArcToSegmentCount( margin.x, maxError, 360.0 );
shape.InflateWithLinkedHoles( margin.x, numSegs, SHAPE_POLY_SET::PM_FAST ); shape.InflateWithLinkedHoles( margin.x, numSegs, SHAPE_POLY_SET::PM_FAST );
dummy.DeletePrimitivesList(); dummy.DeletePrimitivesList();
dummy.AddPrimitivePoly( shape, 0 ); dummy.AddPrimitivePoly( shape, 0, true );
// Be sure the anchor pad is not bigger than the deflated shape because this // Be sure the anchor pad is not bigger than the deflated shape because this
// anchor will be added to the pad shape when plotting the pad. So now the // anchor will be added to the pad shape when plotting the pad. So now the

52
pcbnew/plot_brditems_plotter.cpp
View File

@ -446,6 +446,7 @@ void BRDITEMS_PLOTTER::PlotDimension( DIMENSION_BASE* aDim )
int radius = static_cast<const SHAPE_CIRCLE*>( shape.get() )->GetRadius(); int radius = static_cast<const SHAPE_CIRCLE*>( shape.get() )->GetRadius();
draw.SetShape( S_CIRCLE ); draw.SetShape( S_CIRCLE );
draw.SetFilled( false );
draw.SetStart( start ); draw.SetStart( start );
draw.SetEnd( wxPoint( start.x + radius, start.y ) ); draw.SetEnd( wxPoint( start.x + radius, start.y ) );
@ -472,6 +473,7 @@ void BRDITEMS_PLOTTER::PlotPcbTarget( PCB_TARGET* aMire )
PCB_SHAPE draw; PCB_SHAPE draw;
draw.SetShape( S_CIRCLE ); draw.SetShape( S_CIRCLE );
draw.SetFilled( false );
draw.SetWidth( aMire->GetWidth() ); draw.SetWidth( aMire->GetWidth() );
draw.SetLayer( aMire->GetLayer() ); draw.SetLayer( aMire->GetLayer() );
draw.SetStart( aMire->GetPosition() ); draw.SetStart( aMire->GetPosition() );
@ -534,6 +536,7 @@ void BRDITEMS_PLOTTER::PlotFootprintGraphicItem( FP_SHAPE* aShape )
m_plotter->SetColor( getColor( aShape->GetLayer() ) ); m_plotter->SetColor( getColor( aShape->GetLayer() ) );
bool sketch = GetPlotMode() == SKETCH;
int thickness = aShape->GetWidth(); int thickness = aShape->GetWidth();
wxPoint pos( aShape->GetStart() ); wxPoint pos( aShape->GetStart() );
wxPoint end( aShape->GetEnd() ); wxPoint end( aShape->GetEnd() );
@ -567,14 +570,15 @@ void BRDITEMS_PLOTTER::PlotFootprintGraphicItem( FP_SHAPE* aShape )
{ {
std::vector<wxPoint> pts = aShape->GetRectCorners(); std::vector<wxPoint> pts = aShape->GetRectCorners();
if( aShape->GetWidth() > 0 ) if( sketch || thickness > 0 )
{ {
m_plotter->ThickSegment( pts[0], pts[1], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[0], pts[1], thickness, GetPlotMode(), &gbr_metadata );
m_plotter->ThickSegment( pts[1], pts[2], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[1], pts[2], thickness, GetPlotMode(), &gbr_metadata );
m_plotter->ThickSegment( pts[2], pts[3], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[2], pts[3], thickness, GetPlotMode(), &gbr_metadata );
m_plotter->ThickSegment( pts[3], pts[0], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[3], pts[0], thickness, GetPlotMode(), &gbr_metadata );
} }
else
if( !sketch && aShape->IsFilled() )
{ {
SHAPE_LINE_CHAIN poly; SHAPE_LINE_CHAIN poly;
@ -589,10 +593,10 @@ void BRDITEMS_PLOTTER::PlotFootprintGraphicItem( FP_SHAPE* aShape )
case S_CIRCLE: case S_CIRCLE:
radius = KiROUND( GetLineLength( end, pos ) ); radius = KiROUND( GetLineLength( end, pos ) );
if( aShape->GetWidth() > 0 ) if( aShape->IsFilled() )
m_plotter->ThickCircle( pos, radius * 2, thickness, GetPlotMode(), &gbr_metadata ); m_plotter->FilledCircle( pos, radius * 2 + thickness, GetPlotMode(), &gbr_metadata );
else else
m_plotter->FilledCircle( pos, radius * 2, GetPlotMode(), &gbr_metadata ); m_plotter->ThickCircle( pos, radius * 2, thickness, GetPlotMode(), &gbr_metadata );
break; break;
@ -639,7 +643,7 @@ void BRDITEMS_PLOTTER::PlotFootprintGraphicItem( FP_SHAPE* aShape )
cornerList.push_back( corner ); cornerList.push_back( corner );
} }
if( !aShape->IsPolygonFilled() ) if( sketch || thickness > 0 )
{ {
for( size_t i = 1; i < cornerList.size(); i++ ) for( size_t i = 1; i < cornerList.size(); i++ )
{ {
@ -651,7 +655,8 @@ void BRDITEMS_PLOTTER::PlotFootprintGraphicItem( FP_SHAPE* aShape )
GetPlotMode(), &gbr_metadata ); GetPlotMode(), &gbr_metadata );
} }
else
if( !sketch && aShape->IsFilled() )
{ {
// This must be simplified and fractured to prevent overlapping polygons // This must be simplified and fractured to prevent overlapping polygons
// from generating invalid Gerber files // from generating invalid Gerber files
@ -674,8 +679,7 @@ void BRDITEMS_PLOTTER::PlotFootprintGraphicItem( FP_SHAPE* aShape )
case S_CURVE: case S_CURVE:
m_plotter->BezierCurve( aShape->GetStart(), aShape->GetBezControl1(), m_plotter->BezierCurve( aShape->GetStart(), aShape->GetBezControl1(),
aShape->GetBezControl2(), aShape->GetEnd(), aShape->GetBezControl2(), aShape->GetEnd(), 0, thickness );
0, thickness );
break; break;
default: default:
@ -852,6 +856,7 @@ void BRDITEMS_PLOTTER::PlotPcbShape( PCB_SHAPE* aShape )
int radius = 0; int radius = 0;
double StAngle = 0, EndAngle = 0; double StAngle = 0, EndAngle = 0;
bool sketch = GetPlotMode() == SKETCH;
int thickness = aShape->GetWidth(); int thickness = aShape->GetWidth();
m_plotter->SetColor( getColor( aShape->GetLayer() ) ); m_plotter->SetColor( getColor( aShape->GetLayer() ) );
@ -879,10 +884,11 @@ void BRDITEMS_PLOTTER::PlotPcbShape( PCB_SHAPE* aShape )
case S_CIRCLE: case S_CIRCLE:
radius = KiROUND( GetLineLength( end, start ) ); radius = KiROUND( GetLineLength( end, start ) );
if( thickness > 0 ) if( aShape->IsFilled() )
m_plotter->ThickCircle( start, radius * 2, thickness, GetPlotMode(), &gbr_metadata ); m_plotter->FilledCircle( start, radius * 2 + thickness, GetPlotMode(), &gbr_metadata );
else else
m_plotter->FilledCircle( start, radius * 2, GetPlotMode(), &gbr_metadata ); m_plotter->ThickCircle( start, radius * 2, thickness, GetPlotMode(), &gbr_metadata );
break; break;
case S_ARC: case S_ARC:
@ -892,19 +898,25 @@ void BRDITEMS_PLOTTER::PlotPcbShape( PCB_SHAPE* aShape )
// when startAngle == endAngle ThickArc() doesn't know whether it's 0 deg and 360 deg // when startAngle == endAngle ThickArc() doesn't know whether it's 0 deg and 360 deg
if( std::abs( aShape->GetAngle() ) == 3600.0 ) if( std::abs( aShape->GetAngle() ) == 3600.0 )
{
m_plotter->ThickCircle( start, radius * 2, thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickCircle( start, radius * 2, thickness, GetPlotMode(), &gbr_metadata );
}
else else
m_plotter->ThickArc( start, -EndAngle, -StAngle, radius, thickness, GetPlotMode(), &gbr_metadata ); {
m_plotter->ThickArc( start, -EndAngle, -StAngle, radius, thickness, GetPlotMode(),
&gbr_metadata );
}
break; break;
case S_CURVE: case S_CURVE:
m_plotter->BezierCurve( aShape->GetStart(), aShape->GetBezControl1(), aShape->GetBezControl2(), m_plotter->BezierCurve( aShape->GetStart(), aShape->GetBezControl1(),
aShape->GetEnd(), 0, thickness ); aShape->GetBezControl2(), aShape->GetEnd(), 0, thickness );
break; break;
case S_POLYGON: case S_POLYGON:
if( aShape->IsPolyShapeValid() )
{ {
if( !aShape->IsPolygonFilled() ) if( sketch || thickness > 0 )
{ {
for( auto it = aShape->GetPolyShape().CIterateSegments( 0 ); it; it++ ) for( auto it = aShape->GetPolyShape().CIterateSegments( 0 ); it; it++ )
{ {
@ -913,7 +925,8 @@ void BRDITEMS_PLOTTER::PlotPcbShape( PCB_SHAPE* aShape )
thickness, GetPlotMode(), &gbr_metadata ); thickness, GetPlotMode(), &gbr_metadata );
} }
} }
else
if( !sketch && aShape->IsFilled() )
{ {
m_plotter->SetCurrentLineWidth( thickness, &gbr_metadata ); m_plotter->SetCurrentLineWidth( thickness, &gbr_metadata );
// Draw the polygon: only one polygon is expected // Draw the polygon: only one polygon is expected
@ -937,14 +950,15 @@ void BRDITEMS_PLOTTER::PlotPcbShape( PCB_SHAPE* aShape )
{ {
std::vector<wxPoint> pts = aShape->GetRectCorners(); std::vector<wxPoint> pts = aShape->GetRectCorners();
if( aShape->GetWidth() > 0 ) if( sketch || thickness > 0 )
{ {
m_plotter->ThickSegment( pts[0], pts[1], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[0], pts[1], thickness, GetPlotMode(), &gbr_metadata );
m_plotter->ThickSegment( pts[1], pts[2], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[1], pts[2], thickness, GetPlotMode(), &gbr_metadata );
m_plotter->ThickSegment( pts[2], pts[3], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[2], pts[3], thickness, GetPlotMode(), &gbr_metadata );
m_plotter->ThickSegment( pts[3], pts[0], thickness, GetPlotMode(), &gbr_metadata ); m_plotter->ThickSegment( pts[3], pts[0], thickness, GetPlotMode(), &gbr_metadata );
} }
else
if( !sketch && aShape->IsFilled() )
{ {
SHAPE_LINE_CHAIN poly; SHAPE_LINE_CHAIN poly;

34
pcbnew/plugins/altium/altium_pcb.cpp
View File

@ -1455,6 +1455,7 @@ void ALTIUM_PCB::ParseShapeBasedRegions6Data( const CFB::CompoundFileReader& aRe
PCB_SHAPE* shape = new PCB_SHAPE( m_board ); PCB_SHAPE* shape = new PCB_SHAPE( m_board );
m_board->Add( shape, ADD_MODE::APPEND ); m_board->Add( shape, ADD_MODE::APPEND );
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
shape->SetLayer( klayer ); shape->SetLayer( klayer );
shape->SetWidth( 0 ); shape->SetWidth( 0 );
@ -1893,29 +1894,31 @@ void ALTIUM_PCB::HelperParsePad6NonCopper( const APAD6& aElem )
if( klayer == UNDEFINED_LAYER ) if( klayer == UNDEFINED_LAYER )
{ {
wxLogWarning( wxString::Format( wxLogWarning( wxString::Format( _( "Non-Copper Pad on Altium layer %d has no KiCad "
_( "Non-Copper Pad on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead" ), "equivalent. Put it on Eco1_User instead" ),
aElem.layer ) ); aElem.layer ) );
klayer = Eco1_User; klayer = Eco1_User;
} }
if( aElem.net != ALTIUM_NET_UNCONNECTED ) if( aElem.net != ALTIUM_NET_UNCONNECTED )
{ {
wxLogError( wxString::Format( wxLogError( wxString::Format( "Non-Copper Pad '%s' is connected to a net. This is not "
"Non-Copper Pad '%s' is connected to a net. This is not supported", aElem.name ) ); "supported",
aElem.name ) );
} }
if( aElem.holesize != 0 ) if( aElem.holesize != 0 )
{ {
wxLogError( wxString::Format( wxLogError( wxString::Format( _( "Non-Copper Pad '%s' has a hole. This should not happen" ),
"Non-Copper Pad '%s' has a hole. This should not happen", aElem.name ) ); aElem.name ) );
} }
if( aElem.padmode != ALTIUM_PAD_MODE::SIMPLE ) if( aElem.padmode != ALTIUM_PAD_MODE::SIMPLE )
{ {
wxLogWarning( wxString::Format( wxLogWarning( wxString::Format( _( "Non-Copper Pad '%s' uses a complex pad stack (kind %d). "
_( "Non-Copper Pad '%s' uses a complex pad stack (kind %d). This should not happen" ), "This should not happen" ),
aElem.name, aElem.padmode ) ); aElem.name,
aElem.padmode ) );
} }
switch( aElem.topshape ) switch( aElem.topshape )
@ -1925,6 +1928,7 @@ void ALTIUM_PCB::HelperParsePad6NonCopper( const APAD6& aElem )
// filled rect // filled rect
PCB_SHAPE* shape = HelperCreateAndAddDrawsegment( aElem.component ); PCB_SHAPE* shape = HelperCreateAndAddDrawsegment( aElem.component );
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
shape->SetLayer( klayer ); shape->SetLayer( klayer );
shape->SetWidth( 0 ); shape->SetWidth( 0 );
@ -1969,6 +1973,7 @@ void ALTIUM_PCB::HelperParsePad6NonCopper( const APAD6& aElem )
{ {
// circle // circle
shape->SetShape( S_CIRCLE ); shape->SetShape( S_CIRCLE );
shape->SetFilled( true );
shape->SetCenter( aElem.position ); shape->SetCenter( aElem.position );
shape->SetWidth( aElem.topsize.x / 2 ); shape->SetWidth( aElem.topsize.x / 2 );
shape->SetArcStart( aElem.position - wxPoint( 0, aElem.topsize.x / 4 ) ); shape->SetArcStart( aElem.position - wxPoint( 0, aElem.topsize.x / 4 ) );
@ -2000,6 +2005,7 @@ void ALTIUM_PCB::HelperParsePad6NonCopper( const APAD6& aElem )
// filled circle // filled circle
PCB_SHAPE* shape = HelperCreateAndAddDrawsegment( aElem.component ); PCB_SHAPE* shape = HelperCreateAndAddDrawsegment( aElem.component );
shape->SetShape( S_CIRCLE ); shape->SetShape( S_CIRCLE );
shape->SetFilled( true );
shape->SetLayer( klayer ); shape->SetLayer( klayer );
shape->SetCenter( aElem.position ); shape->SetCenter( aElem.position );
shape->SetWidth( aElem.topsize.x / 2 ); shape->SetWidth( aElem.topsize.x / 2 );
@ -2039,6 +2045,7 @@ void ALTIUM_PCB::HelperParsePad6NonCopper( const APAD6& aElem )
// filled octagon // filled octagon
PCB_SHAPE* shape = HelperCreateAndAddDrawsegment( aElem.component ); PCB_SHAPE* shape = HelperCreateAndAddDrawsegment( aElem.component );
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
shape->SetLayer( klayer ); shape->SetLayer( klayer );
shape->SetWidth( 0 ); shape->SetWidth( 0 );
@ -2407,8 +2414,8 @@ void ALTIUM_PCB::ParseTexts6Data( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseFills6Data( void ALTIUM_PCB::ParseFills6Data( const CFB::CompoundFileReader& aReader,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aReader, aEntry );
@ -2426,8 +2433,8 @@ void ALTIUM_PCB::ParseFills6Data(
PCB_LAYER_ID klayer = GetKicadLayer( elem.layer ); PCB_LAYER_ID klayer = GetKicadLayer( elem.layer );
if( klayer == UNDEFINED_LAYER ) if( klayer == UNDEFINED_LAYER )
{ {
wxLogWarning( wxString::Format( wxLogWarning( wxString::Format( _( "Fill on Altium layer %d has no KiCad equivalent. "
_( "Fill on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead" ), "Put it on Eco1_User instead" ),
elem.layer ) ); elem.layer ) );
klayer = Eco1_User; klayer = Eco1_User;
} }
@ -2474,6 +2481,7 @@ void ALTIUM_PCB::ParseFills6Data(
m_board->Add( shape, ADD_MODE::APPEND ); m_board->Add( shape, ADD_MODE::APPEND );
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
shape->SetLayer( klayer ); shape->SetLayer( klayer );
shape->SetWidth( 0 ); shape->SetWidth( 0 );

4
pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -902,7 +902,8 @@ PAD* CADSTAR_PCB_ARCHIVE_LOADER::getKiCadPad( const COMPONENT_PAD& aCadstarPad,
ERROR_LOC::ERROR_INSIDE ); ERROR_LOC::ERROR_INSIDE );
PCB_SHAPE* padShape = new PCB_SHAPE; PCB_SHAPE* padShape = new PCB_SHAPE;
padShape->SetShape( PCB_SHAPE_TYPE_T::S_POLYGON ); padShape->SetShape( S_POLYGON );
padShape->SetFilled( true );
padShape->SetPolyShape( padOutline ); padShape->SetPolyShape( padOutline );
padShape->SetWidth( 0 ); padShape->SetWidth( 0 );
padShape->Move( padOffset - drillOffset ); padShape->Move( padOffset - drillOffset );
@ -1911,6 +1912,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::drawCadstarShape( const SHAPE& aCadstarShape,
{ {
shape = new PCB_SHAPE( aContainer ); shape = new PCB_SHAPE( aContainer );
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
} }
shape->SetPolyShape( getPolySetFromCadstarShape( aCadstarShape, -1, aContainer, aMoveVector, shape->SetPolyShape( getPolySetFromCadstarShape( aCadstarShape, -1, aContainer, aMoveVector,

8
pcbnew/plugins/eagle/eagle_plugin.cpp
View File

@ -775,14 +775,8 @@ void EAGLE_PLUGIN::loadPlain( wxXmlNode* aGraphics )
PCB_SHAPE* shape = new PCB_SHAPE( m_board ); PCB_SHAPE* shape = new PCB_SHAPE( m_board );
m_board->Add( shape, ADD_MODE::APPEND ); m_board->Add( shape, ADD_MODE::APPEND );
// with == 0 means filled circle
if( width <= 0 )
{
width = radius;
radius = radius / 2;
}
shape->SetShape( S_CIRCLE ); shape->SetShape( S_CIRCLE );
shape->SetFilled( false );
shape->SetLayer( layer ); shape->SetLayer( layer );
shape->SetStart( wxPoint( kicad_x( c.x ), kicad_y( c.y ) ) ); shape->SetStart( wxPoint( kicad_x( c.x ), kicad_y( c.y ) ) );
shape->SetEnd( wxPoint( kicad_x( c.x ) + radius, kicad_y( c.y ) ) ); shape->SetEnd( wxPoint( kicad_x( c.x ) + radius, kicad_y( c.y ) ) );

42
pcbnew/plugins/kicad/kicad_plugin.cpp
View File

@ -843,6 +843,9 @@ void PCB_IO::format( PCB_SHAPE* aShape, int aNestLevel ) const
m_out->Print( 0, " (width %s)", FormatInternalUnits( aShape->GetWidth() ).c_str() ); m_out->Print( 0, " (width %s)", FormatInternalUnits( aShape->GetWidth() ).c_str() );
if( aShape->IsFilled() )
m_out->Print( 0, " (fill yes)" );
m_out->Print( 0, " (tstamp %s)", TO_UTF8( aShape->m_Uuid.AsString() ) ); m_out->Print( 0, " (tstamp %s)", TO_UTF8( aShape->m_Uuid.AsString() ) );
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
@ -928,6 +931,9 @@ void PCB_IO::format( FP_SHAPE* aFPShape, int aNestLevel ) const
m_out->Print( 0, " (width %s)", FormatInternalUnits( aFPShape->GetWidth() ).c_str() ); m_out->Print( 0, " (width %s)", FormatInternalUnits( aFPShape->GetWidth() ).c_str() );
if( aFPShape->IsFilled() )
m_out->Print( 0, " (fill yes)" );
m_out->Print( 0, " (tstamp %s)", TO_UTF8( aFPShape->m_Uuid.AsString() ) ); m_out->Print( 0, " (tstamp %s)", TO_UTF8( aFPShape->m_Uuid.AsString() ) );
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
@ -1453,41 +1459,36 @@ void PCB_IO::format( PAD* aPad, int aNestLevel ) const
switch( primitive->GetShape() ) switch( primitive->GetShape() )
{ {
case S_SEGMENT: // usual segment : line with rounded ends case S_SEGMENT: // usual segment : line with rounded ends
m_out->Print( nested_level, "(gr_line (start %s) (end %s) (width %s))", m_out->Print( nested_level, "(gr_line (start %s) (end %s)",
FormatInternalUnits( primitive->GetStart() ).c_str(), FormatInternalUnits( primitive->GetStart() ).c_str(),
FormatInternalUnits( primitive->GetEnd() ).c_str(), FormatInternalUnits( primitive->GetEnd() ).c_str() );
FormatInternalUnits( primitive->GetWidth() ).c_str() );
break; break;
case S_RECT: case S_RECT:
m_out->Print( nested_level, "(gr_rect (start %s) (end %s) (width %s))", m_out->Print( nested_level, "(gr_rect (start %s) (end %s)",
FormatInternalUnits( primitive->GetStart() ).c_str(), FormatInternalUnits( primitive->GetStart() ).c_str(),
FormatInternalUnits( primitive->GetEnd() ).c_str(), FormatInternalUnits( primitive->GetEnd() ).c_str() );
FormatInternalUnits( primitive->GetWidth() ).c_str() );
break; break;
case S_ARC: // Arc with rounded ends case S_ARC: // Arc with rounded ends
m_out->Print( nested_level, "(gr_arc (start %s) (end %s) (angle %s) (width %s))", m_out->Print( nested_level, "(gr_arc (start %s) (end %s) (angle %s)",
FormatInternalUnits( primitive->GetStart() ).c_str(), FormatInternalUnits( primitive->GetStart() ).c_str(),
FormatInternalUnits( primitive->GetEnd() ).c_str(), FormatInternalUnits( primitive->GetEnd() ).c_str(),
FormatAngle( primitive->GetAngle() ).c_str(), FormatAngle( primitive->GetAngle() ).c_str() );
FormatInternalUnits( primitive->GetWidth() ).c_str() );
break; break;
case S_CIRCLE: // ring or circle (circle if width == 0 case S_CIRCLE: // ring or circle (circle if width == 0
m_out->Print( nested_level, "(gr_circle (center %s) (end %s) (width %s))", m_out->Print( nested_level, "(gr_circle (center %s) (end %s)",
FormatInternalUnits( primitive->GetStart() ).c_str(), FormatInternalUnits( primitive->GetStart() ).c_str(),
FormatInternalUnits( primitive->GetEnd() ).c_str(), FormatInternalUnits( primitive->GetEnd() ).c_str() );
FormatInternalUnits( primitive->GetWidth() ).c_str() );
break; break;
case S_CURVE: // Bezier Curve case S_CURVE: // Bezier Curve
m_out->Print( aNestLevel, "(gr_curve (pts (xy %s) (xy %s) (xy %s) (xy %s)) (width %s))", m_out->Print( nested_level, "(gr_curve (pts (xy %s) (xy %s) (xy %s) (xy %s))",
FormatInternalUnits( primitive->GetStart() ).c_str(), FormatInternalUnits( primitive->GetStart() ).c_str(),
FormatInternalUnits( primitive->GetBezControl1() ).c_str(), FormatInternalUnits( primitive->GetBezControl1() ).c_str(),
FormatInternalUnits( primitive->GetBezControl2() ).c_str(), FormatInternalUnits( primitive->GetBezControl2() ).c_str(),
FormatInternalUnits( primitive->GetEnd() ).c_str(), FormatInternalUnits( primitive->GetEnd() ).c_str() );
FormatInternalUnits( primitive->GetWidth() ).c_str() );
break; break;
case S_POLYGON: // polygon case S_POLYGON: // polygon
@ -1516,14 +1517,21 @@ void PCB_IO::format( PAD* aPad, int aNestLevel ) const
} }
} }
m_out->Print( newLine ? 0 : nested_level, ") (width %s))", m_out->Print( newLine ? 0 : nested_level, ")" );
FormatInternalUnits( primitive->GetWidth() ).c_str() );
} }
break; break;
default: default:
break; break;
} }
m_out->Print( nested_level, " (width %s)",
FormatInternalUnits( primitive->GetWidth() ).c_str() );
if( primitive->IsFilled() )
m_out->Print( nested_level, " (fill yes)" );
m_out->Print( nested_level, ")" );
} }
m_out->Print( 0, "\n"); m_out->Print( 0, "\n");

3
pcbnew/plugins/kicad/kicad_plugin.h
View File

@ -88,7 +88,8 @@ class PCB_TEXT;
//#define SEXPR_BOARD_FILE_VERSION 20200916 // Add center dimension //#define SEXPR_BOARD_FILE_VERSION 20200916 // Add center dimension
//#define SEXPR_BOARD_FILE_VERSION 20200921 // Add orthogonal dimension //#define SEXPR_BOARD_FILE_VERSION 20200921 // Add orthogonal dimension
//#define SEXPR_BOARD_FILE_VERSION 20200922 // Add user name to layer definition. //#define SEXPR_BOARD_FILE_VERSION 20200922 // Add user name to layer definition.
#define SEXPR_BOARD_FILE_VERSION 20201002 // Add groups in footprints (for footprint editor). //#define SEXPR_BOARD_FILE_VERSION 20201002 // Add groups in footprints (for footprint editor).
#define SEXPR_BOARD_FILE_VERSION 20201114 // Add first-class support for filled shapes.
#define BOARD_FILE_HOST_VERSION 20200825 ///< Earlier files than this include the host tag #define BOARD_FILE_HOST_VERSION 20200825 ///< Earlier files than this include the host tag

115
pcbnew/plugins/kicad/pcb_parser.cpp
View File

@ -603,7 +603,7 @@ BOARD* PCB_PARSER::parseBOARD_unchecked()
case T_gr_circle: case T_gr_circle:
case T_gr_rect: case T_gr_rect:
// these filled shapes are allowed and are filled if the line width = 0 // these filled shapes are allowed and are filled if the line width = 0
m_board->Add( parsePCB_SHAPE( true ), ADD_MODE::APPEND ); m_board->Add( parsePCB_SHAPE(), ADD_MODE::APPEND );
break; break;
case T_gr_text: case T_gr_text:
@ -2071,7 +2071,8 @@ void PCB_PARSER::parseNETCLASS()
break; break;
default: default:
Expecting( "clearance, trace_width, via_dia, via_drill, uvia_dia, uvia_drill, diff_pair_width, diff_pair_gap or add_net" ); Expecting( "clearance, trace_width, via_dia, via_drill, uvia_dia, uvia_drill, "
"diff_pair_width, diff_pair_gap or add_net" );
} }
NeedRIGHT(); NeedRIGHT();
@ -2092,7 +2093,7 @@ void PCB_PARSER::parseNETCLASS()
} }
PCB_SHAPE* PCB_PARSER::parsePCB_SHAPE( bool aAllowZeroWidth ) PCB_SHAPE* PCB_PARSER::parsePCB_SHAPE()
{ {
wxCHECK_MSG( CurTok() == T_gr_arc || CurTok() == T_gr_circle || CurTok() == T_gr_curve || wxCHECK_MSG( CurTok() == T_gr_arc || CurTok() == T_gr_circle || CurTok() == T_gr_curve ||
CurTok() == T_gr_rect || CurTok() == T_gr_line || CurTok() == T_gr_poly, NULL, CurTok() == T_gr_rect || CurTok() == T_gr_line || CurTok() == T_gr_poly, NULL,
@ -2252,37 +2253,69 @@ PCB_SHAPE* PCB_PARSER::parsePCB_SHAPE( bool aAllowZeroWidth )
{ {
case T_angle: case T_angle:
shape->SetAngle( parseDouble( "segment angle" ) * 10.0 ); shape->SetAngle( parseDouble( "segment angle" ) * 10.0 );
NeedRIGHT();
break; break;
case T_layer: case T_layer:
shape->SetLayer( parseBoardItemLayer() ); shape->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break; break;
case T_width: case T_width:
shape->SetWidth( parseBoardUnits( T_width ) ); shape->SetWidth( parseBoardUnits( T_width ) );
NeedRIGHT();
break; break;
case T_tstamp: case T_tstamp:
NextTok(); NextTok();
const_cast<KIID&>( shape->m_Uuid ) = CurStrToKIID(); const_cast<KIID&>( shape->m_Uuid ) = CurStrToKIID();
NeedRIGHT();
break;
case T_fill:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_yes:
shape->SetFilled( true );
break;
default:
Expecting( "yes" );
}
}
break; break;
/// We continue to parse the status field but it is no longer written /// We continue to parse the status field but it is no longer written
case T_status: case T_status:
shape->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) ); shape->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) );
NeedRIGHT();
break; break;
default: default:
Expecting( "layer, width, tstamp, or status" ); Expecting( "layer, width, fill, tstamp, or status" );
}
} }
NeedRIGHT(); // Legacy versions didn't have a filled flag but allowed some shapes to indicate they
// should be filled by specifying a 0 stroke-width.
if( m_requiredVersion <= 20201002 )
{
if( shape->GetWidth() == 0 && ( shape->GetShape() == S_RECT
|| shape->GetShape() == S_CIRCLE
|| shape->GetShape() == S_POLYGON ) )
{
shape->SetFilled( true );
}
} }
// Only filled polygons, circles and rect may have a zero-line width // Only filled shapes may have a zero line-width. This is not permitted in KiCad but some
// This is not permitted in KiCad for other shapes but some external tools can // external tools can generate invalid files.
// generate invalid files. if( shape->GetWidth() <= 0 && !shape->IsFilled() )
if( shape->GetWidth() < 0 || ( shape->GetWidth() == 0 && !aAllowZeroWidth ) )
{ {
shape->SetWidth( Millimeter2iu( DEFAULT_LINE_WIDTH ) ); shape->SetWidth( Millimeter2iu( DEFAULT_LINE_WIDTH ) );
} }
@ -3375,35 +3408,64 @@ FP_SHAPE* PCB_PARSER::parseFP_SHAPE()
{ {
case T_layer: case T_layer:
shape->SetLayer( parseBoardItemLayer() ); shape->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break; break;
case T_width: case T_width:
shape->SetWidth( parseBoardUnits( T_width ) ); shape->SetWidth( parseBoardUnits( T_width ) );
NeedRIGHT();
break; break;
case T_tstamp: case T_tstamp:
NextTok(); NextTok();
const_cast<KIID&>( shape->m_Uuid ) = CurStrToKIID(); const_cast<KIID&>( shape->m_Uuid ) = CurStrToKIID();
NeedRIGHT();
break;
case T_fill:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_yes:
shape->SetFilled( true );
break;
default:
Expecting( "yes" );
}
}
break; break;
/// We continue to parse the status field but it is no longer written /// We continue to parse the status field but it is no longer written
case T_status: case T_status:
shape->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) ); shape->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) );
NeedRIGHT();
break; break;
default: default:
Expecting( "layer, width or tstamp" ); Expecting( "layer, width, fill, tstamp, or status" );
}
} }
NeedRIGHT(); // Legacy versions didn't have a filled flag but allowed some shapes to indicate they
// should be filled by specifying a 0 stroke-width.
if( m_requiredVersion <= 20201002 )
{
if( shape->GetWidth() == 0 && ( shape->GetShape() == S_RECT
|| shape->GetShape() == S_CIRCLE
|| shape->GetShape() == S_POLYGON ) )
{
shape->SetFilled( true );
}
} }
// Only filled shapes may have a zero-line width. While not permitted in KiCad, some // Only filled shapes may have a zero line-width. This is not permitted in KiCad but some
// external tools generate invalid files. // external tools can generate invalid files.
if( shape->GetShape() != S_RECT if( shape->GetWidth() <= 0 && !shape->IsFilled() )
&& shape->GetShape() != S_CIRCLE
&& shape->GetShape() != S_POLYGON
&& shape->GetWidth() == 0 )
{ {
shape->SetWidth( Millimeter2iu( DEFAULT_LINE_WIDTH ) ); shape->SetWidth( Millimeter2iu( DEFAULT_LINE_WIDTH ) );
} }
@ -3817,32 +3879,29 @@ PAD* PCB_PARSER::parsePAD( FOOTPRINT* aParent )
break; break;
case T_gr_circle: case T_gr_circle:
dummysegm = parsePCB_SHAPE( true ); // Circles with 0 thickness are allowed dummysegm = parsePCB_SHAPE();
// ( filled circles )
pad->AddPrimitiveCircle( dummysegm->GetCenter(), dummysegm->GetRadius(), pad->AddPrimitiveCircle( dummysegm->GetCenter(), dummysegm->GetRadius(),
dummysegm->GetWidth() ); dummysegm->GetWidth(), dummysegm->IsFilled() );
break; break;
case T_gr_rect: case T_gr_rect:
dummysegm = parsePCB_SHAPE( true ); // rect with 0 thickness are allowed dummysegm = parsePCB_SHAPE();
// ( filled rects )
pad->AddPrimitiveRect( dummysegm->GetStart(), dummysegm->GetEnd(), pad->AddPrimitiveRect( dummysegm->GetStart(), dummysegm->GetEnd(),
dummysegm->GetWidth() ); dummysegm->GetWidth(), dummysegm->IsFilled() );
break; break;
case T_gr_poly: case T_gr_poly:
dummysegm = parsePCB_SHAPE( true ); dummysegm = parsePCB_SHAPE();
pad->AddPrimitivePoly( dummysegm->BuildPolyPointsList(), pad->AddPrimitivePoly( dummysegm->BuildPolyPointsList(), dummysegm->GetWidth(),
dummysegm->GetWidth() ); dummysegm->IsFilled() );
break; break;
case T_gr_curve: case T_gr_curve:
dummysegm = parsePCB_SHAPE(); dummysegm = parsePCB_SHAPE();
pad->AddPrimitiveCurve( dummysegm->GetStart(), dummysegm->GetEnd(), pad->AddPrimitiveCurve( dummysegm->GetStart(), dummysegm->GetEnd(),
dummysegm->GetBezControl1(), dummysegm->GetBezControl1(),
dummysegm->GetBezControl2(), dummysegm->GetBezControl2(), dummysegm->GetWidth() );
dummysegm->GetWidth() );
break; break;
default: default:

7
pcbnew/plugins/kicad/pcb_parser.h
View File

@ -157,12 +157,7 @@ class PCB_PARSER : public PCB_LEXER
void parseNETINFO_ITEM(); void parseNETINFO_ITEM();
void parseNETCLASS(); void parseNETCLASS();
/** Read a PCB_SHAPE description. PCB_SHAPE* parsePCB_SHAPE();
* @param aAllowZeroWidth = true to allow items with line width = 0
* (in this case, the are filled shapes)
* Mainly used in custom pad shapes for filled circles.
*/
PCB_SHAPE* parsePCB_SHAPE( bool aAllowZeroWidth = false );
PCB_TEXT* parsePCB_TEXT(); PCB_TEXT* parsePCB_TEXT();
DIMENSION_BASE* parseDIMENSION(); DIMENSION_BASE* parseDIMENSION();

1
pcbnew/plugins/legacy/legacy_plugin.cpp
View File

@ -1933,6 +1933,7 @@ void LEGACY_PLUGIN::loadPCB_LINE()
width = 0; width = 0;
dseg->SetShape( PCB_SHAPE_TYPE_T( shape ) ); dseg->SetShape( PCB_SHAPE_TYPE_T( shape ) );
dseg->SetFilled( false );
dseg->SetWidth( width ); dseg->SetWidth( width );
dseg->SetStart( wxPoint( start_x, start_y ) ); dseg->SetStart( wxPoint( start_x, start_y ) );
dseg->SetEnd( wxPoint( end_x, end_y ) ); dseg->SetEnd( wxPoint( end_x, end_y ) );

1
pcbnew/plugins/pcad/pcb_arc.cpp
View File

@ -185,6 +185,7 @@ void PCB_ARC::AddToBoard()
m_board->Add( arc, ADD_MODE::APPEND ); m_board->Add( arc, ADD_MODE::APPEND );
arc->SetShape( IsCircle() ? S_CIRCLE : S_ARC ); arc->SetShape( IsCircle() ? S_CIRCLE : S_ARC );
arc->SetFilled( false );
arc->SetLayer( m_KiCadLayer ); arc->SetLayer( m_KiCadLayer );
arc->SetStart( wxPoint( m_positionX, m_positionY ) ); arc->SetStart( wxPoint( m_positionX, m_positionY ) );
arc->SetEnd( wxPoint( m_StartX, m_StartY ) ); arc->SetEnd( wxPoint( m_StartX, m_StartY ) );

2
pcbnew/router/pns_kicad_iface.cpp
View File

@ -1045,7 +1045,7 @@ bool PNS_KICAD_IFACE_BASE::syncGraphicalItem( PNS::NODE* aWorld, PCB_SHAPE* aIte
return false; return false;
// TODO: where do we handle filled polygons on copper layers? // TODO: where do we handle filled polygons on copper layers?
if( aItem->GetShape() == S_POLYGON && aItem->IsPolygonFilled() ) if( aItem->GetShape() == S_POLYGON && aItem->IsFilled() )
return false; return false;
for( SHAPE* shape : aItem->MakeEffectiveShapes() ) for( SHAPE* shape : aItem->MakeEffectiveShapes() )

2
pcbnew/tools/convert_tool.cpp
View File

@ -191,6 +191,7 @@ int CONVERT_TOOL::LinesToPoly( const TOOL_EVENT& aEvent )
PCB_SHAPE* graphic = isFootprint ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE; PCB_SHAPE* graphic = isFootprint ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE;
graphic->SetShape( S_POLYGON ); graphic->SetShape( S_POLYGON );
graphic->SetFilled( destLayer != Edge_Cuts );
graphic->SetLayer( destLayer ); graphic->SetLayer( destLayer );
graphic->SetPolyShape( poly ); graphic->SetPolyShape( poly );
@ -616,6 +617,7 @@ int CONVERT_TOOL::SegmentToArc( const TOOL_EVENT& aEvent )
VECTOR2I center = GetArcCenter( start, mid, end ); VECTOR2I center = GetArcCenter( start, mid, end );
arc->SetShape( S_ARC ); arc->SetShape( S_ARC );
arc->SetFilled( false );
arc->SetLayer( layer ); arc->SetLayer( layer );
arc->SetWidth( line->GetWidth() ); arc->SetWidth( line->GetWidth() );

5
pcbnew/tools/drawing_tool.cpp
View File

@ -288,6 +288,7 @@ int DRAWING_TOOL::DrawRectangle( const TOOL_EVENT& aEvent )
OPT<VECTOR2D> startingPoint = boost::make_optional<VECTOR2D>( false, VECTOR2D( 0, 0 ) ); OPT<VECTOR2D> startingPoint = boost::make_optional<VECTOR2D>( false, VECTOR2D( 0, 0 ) );
rect->SetShape( S_RECT ); rect->SetShape( S_RECT );
rect->SetFilled( false );
rect->SetFlags(IS_NEW ); rect->SetFlags(IS_NEW );
if( aEvent.HasPosition() ) if( aEvent.HasPosition() )
@ -312,6 +313,7 @@ int DRAWING_TOOL::DrawRectangle( const TOOL_EVENT& aEvent )
rect = m_isFootprintEditor ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE; rect = m_isFootprintEditor ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE;
rect->SetShape( S_RECT ); rect->SetShape( S_RECT );
rect->SetFilled( false );
rect->SetFlags(IS_NEW ); rect->SetFlags(IS_NEW );
startingPoint = NULLOPT; startingPoint = NULLOPT;
} }
@ -332,6 +334,7 @@ int DRAWING_TOOL::DrawCircle( const TOOL_EVENT& aEvent )
OPT<VECTOR2D> startingPoint = boost::make_optional<VECTOR2D>( false, VECTOR2D( 0, 0 ) ); OPT<VECTOR2D> startingPoint = boost::make_optional<VECTOR2D>( false, VECTOR2D( 0, 0 ) );
circle->SetShape( S_CIRCLE ); circle->SetShape( S_CIRCLE );
circle->SetFilled( false );
circle->SetFlags( IS_NEW ); circle->SetFlags( IS_NEW );
if( aEvent.HasPosition() ) if( aEvent.HasPosition() )
@ -356,6 +359,7 @@ int DRAWING_TOOL::DrawCircle( const TOOL_EVENT& aEvent )
circle = m_isFootprintEditor ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE; circle = m_isFootprintEditor ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE;
circle->SetShape( S_CIRCLE ); circle->SetShape( S_CIRCLE );
circle->SetFilled( false );
circle->SetFlags( IS_NEW ); circle->SetFlags( IS_NEW );
startingPoint = NULLOPT; startingPoint = NULLOPT;
} }
@ -1398,6 +1402,7 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
// Init the new item attributes // Init the new item attributes
graphic->SetShape( (PCB_SHAPE_TYPE_T) shape ); graphic->SetShape( (PCB_SHAPE_TYPE_T) shape );
graphic->SetFilled( false );
graphic->SetWidth( m_lineWidth ); graphic->SetWidth( m_lineWidth );
graphic->SetLayer( m_frame->GetActiveLayer() ); graphic->SetLayer( m_frame->GetActiveLayer() );
grid.SetSkipPoint( cursorPos ); grid.SetSkipPoint( cursorPos );

3
pcbnew/tools/pad_tool.cpp
View File

@ -585,6 +585,7 @@ PCB_LAYER_ID PAD_TOOL::explodePad( PAD* aPad )
FP_SHAPE* shape = new FP_SHAPE( board()->GetFirstFootprint() ); FP_SHAPE* shape = new FP_SHAPE( board()->GetFirstFootprint() );
shape->SetShape( primitive->GetShape() ); shape->SetShape( primitive->GetShape() );
shape->SetFilled( primitive->IsFilled() );
shape->SetWidth( primitive->GetWidth() ); shape->SetWidth( primitive->GetWidth() );
shape->SetStart( primitive->GetStart() ); shape->SetStart( primitive->GetStart() );
shape->SetEnd( primitive->GetEnd() ); shape->SetEnd( primitive->GetEnd() );
@ -680,6 +681,7 @@ void PAD_TOOL::recombinePad( PAD* aPad )
PCB_SHAPE* shape = new PCB_SHAPE; PCB_SHAPE* shape = new PCB_SHAPE;
shape->SetShape( S_POLYGON ); shape->SetShape( S_POLYGON );
shape->SetFilled( true );
shape->SetPolyShape( existingOutline ); shape->SetPolyShape( existingOutline );
shape->Move( - aPad->GetPosition() ); shape->Move( - aPad->GetPosition() );
shape->Rotate( wxPoint( 0, 0 ), - aPad->GetOrientation() ); shape->Rotate( wxPoint( 0, 0 ), - aPad->GetOrientation() );
@ -694,6 +696,7 @@ void PAD_TOOL::recombinePad( PAD* aPad )
PCB_SHAPE* pcbShape = new PCB_SHAPE; PCB_SHAPE* pcbShape = new PCB_SHAPE;
pcbShape->SetShape( fpShape->GetShape() ); pcbShape->SetShape( fpShape->GetShape() );
pcbShape->SetFilled( fpShape->IsFilled() );
pcbShape->SetWidth( fpShape->GetWidth() ); pcbShape->SetWidth( fpShape->GetWidth() );
pcbShape->SetStart( fpShape->GetStart() ); pcbShape->SetStart( fpShape->GetStart() );
pcbShape->SetEnd( fpShape->GetEnd() ); pcbShape->SetEnd( fpShape->GetEnd() );

3
pcbnew/tools/zone_create_helper.cpp
View File

@ -236,7 +236,8 @@ void ZONE_CREATE_HELPER::commitZone( std::unique_ptr<ZONE> aZone )
{ {
auto poly = m_tool.m_isFootprintEditor ? new FP_SHAPE( (FOOTPRINT *) parent ) auto poly = m_tool.m_isFootprintEditor ? new FP_SHAPE( (FOOTPRINT *) parent )
: new PCB_SHAPE(); : new PCB_SHAPE();
poly->SetShape ( S_POLYGON ); poly->SetShape( S_POLYGON );
poly->SetFilled( m_params.m_layer != Edge_Cuts );
poly->SetLayer( m_params.m_layer ); poly->SetLayer( m_params.m_layer );
poly->SetPolyShape ( *aZone->Outline() ); poly->SetPolyShape ( *aZone->Outline() );
bCommit.Add( poly ); bCommit.Add( poly );