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

Rename PLOT_MODE to OUTLINE_MODE

This commit is contained in:
Marek Roszko 2020-10-15 19:33:18 -04:00
parent eb33c33f15
commit b9f1601418
19 changed files with 111 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/eda_text.cpp
View File

@ -400,7 +400,7 @@ bool EDA_TEXT::TextHitTest( const EDA_RECT& aRect, bool aContains, int aAccuracy
void EDA_TEXT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor, void EDA_TEXT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
PLOT_MODE aFillMode ) OUTLINE_MODE aFillMode )
{ {
if( IsMultilineAllowed() ) if( IsMultilineAllowed() )
{ {
@ -464,7 +464,7 @@ void EDA_TEXT::GetLinePositions( std::vector<wxPoint>& aPositions, int aLineCoun
} }
void EDA_TEXT::printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void EDA_TEXT::printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
COLOR4D aColor, PLOT_MODE aFillMode, COLOR4D aColor, OUTLINE_MODE aFillMode,
const wxString& aText, const wxPoint &aPos ) const wxString& aText, const wxPoint &aPos )
{ {
wxDC* DC = aSettings->GetPrintDC(); wxDC* DC = aSettings->GetPrintDC();

16
common/plotters/DXF_plotter.cpp
View File

@ -614,7 +614,7 @@ void DXF_PLOTTER::SetDash( PLOT_DASH_TYPE aDashed )
void DXF_PLOTTER::ThickSegment( const wxPoint& aStart, const wxPoint& aEnd, int aWidth, void DXF_PLOTTER::ThickSegment( const wxPoint& aStart, const wxPoint& aEnd, int aWidth,
PLOT_MODE aPlotMode, void* aData ) OUTLINE_MODE aPlotMode, void* aData )
{ {
if( aPlotMode == SKETCH ) if( aPlotMode == SKETCH )
{ {
@ -676,7 +676,7 @@ void DXF_PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle, i
* DXF oval pad: always done in sketch mode * DXF oval pad: always done in sketch mode
*/ */
void DXF_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double orient, void DXF_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double orient,
PLOT_MODE trace_mode, void* aData ) OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
wxSize size( aSize ); wxSize size( aSize );
@ -698,7 +698,7 @@ void DXF_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double
* pretty if other kinds of pad aren't... * pretty if other kinds of pad aren't...
*/ */
void DXF_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, void DXF_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre,
PLOT_MODE trace_mode, void* aData ) OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
Circle( pos, diametre, FILL_TYPE::NO_FILL ); Circle( pos, diametre, FILL_TYPE::NO_FILL );
@ -709,7 +709,7 @@ void DXF_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre,
* DXF rectangular pad: alwayd done in sketch mode * DXF rectangular pad: alwayd done in sketch mode
*/ */
void DXF_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize, void DXF_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize,
double orient, PLOT_MODE trace_mode, void* aData ) double orient, OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
wxSize size; wxSize size;
@ -774,7 +774,7 @@ void DXF_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize,
void DXF_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, void DXF_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
SHAPE_POLY_SET outline; SHAPE_POLY_SET outline;
TransformRoundChamferedRectToPolygon( outline, aPadPos, aSize, aOrient, TransformRoundChamferedRectToPolygon( outline, aPadPos, aSize, aOrient,
@ -793,7 +793,7 @@ void DXF_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize
void DXF_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, void DXF_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
for( int cnt = 0; cnt < aPolygons->OutlineCount(); ++cnt ) for( int cnt = 0; cnt < aPolygons->OutlineCount(); ++cnt )
{ {
@ -813,7 +813,7 @@ void DXF_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
* DXF trapezoidal pad: only sketch mode is supported * DXF trapezoidal pad: only sketch mode is supported
*/ */
void DXF_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, void DXF_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTrace_Mode, void* aData ) double aPadOrient, OUTLINE_MODE aTrace_Mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
wxPoint coord[4]; /* coord actual corners of a trapezoidal trace */ wxPoint coord[4]; /* coord actual corners of a trapezoidal trace */
@ -836,7 +836,7 @@ void DXF_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorner
void DXF_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos, void DXF_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos,
int aRadius, int aCornerCount, int aRadius, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) double aOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
// Do nothing // Do nothing
wxASSERT( 0 ); wxASSERT( 0 );

26
common/plotters/GERBER_plotter.cpp
View File

@ -907,7 +907,7 @@ void GERBER_PLOTTER::PlotPoly( const std::vector< wxPoint >& aCornerList,
void GERBER_PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width, void GERBER_PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
{ {
@ -928,7 +928,7 @@ void GERBER_PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int
} }
void GERBER_PLOTTER::ThickArc( const wxPoint& centre, double StAngle, double EndAngle, void GERBER_PLOTTER::ThickArc( const wxPoint& centre, double StAngle, double EndAngle,
int radius, int width, PLOT_MODE tracemode, void* aData ) int radius, int width, OUTLINE_MODE tracemode, void* aData )
{ {
GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData ); GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData );
SetCurrentLineWidth( width, gbr_metadata ); SetCurrentLineWidth( width, gbr_metadata );
@ -951,7 +951,7 @@ void GERBER_PLOTTER::ThickArc( const wxPoint& centre, double StAngle, double End
void GERBER_PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width, void GERBER_PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData ); GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData );
SetCurrentLineWidth( width, gbr_metadata ); SetCurrentLineWidth( width, gbr_metadata );
@ -979,7 +979,7 @@ void GERBER_PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width,
void GERBER_PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width, void GERBER_PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData ); GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData );
SetCurrentLineWidth( width, gbr_metadata ); SetCurrentLineWidth( width, gbr_metadata );
@ -1001,7 +1001,7 @@ void GERBER_PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width,
void GERBER_PLOTTER::FilledCircle( const wxPoint& pos, int diametre, void GERBER_PLOTTER::FilledCircle( const wxPoint& pos, int diametre,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
// A filled circle is a graphic item, not a pad. // A filled circle is a graphic item, not a pad.
// So it is drawn, not flashed. // So it is drawn, not flashed.
@ -1025,7 +1025,7 @@ void GERBER_PLOTTER::FilledCircle( const wxPoint& pos, int diametre,
} }
void GERBER_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, PLOT_MODE trace_mode, void* aData ) void GERBER_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, OUTLINE_MODE trace_mode, void* aData )
{ {
wxSize size( diametre, diametre ); wxSize size( diametre, diametre );
GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData ); GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
@ -1055,7 +1055,7 @@ void GERBER_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, PLOT_MODE
void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double orient, void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double orient,
PLOT_MODE trace_mode, void* aData ) OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
wxSize size( aSize ); wxSize size( aSize );
@ -1134,7 +1134,7 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub
void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize, void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
double orient, PLOT_MODE trace_mode, void* aData ) double orient, OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
@ -1218,7 +1218,7 @@ void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData ); GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
@ -1426,7 +1426,7 @@ void GERBER_PLOTTER::plotRoundRectAsRegion( const wxPoint& aRectCenter, const wx
void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
// A Pad custom is plotted as polygon (a region in Gerber language). // A Pad custom is plotted as polygon (a region in Gerber language).
@ -1468,7 +1468,7 @@ void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
void GERBER_PLOTTER::FlashPadChamferRoundRect( const wxPoint& aShapePos, const wxSize& aPadSize, void GERBER_PLOTTER::FlashPadChamferRoundRect( const wxPoint& aShapePos, const wxSize& aPadSize,
int aCornerRadius, double aChamferRatio, int aCornerRadius, double aChamferRatio,
int aChamferPositions, int aChamferPositions,
double aPadOrient, PLOT_MODE aPlotMode, void* aData ) double aPadOrient, OUTLINE_MODE aPlotMode, void* aData )
{ {
GBR_METADATA gbr_metadata; GBR_METADATA gbr_metadata;
@ -1590,7 +1590,7 @@ void GERBER_PLOTTER::FlashPadChamferRoundRect( const wxPoint& aShapePos, const w
void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCorners, void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCorners,
double aPadOrient, PLOT_MODE aTrace_Mode, void* aData ) double aPadOrient, OUTLINE_MODE aTrace_Mode, void* aData )
{ {
// polygon corners list // polygon corners list
@ -1643,7 +1643,7 @@ void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCo
void GERBER_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos, void GERBER_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos,
int aDiameter, int aCornerCount, int aDiameter, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, double aOrient, OUTLINE_MODE aTraceMode,
void* aData ) void* aData )
{ {
GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData ); GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );

16
common/plotters/HPGL_plotter.cpp
View File

@ -442,7 +442,7 @@ void HPGL_PLOTTER::SetDash( PLOT_DASH_TYPE dashed )
void HPGL_PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, void HPGL_PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end,
int width, PLOT_MODE tracemode, void* aData ) int width, OUTLINE_MODE tracemode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
wxPoint center; wxPoint center;
@ -505,7 +505,7 @@ void HPGL_PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle,
/* Plot oval pad. /* Plot oval pad.
*/ */
void HPGL_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double orient, void HPGL_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double orient,
PLOT_MODE trace_mode, void* aData ) OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
int deltaxy, cx, cy; int deltaxy, cx, cy;
@ -543,7 +543,7 @@ void HPGL_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, double
/* Plot round pad or via. /* Plot round pad or via.
*/ */
void HPGL_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, void HPGL_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre,
PLOT_MODE trace_mode, void* aData ) OUTLINE_MODE trace_mode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
DPOINT pos_dev = userToDeviceCoordinates( pos ); DPOINT pos_dev = userToDeviceCoordinates( pos );
@ -583,7 +583,7 @@ void HPGL_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre,
void HPGL_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize, void HPGL_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize,
double orient, PLOT_MODE trace_mode, void* aData ) double orient, OUTLINE_MODE trace_mode, void* aData )
{ {
// Build rect polygon: // Build rect polygon:
std::vector<wxPoint> corners; std::vector<wxPoint> corners;
@ -621,7 +621,7 @@ void HPGL_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize,
void HPGL_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, void HPGL_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
SHAPE_POLY_SET outline; SHAPE_POLY_SET outline;
@ -659,7 +659,7 @@ void HPGL_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSiz
void HPGL_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, void HPGL_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
std::vector< wxPoint > cornerList; std::vector< wxPoint > cornerList;
@ -682,7 +682,7 @@ void HPGL_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
void HPGL_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCorners, void HPGL_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCorners,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) double aPadOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
std::vector< wxPoint > cornerList; std::vector< wxPoint > cornerList;
cornerList.reserve( 5 ); cornerList.reserve( 5 );
@ -704,7 +704,7 @@ void HPGL_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCorne
void HPGL_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos, void HPGL_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos,
int aRadius, int aCornerCount, int aRadius, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) double aOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
// Do nothing // Do nothing
wxASSERT( 0 ); wxASSERT( 0 );

14
common/plotters/PS_plotter.cpp
View File

@ -88,7 +88,7 @@ void PSLIKE_PLOTTER::SetColor( COLOR4D color )
void PSLIKE_PLOTTER::FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, void PSLIKE_PLOTTER::FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) double aPadOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
wxASSERT( outputFile ); wxASSERT( outputFile );
int x0, y0, x1, y1, delta; int x0, y0, x1, y1, delta;
@ -118,7 +118,7 @@ void PSLIKE_PLOTTER::FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize,
void PSLIKE_PLOTTER::FlashPadCircle( const wxPoint& aPadPos, int aDiameter, void PSLIKE_PLOTTER::FlashPadCircle( const wxPoint& aPadPos, int aDiameter,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
if( aTraceMode == FILLED ) if( aTraceMode == FILLED )
Circle( aPadPos, aDiameter, FILL_TYPE::FILLED_SHAPE, 0 ); Circle( aPadPos, aDiameter, FILL_TYPE::FILLED_SHAPE, 0 );
@ -139,7 +139,7 @@ void PSLIKE_PLOTTER::FlashPadCircle( const wxPoint& aPadPos, int aDiameter,
void PSLIKE_PLOTTER::FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize, void PSLIKE_PLOTTER::FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) double aPadOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
static std::vector< wxPoint > cornerList; static std::vector< wxPoint > cornerList;
wxSize size( aSize ); wxSize size( aSize );
@ -189,7 +189,7 @@ void PSLIKE_PLOTTER::FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize,
void PSLIKE_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, void PSLIKE_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
wxSize size( aSize ); wxSize size( aSize );
@ -225,7 +225,7 @@ void PSLIKE_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
void PSLIKE_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, void PSLIKE_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) OUTLINE_MODE aTraceMode, void* aData )
{ {
wxSize size( aSize ); wxSize size( aSize );
@ -258,7 +258,7 @@ void PSLIKE_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
} }
void PSLIKE_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, void PSLIKE_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) double aPadOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
static std::vector< wxPoint > cornerList; static std::vector< wxPoint > cornerList;
cornerList.clear(); cornerList.clear();
@ -305,7 +305,7 @@ void PSLIKE_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCor
void PSLIKE_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos, void PSLIKE_PLOTTER::FlashRegularPolygon( const wxPoint& aShapePos,
int aRadius, int aCornerCount, int aRadius, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) double aOrient, OUTLINE_MODE aTraceMode, void* aData )
{ {
// Do nothing // Do nothing
wxASSERT( 0 ); wxASSERT( 0 );

12
common/plotters/plotter.cpp
View File

@ -435,7 +435,7 @@ void PLOTTER::Marker( const wxPoint& position, int diametre, unsigned aShapeId )
void PLOTTER::segmentAsOval( const wxPoint& start, const wxPoint& end, int width, void PLOTTER::segmentAsOval( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode ) OUTLINE_MODE tracemode )
{ {
wxPoint center( (start.x + end.x) / 2, (start.y + end.y) / 2 ); wxPoint center( (start.x + end.x) / 2, (start.y + end.y) / 2 );
wxSize size( end.x - start.x, end.y - start.y ); wxSize size( end.x - start.x, end.y - start.y );
@ -504,7 +504,7 @@ void PLOTTER::sketchOval( const wxPoint& pos, const wxSize& aSize, double orient
void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width, void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
{ {
@ -528,7 +528,7 @@ void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width,
void PLOTTER::ThickArc( const wxPoint& centre, double StAngle, double EndAngle, void PLOTTER::ThickArc( const wxPoint& centre, double StAngle, double EndAngle,
int radius, int width, PLOT_MODE tracemode, void* aData ) int radius, int width, OUTLINE_MODE tracemode, void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
Arc( centre, StAngle, EndAngle, radius, FILL_TYPE::NO_FILL, width ); Arc( centre, StAngle, EndAngle, radius, FILL_TYPE::NO_FILL, width );
@ -544,7 +544,7 @@ void PLOTTER::ThickArc( const wxPoint& centre, double StAngle, double EndAngle,
void PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width, void PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
Rect( p1, p2, FILL_TYPE::NO_FILL, width ); Rect( p1, p2, FILL_TYPE::NO_FILL, width );
@ -566,7 +566,7 @@ 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,
PLOT_MODE tracemode, void* aData ) OUTLINE_MODE tracemode, void* aData )
{ {
if( tracemode == FILLED ) if( tracemode == FILLED )
Circle( pos, diametre, FILL_TYPE::NO_FILL, width ); Circle( pos, diametre, FILL_TYPE::NO_FILL, width );
@ -580,7 +580,7 @@ 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,
PLOT_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 );

16
common/plotters/plotter_dxf.h
View File

@ -83,27 +83,27 @@ public:
virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, virtual void PlotPoly( const std::vector< wxPoint >& aCornerList,
FILL_TYPE aFill, int aWidth = USE_DEFAULT_LINE_WIDTH, void * aData = NULL ) override; FILL_TYPE aFill, int aWidth = USE_DEFAULT_LINE_WIDTH, void * aData = NULL ) override;
virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode, void* aData ) override; OUTLINE_MODE tracemode, void* aData ) override;
virtual void Arc( const wxPoint& centre, double StAngle, double EndAngle, virtual void Arc( const wxPoint& centre, double StAngle, double EndAngle,
int rayon, FILL_TYPE fill, int width = USE_DEFAULT_LINE_WIDTH ) override; int rayon, FILL_TYPE fill, int width = USE_DEFAULT_LINE_WIDTH ) override;
virtual void PenTo( const wxPoint& pos, char plume ) override; virtual void PenTo( const wxPoint& pos, char plume ) override;
virtual void FlashPadCircle( const wxPoint& pos, int diametre, virtual void FlashPadCircle( const wxPoint& pos, int diametre,
PLOT_MODE trace_mode, void* aData ) override; OUTLINE_MODE trace_mode, void* aData ) override;
virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, double orient, virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, double orient,
PLOT_MODE trace_mode, void* aData ) override; OUTLINE_MODE trace_mode, void* aData ) override;
virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, virtual void FlashPadRect( const wxPoint& pos, const wxSize& size,
double orient, PLOT_MODE trace_mode, void* aData ) override; double orient, OUTLINE_MODE trace_mode, void* aData ) override;
virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) override; double aPadOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount, virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) override; double aOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void Text( const wxPoint& aPos, virtual void Text( const wxPoint& aPos,
const COLOR4D aColor, const COLOR4D aColor,

26
common/plotters/plotter_gerber.h
View File

@ -78,16 +78,16 @@ public:
// These functions plot an item and manage X2 gerber attributes // These functions plot an item and manage X2 gerber attributes
virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode, void* aData ) override; OUTLINE_MODE tracemode, void* aData ) override;
virtual void ThickArc( const wxPoint& centre, double StAngle, double EndAngle, virtual void ThickArc( const wxPoint& centre, double StAngle, double EndAngle,
int rayon, int width, PLOT_MODE tracemode, void* aData ) override; int rayon, int width, OUTLINE_MODE tracemode, void* aData ) override;
virtual void ThickRect( const wxPoint& p1, const wxPoint& p2, int width, virtual void ThickRect( const wxPoint& p1, const wxPoint& p2, int width,
PLOT_MODE tracemode, void* aData ) override; OUTLINE_MODE tracemode, void* aData ) override;
virtual void ThickCircle( const wxPoint& pos, int diametre, int width, virtual void ThickCircle( const wxPoint& pos, int diametre, int width,
PLOT_MODE tracemode, void* aData ) override; OUTLINE_MODE tracemode, void* aData ) override;
virtual void FilledCircle( const wxPoint& pos, int diametre, virtual void FilledCircle( const wxPoint& pos, int diametre,
PLOT_MODE tracemode, void* aData ) override; OUTLINE_MODE tracemode, void* aData ) override;
/** /**
* Gerber polygon: they can (and *should*) be filled with the * Gerber polygon: they can (and *should*) be filled with the
@ -116,20 +116,20 @@ public:
* Filled circular flashes are stored as apertures * Filled circular flashes are stored as apertures
*/ */
virtual void FlashPadCircle( const wxPoint& pos, int diametre, virtual void FlashPadCircle( const wxPoint& pos, int diametre,
PLOT_MODE trace_mode, void* aData ) override; OUTLINE_MODE trace_mode, void* aData ) override;
/** /**
* Filled oval flashes are handled as aperture in the 90 degree positions only * Filled oval flashes are handled as aperture in the 90 degree positions only
*/ */
virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, double orient, virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, double orient,
PLOT_MODE trace_mode, void* aData ) override; OUTLINE_MODE trace_mode, void* aData ) override;
/** /**
* Filled rect flashes are handled as aperture in the 0 90 180 or 270 degree orientation only * Filled rect flashes are handled as aperture in the 0 90 180 or 270 degree orientation only
* and as polygon for other orientations * and as polygon for other orientations
* TODO: always use flashed shapes (aperture macros) * TODO: always use flashed shapes (aperture macros)
*/ */
virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, virtual void FlashPadRect( const wxPoint& pos, const wxSize& size,
double orient, PLOT_MODE trace_mode, void* aData ) override; double orient, OUTLINE_MODE trace_mode, void* aData ) override;
/** /**
* Roundrect pad at the moment are not handled as aperture, since * Roundrect pad at the moment are not handled as aperture, since
@ -138,20 +138,20 @@ public:
*/ */
virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
/** /**
* Trapezoidal pad at the moment are *never* handled as aperture, since * Trapezoidal pad at the moment are *never* handled as aperture, since
* they require aperture macros * they require aperture macros
* TODO: always use flashed shapes (aperture macros) * TODO: always use flashed shapes (aperture macros)
*/ */
virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) override; double aPadOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount, virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) override; double aOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
/** /**
* flash a chamfered round rect pad. * flash a chamfered round rect pad.
@ -172,7 +172,7 @@ public:
void FlashPadChamferRoundRect( const wxPoint& aShapePos, const wxSize& aPadSize, void FlashPadChamferRoundRect( const wxPoint& aShapePos, const wxSize& aPadSize,
int aCornerRadius, double aChamferRatio, int aCornerRadius, double aChamferRatio,
int aChamferPositions, int aChamferPositions,
double aPadOrient, PLOT_MODE aPlotMode, void* aData ); double aPadOrient, OUTLINE_MODE aPlotMode, void* aData );
/** /**
* Plot a Gerber region: similar to PlotPoly but plot only filled polygon, * Plot a Gerber region: similar to PlotPoly but plot only filled polygon,

16
common/plotters/plotter_hpgl.h
View File

@ -83,27 +83,27 @@ public:
void * aData = NULL) override; void * aData = NULL) override;
virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode, void* aData ) override; OUTLINE_MODE tracemode, void* aData ) override;
virtual void Arc( const wxPoint& centre, double StAngle, double EndAngle, virtual void Arc( const wxPoint& centre, double StAngle, double EndAngle,
int rayon, FILL_TYPE fill, int width = USE_DEFAULT_LINE_WIDTH ) override; int rayon, FILL_TYPE fill, int width = USE_DEFAULT_LINE_WIDTH ) override;
virtual void PenTo( const wxPoint& pos, char plume ) override; virtual void PenTo( const wxPoint& pos, char plume ) override;
virtual void FlashPadCircle( const wxPoint& aPadPos, int aDiameter, virtual void FlashPadCircle( const wxPoint& aPadPos, int aDiameter,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, double aPadOrient, virtual void FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, double aPadOrient,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize,
double aOrient, PLOT_MODE aTraceMode, void* aData ) override; double aOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTraceMode, double aPadOrient, OUTLINE_MODE aTraceMode,
void* aData ) override; void* aData ) override;
virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount, virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) override; double aOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
protected: protected:
void penControl( char plume ); void penControl( char plume );

14
common/plotters/plotters_pslike.h
View File

@ -66,22 +66,22 @@ public:
// Pad routines are handled with lower level primitives // Pad routines are handled with lower level primitives
virtual void FlashPadCircle( const wxPoint& aPadPos, int aDiameter, virtual void FlashPadCircle( const wxPoint& aPadPos, int aDiameter,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, double aPadOrient, virtual void FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, double aPadOrient,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize,
double aPadOrient, PLOT_MODE aTraceMode, double aPadOrient, OUTLINE_MODE aTraceMode,
void* aData ) override; void* aData ) override;
virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) override; OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) override; double aPadOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount, virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) override; double aOrient, OUTLINE_MODE aTraceMode, void* aData ) override;
/** The SetColor implementation is split with the subclasses: /** The SetColor implementation is split with the subclasses:
* The PSLIKE computes the rgb values, the subclass emits the * The PSLIKE computes the rgb values, the subclass emits the

6
include/eda_text.h
View File

@ -28,7 +28,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <plot_mode.h> #include <outline_mode.h>
#include <eda_rect.h> #include <eda_rect.h>
class OUTPUTFORMATTER; class OUTPUTFORMATTER;
@ -268,7 +268,7 @@ public:
* @param aDisplay_mode = FILLED or SKETCH * @param aDisplay_mode = FILLED or SKETCH
*/ */
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor, void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
PLOT_MODE aDisplay_mode = FILLED ); OUTLINE_MODE aDisplay_mode = FILLED );
/** /**
* Convert the text shape to a list of segment. * Convert the text shape to a list of segment.
@ -396,7 +396,7 @@ private:
* @param aPos = the position of this line ). * @param aPos = the position of this line ).
*/ */
void printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor, void printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
PLOT_MODE aFillMode, const wxString& aText, OUTLINE_MODE aFillMode, const wxString& aText,
const wxPoint& aPos ); const wxPoint& aPos );
}; };

6
include/plot_mode.h → include/outline_mode.h
View File

@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef PLOT_MODE_H #ifndef OUTLINE_MODE_H
#define PLOT_MODE_H #define OUTLINE_MODE_H
/* Options to draw items with thickness ( segments, arcs, circles, texts...) */ /* Options to draw items with thickness ( segments, arcs, circles, texts...) */
enum PLOT_MODE enum OUTLINE_MODE
{ {
SKETCH = 0, // sketch mode: draw segments outlines only SKETCH = 0, // sketch mode: draw segments outlines only
FILLED = 1 // normal mode: solid segments FILLED = 1 // normal mode: solid segments

2
include/pcb_base_frame.h
View File

@ -35,7 +35,7 @@
#include <eda_item.h> #include <eda_item.h>
#include <class_board.h> #include <class_board.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <plot_mode.h> #include <outline_mode.h>
#include <lib_id.h> #include <lib_id.h>
#include <pcb_display_options.h> #include <pcb_display_options.h>
#include <pcb_draw_panel_gal.h> #include <pcb_draw_panel_gal.h>

28
include/plotter.h
View File

@ -37,7 +37,7 @@
#include <math/box2.h> #include <math/box2.h>
#include <gr_text.h> #include <gr_text.h>
#include <page_info.h> #include <page_info.h>
#include <plot_mode.h> #include <outline_mode.h>
#include <gal/color4d.h> #include <gal/color4d.h>
#include <eda_item.h> // FILL_TYPE #include <eda_item.h> // FILL_TYPE
#include <render_settings.h> #include <render_settings.h>
@ -320,15 +320,15 @@ public:
// Higher level primitives -- can be drawn as line, sketch or 'filled' // Higher level primitives -- can be drawn as line, sketch or 'filled'
virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode, void* aData ); OUTLINE_MODE tracemode, void* aData );
virtual void ThickArc( const wxPoint& centre, double StAngle, double EndAngle, virtual void ThickArc( const wxPoint& centre, double StAngle, double EndAngle,
int rayon, int width, PLOT_MODE tracemode, void* aData ); int rayon, int width, OUTLINE_MODE tracemode, void* aData );
virtual void ThickRect( const wxPoint& p1, const wxPoint& p2, int width, virtual void ThickRect( const wxPoint& p1, const wxPoint& p2, int width,
PLOT_MODE tracemode, void* aData ); OUTLINE_MODE tracemode, void* aData );
virtual void ThickCircle( const wxPoint& pos, int diametre, int width, virtual void ThickCircle( const wxPoint& pos, int diametre, int width,
PLOT_MODE tracemode, void* aData ); OUTLINE_MODE tracemode, void* aData );
virtual void FilledCircle( const wxPoint& pos, int diametre, virtual void FilledCircle( const wxPoint& pos, int diametre,
PLOT_MODE tracemode, void* aData ); OUTLINE_MODE tracemode, void* aData );
// Flash primitives // Flash primitives
@ -341,7 +341,7 @@ public:
* @param aData an auxiliary info (mainly for gerber format attributes) * @param aData an auxiliary info (mainly for gerber format attributes)
*/ */
virtual void FlashPadCircle( const wxPoint& aPadPos, int aDiameter, virtual void FlashPadCircle( const wxPoint& aPadPos, int aDiameter,
PLOT_MODE aTraceMode, void* aData ) = 0; OUTLINE_MODE aTraceMode, void* aData ) = 0;
/** /**
* virtual function FlashPadOval * virtual function FlashPadOval
@ -352,7 +352,7 @@ public:
* @param aData an auxiliary info (mainly for gerber format attributes) * @param aData an auxiliary info (mainly for gerber format attributes)
*/ */
virtual void FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, double aPadOrient, virtual void FlashPadOval( const wxPoint& aPadPos, const wxSize& aSize, double aPadOrient,
PLOT_MODE aTraceMode, void* aData ) = 0; OUTLINE_MODE aTraceMode, void* aData ) = 0;
/** /**
* virtual function FlashPadRect * virtual function FlashPadRect
@ -363,7 +363,7 @@ public:
* @param aData an auxuliary info (mainly for gerber format attributes) * @param aData an auxuliary info (mainly for gerber format attributes)
*/ */
virtual void FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize,
double aPadOrient, PLOT_MODE aTraceMode, void* aData ) = 0; double aPadOrient, OUTLINE_MODE aTraceMode, void* aData ) = 0;
/** /**
* virtual function FlashPadRoundRect * virtual function FlashPadRoundRect
@ -376,7 +376,7 @@ public:
*/ */
virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aSize,
int aCornerRadius, double aOrient, int aCornerRadius, double aOrient,
PLOT_MODE aTraceMode, void* aData ) = 0; OUTLINE_MODE aTraceMode, void* aData ) = 0;
/** /**
* virtual function FlashPadCustom * virtual function FlashPadCustom
@ -388,7 +388,7 @@ public:
*/ */
virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize, virtual void FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
SHAPE_POLY_SET* aPolygons, SHAPE_POLY_SET* aPolygons,
PLOT_MODE aTraceMode, void* aData ) = 0; OUTLINE_MODE aTraceMode, void* aData ) = 0;
/** virtual function FlashPadTrapez /** virtual function FlashPadTrapez
* flash a trapezoidal pad * flash a trapezoidal pad
@ -400,7 +400,7 @@ public:
* @param aData an auxiliary info (mainly for gerber format attributes) * @param aData an auxiliary info (mainly for gerber format attributes)
*/ */
virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners,
double aPadOrient, PLOT_MODE aTraceMode, double aPadOrient, OUTLINE_MODE aTraceMode,
void* aData ) = 0; void* aData ) = 0;
/** Flash a regular polygon. Usefull only in Gerber files to flash a regular polygon /** Flash a regular polygon. Usefull only in Gerber files to flash a regular polygon
@ -412,7 +412,7 @@ public:
* specific to the plotter * specific to the plotter
*/ */
virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount, virtual void FlashRegularPolygon( const wxPoint& aShapePos, int aDiameter, int aCornerCount,
double aOrient, PLOT_MODE aTraceMode, void* aData ) = 0 ; double aOrient, OUTLINE_MODE aTraceMode, void* aData ) = 0 ;
/** /**
* Draws text with the plotter. For convenience it accept the color to use * Draws text with the plotter. For convenience it accept the color to use
@ -538,7 +538,7 @@ protected:
* Cdonvert a thick segment and plot it as an oval * Cdonvert a thick segment and plot it as an oval
*/ */
void segmentAsOval( const wxPoint& start, const wxPoint& end, int width, void segmentAsOval( const wxPoint& start, const wxPoint& end, int width,
PLOT_MODE tracemode ); OUTLINE_MODE tracemode );
void sketchOval( const wxPoint& pos, const wxSize& size, double orient, int width ); void sketchOval( const wxPoint& pos, const wxSize& size, double orient, int width );

2
pcbnew/dialogs/dialog_plot.h
View File

@ -82,7 +82,7 @@ private:
void applyPlotSettings(); void applyPlotSettings();
PLOT_FORMAT getPlotFormat(); PLOT_FORMAT getPlotFormat();
void setPlotModeChoiceSelection( PLOT_MODE aPlotMode ) void setPlotModeChoiceSelection( OUTLINE_MODE aPlotMode )
{ {
m_plotModeOpt->SetSelection( aPlotMode == SKETCH ? 1 : 0 ); m_plotModeOpt->SetSelection( aPlotMode == SKETCH ? 1 : 0 );
} }

8
pcbnew/pcb_plot_params.h
View File

@ -24,7 +24,7 @@
*/ */
#include <wx/wx.h> #include <wx/wx.h>
#include <plot_mode.h> #include <outline_mode.h>
#include <plotters_specific.h> #include <plotters_specific.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
@ -53,7 +53,7 @@ private:
/** FILLED or SKETCH selects how to plot filled objects. /** FILLED or SKETCH selects how to plot filled objects.
* FILLED or SKETCH not available with all drivers: some have fixed mode * FILLED or SKETCH not available with all drivers: some have fixed mode
*/ */
PLOT_MODE m_plotMode; OUTLINE_MODE m_plotMode;
/** DXF format: Plot items in outline (polygon) mode /** DXF format: Plot items in outline (polygon) mode
* In polygon mode, each item to plot is converted to a polygon, and all * In polygon mode, each item to plot is converted to a polygon, and all
@ -223,8 +223,8 @@ public:
return m_textMode; return m_textMode;
} }
void SetPlotMode( PLOT_MODE aPlotMode ) { m_plotMode = aPlotMode; } void SetPlotMode( OUTLINE_MODE aPlotMode ) { m_plotMode = aPlotMode; }
PLOT_MODE GetPlotMode() const { return m_plotMode; } OUTLINE_MODE GetPlotMode() const { return m_plotMode; }
void SetDXFPlotPolygonMode( bool aFlag ) { m_DXFplotPolygonMode = aFlag; } void SetDXFPlotPolygonMode( bool aFlag ) { m_DXFplotPolygonMode = aFlag; }
bool GetDXFPlotPolygonMode() const { return m_DXFplotPolygonMode; } bool GetDXFPlotPolygonMode() const { return m_DXFplotPolygonMode; }

2
pcbnew/pcbplot.h
View File

@ -112,7 +112,7 @@ public:
* and be drawn as a non filled item although the plot mode is filled * and be drawn as a non filled item although the plot mode is filled
* color and plot mode are needed by this function * color and plot mode are needed by this function
*/ */
void PlotPad( D_PAD* aPad, COLOR4D aColor, PLOT_MODE aPlotMode ); void PlotPad( D_PAD* aPad, COLOR4D aColor, OUTLINE_MODE aPlotMode );
/** /**
* plot items like text and graphics, * plot items like text and graphics,

4
pcbnew/plot_board_layers.cpp
View File

@ -207,7 +207,7 @@ void PlotStandardLayer( BOARD *aBoard, PLOTTER* aPlotter, LSET aLayerMask,
itemplotter.SetLayerSet( aLayerMask ); itemplotter.SetLayerSet( aLayerMask );
PLOT_MODE plotMode = aPlotOpt.GetPlotMode(); OUTLINE_MODE plotMode = aPlotOpt.GetPlotMode();
bool onCopperLayer = ( LSET::AllCuMask() & aLayerMask ).any(); bool onCopperLayer = ( LSET::AllCuMask() & aLayerMask ).any();
bool onSolderMaskLayer = ( LSET( 2, F_Mask, B_Mask ) & aLayerMask ).any(); bool onSolderMaskLayer = ( LSET( 2, F_Mask, B_Mask ) & aLayerMask ).any();
bool onSolderPasteLayer = ( LSET( 2, F_Paste, B_Paste ) & aLayerMask ).any(); bool onSolderPasteLayer = ( LSET( 2, F_Paste, B_Paste ) & aLayerMask ).any();
@ -233,7 +233,7 @@ void PlotStandardLayer( BOARD *aBoard, PLOTTER* aPlotter, LSET aLayerMask,
for( D_PAD* pad : module->Pads() ) for( D_PAD* pad : module->Pads() )
{ {
PLOT_MODE padPlotMode = plotMode; OUTLINE_MODE padPlotMode = plotMode;
if( !( pad->GetLayerSet() & aLayerMask ).any() ) if( !( pad->GetLayerSet() & aLayerMask ).any() )
{ {

4
pcbnew/plot_brditems_plotter.cpp
View File

@ -42,7 +42,7 @@
#include <board_design_settings.h> // for BOARD_DESIGN_SETTINGS #include <board_design_settings.h> // for BOARD_DESIGN_SETTINGS
#include <core/typeinfo.h> // for dyn_cast, PCB_DIMENSION_T #include <core/typeinfo.h> // for dyn_cast, PCB_DIMENSION_T
#include <plot_mode.h> #include <outline_mode.h>
#include <gal/color4d.h> // for COLOR4D, operator!= #include <gal/color4d.h> // for COLOR4D, operator!=
#include <gbr_metadata.h> #include <gbr_metadata.h>
#include <gbr_netlist_metadata.h> // for GBR_NETLIST_METADATA #include <gbr_netlist_metadata.h> // for GBR_NETLIST_METADATA
@ -85,7 +85,7 @@ COLOR4D BRDITEMS_PLOTTER::getColor( LAYER_NUM aLayer )
} }
void BRDITEMS_PLOTTER::PlotPad( D_PAD* aPad, COLOR4D aColor, PLOT_MODE aPlotMode ) void BRDITEMS_PLOTTER::PlotPad( D_PAD* aPad, COLOR4D aColor, OUTLINE_MODE aPlotMode )
{ {
wxPoint shape_pos = aPad->ShapePos(); wxPoint shape_pos = aPad->ShapePos();
GBR_METADATA gbr_metadata; GBR_METADATA gbr_metadata;