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

Implement line style printing for LIB_SHAPE. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11883
This commit is contained in:
Jeff Young 2022-06-28 08:27:40 -06:00
parent 66d3bf2bc2
commit 4a8aaefdc0
2 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
eeschema/lib_shape.cpp
View File

@ -316,10 +316,51 @@ void LIB_SHAPE::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset
std::swap( pt1, pt2 ); std::swap( pt1, pt2 );
} }
if( forceNoFill || GetFillMode() == FILL_T::NO_FILL ) COLOR4D fillColor = COLOR4D::UNSPECIFIED;
{
penWidth = std::max( penWidth, aSettings->GetDefaultPenWidth() );
if( !forceNoFill )
{
if( GetFillMode() == FILL_T::FILLED_SHAPE )
fillColor = color;
else if( GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR )
fillColor = aSettings->GetLayerColor( LAYER_DEVICE_BACKGROUND );
else if( GetFillMode() == FILL_T::FILLED_WITH_COLOR )
fillColor = GetFillColor();
}
if( fillColor != COLOR4D::UNSPECIFIED )
{
switch( GetShape() )
{
case SHAPE_T::ARC:
GRFilledArc( DC, pt1, pt2, c, 0, fillColor, fillColor );
break;
case SHAPE_T::CIRCLE:
GRFilledCircle( DC, pt1, GetRadius(), 0, fillColor, fillColor );
break;
case SHAPE_T::RECT:
GRFilledRect( DC, pt1, pt2, 0, fillColor, fillColor );
break;
case SHAPE_T::POLY:
GRPoly( DC, ptCount, buffer, true, 0, fillColor, fillColor );
break;
case SHAPE_T::BEZIER:
GRPoly( DC, ptCount, buffer, true, 0, fillColor, fillColor );
break;
default:
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
}
}
penWidth = std::max( penWidth, aSettings->GetDefaultPenWidth() );
if( GetEffectiveLineStyle() == PLOT_DASH_TYPE::SOLID )
{
switch( GetShape() ) switch( GetShape() )
{ {
case SHAPE_T::ARC: case SHAPE_T::ARC:
@ -348,60 +389,21 @@ void LIB_SHAPE::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset
} }
else else
{ {
COLOR4D fillColor = color; std::vector<SHAPE*> shapes = MakeEffectiveShapes( true );
if( GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR ) for( SHAPE* shape : shapes )
fillColor = aSettings->GetLayerColor( LAYER_DEVICE_BACKGROUND );
else if( GetFillMode() == FILL_T::FILLED_WITH_COLOR )
fillColor = GetFillColor();
switch( GetShape() )
{ {
case SHAPE_T::ARC: STROKE_PARAMS::Stroke( shape, GetEffectiveLineStyle(), penWidth, aSettings,
// If we stroke in GRFilledArc it will stroke the two radials too, so we have to [&]( const VECTOR2I& a, const VECTOR2I& b )
// fill and stroke separately {
VECTOR2I pts = aTransform.TransformCoordinate( a ) + aOffset;
GRFilledArc( DC, pt1, pt2, c, 0, fillColor, fillColor ); VECTOR2I pte = aTransform.TransformCoordinate( b ) + aOffset;
GRLine( DC, pts.x, pts.y, pte.x, pte.y, penWidth, color );
if( penWidth > 0 ) } );
GRArc( DC, pt1, pt2, c, penWidth, color );
break;
case SHAPE_T::CIRCLE:
GRFilledCircle( DC, pt1, GetRadius(), penWidth, color, fillColor );
break;
case SHAPE_T::RECT:
// GRFilledRect seems to have issues printing a border over the background colour,
// so we fill and stroke separately
GRFilledRect( DC, pt1, pt2, 0, color, fillColor );
if( penWidth > 0 )
GRRect( DC, pt1, pt2, penWidth, color );
break;
case SHAPE_T::POLY:
GRPoly( DC, ptCount, buffer, true, 0, fillColor, fillColor );
if( penWidth > 0 )
GRPoly( DC, ptCount, buffer, false, penWidth, color, fillColor );
break;
case SHAPE_T::BEZIER:
if( penWidth > 0 )
GRPoly( DC, ptCount, buffer, true, penWidth, color, fillColor );
else
GRPoly( DC, ptCount, buffer, true, 0, fillColor, fillColor );
break;
default:
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
} }
for( SHAPE* shape : shapes )
delete shape;
} }
delete[] buffer; delete[] buffer;

8
eeschema/lib_shape.h
View File

@ -57,6 +57,14 @@ public:
int GetPenWidth() const override; int GetPenWidth() const override;
PLOT_DASH_TYPE GetEffectiveLineStyle() const
{
if( m_stroke.GetPlotStyle() == PLOT_DASH_TYPE::DEFAULT )
return PLOT_DASH_TYPE::SOLID;
else
return m_stroke.GetPlotStyle();
}
const EDA_RECT GetBoundingBox() const override; const EDA_RECT GetBoundingBox() const override;
void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override; void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;