From d8485267e7e395ae2f34cd245939ce9d2d1f9830 Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Tue, 5 Aug 2008 16:06:45 +0000 Subject: [PATCH] plot fill patch --- common/common_plotHPGL_functions.cpp | 8 +++--- common/common_plotPS_functions.cpp | 40 ++++++++++++++-------------- eeschema/libcmp.h | 4 +-- include/plot_common.h | 18 ++++++------- pcbnew/plot_rtn.cpp | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/common/common_plotHPGL_functions.cpp b/common/common_plotHPGL_functions.cpp index 0dec490dce..406fa7017b 100644 --- a/common/common_plotHPGL_functions.cpp +++ b/common/common_plotHPGL_functions.cpp @@ -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 diff --git a/common/common_plotPS_functions.cpp b/common/common_plotPS_functions.cpp index b1bbbf4af9..ae1cc92c62 100644 --- a/common/common_plotPS_functions.cpp +++ b/common/common_plotPS_functions.cpp @@ -114,19 +114,19 @@ 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 ); UserToDeviceCoordinate( p2 ); SetCurrentLineWidthPS( width ); - fprintf( PlotOutputFile, "%d %d %d %d rect%d\n", p1.x, p1.y, - p2.x-p1.x, p2.y-p1.y, fill ); + fprintf( PlotOutputFile, "%d %d %d %d rect%d\n", p1.x, p1.y, + p2.x-p1.x, p2.y-p1.y, fill ); } /******************************************************/ -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: @@ -165,11 +165,11 @@ void PlotArcPS( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, if( PlotOrientOptions == PLOT_MIROIR ) sprintf( Line, "%d %d %d %f %f arc%d\n", centre.x, centre.y, (int) (rayon * XScale), (float) StAngle / 10, (float) EndAngle / 10, - fill); + fill); else sprintf( Line, "%d %d %d %f %f arc%d\n", centre.x, centre.y, (int) (rayon * XScale), -(float) EndAngle / 10, -(float) StAngle / 10, - fill); + fill); // Undo internationalization printf (float x.y printed x,y) to_point( Line ); @@ -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 @@ -270,18 +270,18 @@ void PrintHeaderPS( FILE* file, const wxString& Creator, " lineto\n", " stroke\n", "} bind def\n", - "/cir0 { newpath 0 360 arc stroke } bind def\n", - "/cir1 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", - "/cir2 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", - "/arc0 { newpath arc stroke } bind def\n", - "/arc1 { newpath 4 index 4 index moveto arc closepath gsave fill grestore stroke } bind def\n", - "/arc2 { newpath 4 index 4 index moveto arc closepath gsave fill grestore stroke } bind def\n", - "/poly0 { stroke } bind def\n", - "/poly1 { closepath gsave fill grestore stroke } bind def\n", - "/poly2 { closepath gsave fill grestore stroke } bind def\n", - "/rect0 { rectstroke } bind def\n", - "/rect1 { rectfill } bind def\n", - "/rect2 { rectfill } bind def\n", + "/cir0 { newpath 0 360 arc stroke } bind def\n", + "/cir1 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", + "/cir2 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", + "/arc0 { newpath arc stroke } bind def\n", + "/arc1 { newpath 4 index 4 index moveto arc closepath gsave fill grestore stroke } bind def\n", + "/arc2 { newpath 4 index 4 index moveto arc closepath gsave fill grestore stroke } bind def\n", + "/poly0 { stroke } bind def\n", + "/poly1 { closepath gsave fill grestore stroke } bind def\n", + "/poly2 { closepath gsave fill grestore stroke } bind def\n", + "/rect0 { rectstroke } bind def\n", + "/rect1 { rectfill } bind def\n", + "/rect2 { rectfill } bind def\n", "gsave\n", "72 72 scale\t\t\t% Talk inches\n", "1 setlinecap\n", diff --git a/eeschema/libcmp.h b/eeschema/libcmp.h index ad9bfcd7f5..43f91171ff 100644 --- a/eeschema/libcmp.h +++ b/eeschema/libcmp.h @@ -258,8 +258,8 @@ public: class LibDrawCircle : public LibEDA_BaseStruct { public: - int m_Rayon; - int m_Fill; + int m_Rayon; + bool m_Fill; public: LibDrawCircle(); diff --git a/include/plot_common.h b/include/plot_common.h index a701651687..2fa386788c 100644 --- a/include/plot_common.h +++ b/include/plot_common.h @@ -1,5 +1,5 @@ /********************/ -/* plot_common.h */ +/* plot_common.h */ /********************/ #ifndef PLOT_COMMON_H @@ -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 ); diff --git a/pcbnew/plot_rtn.cpp b/pcbnew/plot_rtn.cpp index f59a4d1ef7..06c512b23e 100644 --- a/pcbnew/plot_rtn.cpp +++ b/pcbnew/plot_rtn.cpp @@ -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; } }