Commit d8485267 authored by dickelbeck's avatar dickelbeck
Browse files

plot fill patch

parent dfce81f4

common/common_plotHPGL_functions.cpp

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ bool CloseFileHPGL( FILE* plot_file ) 
}



/************************************************************/

void PlotRectHPGL( wxPoint p1, wxPoint p2, int fill, int width )

void PlotRectHPGL( wxPoint p1, wxPoint p2, bool fill, int width )

/************************************************************/

{

    char Line[256];
@@ -86,7 +86,7 @@ void PlotRectHPGL( wxPoint p1, wxPoint p2, int fill, int width ) 




/************************************************************/

void PlotCircleHPGL( wxPoint centre, int diameter, int fill, int width )

void PlotCircleHPGL( wxPoint centre, int diameter, bool fill, int width )

/************************************************************/

{

    int  rayon;
@@ -107,7 +107,7 @@ void PlotCircleHPGL( wxPoint centre, int diameter, int fill, int width ) 




/********************************************************************/

void PlotArcHPGL( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, int width )

void PlotArcHPGL( wxPoint centre, int StAngle, int EndAngle, int rayon, bool fill, int width )

/********************************************************************/



/* trace d'un arc de cercle:
@@ -153,7 +153,7 @@ void PlotArcHPGL( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill 




/*****************************************************/

void PlotPolyHPGL( int nb, int* coord, int fill, int width )

void PlotPolyHPGL( int nb, int* coord, bool fill, int width )

/*****************************************************/



/* Trace un polygone (ferme si rempli) en format HPGL

common/common_plotPS_functions.cpp

+20 −20
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void PlotFilledSegmentPS( wxPoint start, wxPoint end, int width ) 
}



/***************************************************************/

void PlotRectPS( wxPoint p1, wxPoint p2, int fill, int width )

void PlotRectPS( wxPoint p1, wxPoint p2, bool fill, int width )

/***************************************************************/

{

    UserToDeviceCoordinate( p1 );
@@ -126,7 +126,7 @@ void PlotRectPS( wxPoint p1, wxPoint p2, int fill, int width ) 
}



/******************************************************/

void PlotCirclePS( wxPoint pos, int diametre, int fill, int width )

void PlotCirclePS( wxPoint pos, int diametre, bool fill, int width )

/******************************************************/

{

    int  rayon;
@@ -145,7 +145,7 @@ void PlotCirclePS( wxPoint pos, int diametre, int fill, int width ) 




/**************************************************************************************/

void PlotArcPS( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, int width )

void PlotArcPS( wxPoint centre, int StAngle, int EndAngle, int rayon, bool fill, int width )

/**************************************************************************************/



/* Plot an arc:
@@ -178,7 +178,7 @@ void PlotArcPS( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, 




/*****************************************************************/

void PlotPolyPS( int nb_segm, int* coord, int fill, int width )

void PlotPolyPS( int nb_segm, int* coord, bool fill, int width )

/*****************************************************************/



/* Draw a polygon ( a filled polygon if fill == 1 ) in POSTSCRIPT format

eeschema/libcmp.h

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ class LibDrawCircle : public LibEDA_BaseStruct 
{

public:

    int     m_Rayon;

    int m_Fill;

    bool    m_Fill;



public:

    LibDrawCircle();

include/plot_common.h

+9 −9
Original line number Diff line number Diff line
@@ -61,12 +61,12 @@ void InitPlotParametresPS( wxPoint offset, 
                              double yscale,

                              int orient = 0 );

void    SetDefaultLineWidthPS( int width );

void	PlotRectPS(wxPoint p1, wxPoint p2, int fill, int width = -1);

void    PlotCirclePS( wxPoint pos, int diametre, int fill, int width = -1 );

void    PlotArcPS( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, int width = -1 );

void    PlotRectPS( wxPoint p1, wxPoint p2, bool fill, int width = -1 );

void    PlotCirclePS( wxPoint pos, int diametre, bool fill, int width = -1 );

void    PlotArcPS( wxPoint centre, int StAngle, int EndAngle, int rayon, bool fill, int width = -1 );



// Plot an arc: StAngle, EndAngle = start and end arc in 0.1 degree

void    PlotPolyPS( int nb_segm, int* coord, int fill, int width = -1 );

void    PlotPolyPS( int nb_segm, int* coord, bool fill, int width = -1 );

void    PlotFilledSegmentPS( wxPoint start, wxPoint end, int width );

void    LineTo_PS( wxPoint pos, int plume );

void    PrintHeaderPS( FILE* file,
@@ -85,10 +85,10 @@ void SetColorMapPS( int color ); 
void    InitPlotParametresHPGL( wxPoint offset, double xscale, double yscale, int orient = 0 );

bool    PrintHeaderHPGL( FILE* plot_file, int pen_speed, int pen_num );

bool    CloseFileHPGL( FILE* plot_file );

void    PlotCircleHPGL( wxPoint centre, int diameter, int fill, int width = -1 );

void	PlotRectHPGL(wxPoint t1, wxPoint t2, int fill, int width = -1);

void    PlotArcHPGL( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, int width = -1 );

void    PlotPolyHPGL( int nb, int* coord, int fill, int width = -1 );

void    PlotCircleHPGL( wxPoint centre, int diameter, bool fill, int width = -1 );

void    PlotRectHPGL( wxPoint t1, wxPoint t2, bool fill, int width = -1 );

void    PlotArcHPGL( wxPoint centre, int StAngle, int EndAngle, int rayon, bool fill, int width = -1 );

void    PlotPolyHPGL( int nb, int* coord, bool fill, int width = -1 );

void    Move_Plume_HPGL( wxPoint pos, int plume );

void    Plume_HPGL( int plume );

pcbnew/plot_rtn.cpp

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ void PlotCircle( int format_plot, int thickness, wxPoint centre, int radius ) 
        break;



    case PLOT_FORMAT_POST:

        PlotCirclePS( centre, radius * 2, thickness, 0);

        PlotCirclePS( centre, radius * 2, 0, thickness);

        break;

    }

}