Commit 90721d13 authored by dickelbeck's avatar dickelbeck

more plot fixes

parent d8485267
...@@ -238,7 +238,7 @@ class LibDrawArc : public LibEDA_BaseStruct ...@@ -238,7 +238,7 @@ class LibDrawArc : public LibEDA_BaseStruct
{ {
public: public:
int m_Rayon; int m_Rayon;
int m_Fill; bool m_Fill;
int t1, t2; /* position des 2 extremites de l'arc en 0,1 degres */ int t1, t2; /* position des 2 extremites de l'arc en 0,1 degres */
wxPoint m_ArcStart, m_ArcEnd; /* position des 2 extremites de l'arc en coord reelles*/ wxPoint m_ArcStart, m_ArcEnd; /* position des 2 extremites de l'arc en coord reelles*/
...@@ -299,7 +299,7 @@ class LibDrawSquare : public LibEDA_BaseStruct ...@@ -299,7 +299,7 @@ class LibDrawSquare : public LibEDA_BaseStruct
{ {
public: public:
wxPoint m_End; wxPoint m_End;
int m_Fill; bool m_Fill;
public: public:
LibDrawSquare(); LibDrawSquare();
...@@ -335,8 +335,9 @@ public: ...@@ -335,8 +335,9 @@ public:
class LibDrawPolyline : public LibEDA_BaseStruct class LibDrawPolyline : public LibEDA_BaseStruct
{ {
public: public:
int n, * PolyList; int n;
int m_Fill; int* PolyList;
bool m_Fill;
public: public:
LibDrawPolyline(); LibDrawPolyline();
......
...@@ -23,8 +23,8 @@ static void PlotPinSymbol( int posX, int posY, int len, int orient, int Shape ); ...@@ -23,8 +23,8 @@ static void PlotPinSymbol( int posX, int posY, int len, int orient, int Shape );
/***/ /***/
/* cte pour remplissage de polygones */ /* cte pour remplissage de polygones */
#define FILL 1 #define FILL true
#define NOFILL 0 #define NOFILL false
#define PLOT_SHEETREF_MARGIN 0 // margin for sheet refs #define PLOT_SHEETREF_MARGIN 0 // margin for sheet refs
...@@ -90,7 +90,7 @@ void PlotRect( wxPoint p1, wxPoint p2, int fill, int width ) ...@@ -90,7 +90,7 @@ void PlotRect( wxPoint p1, wxPoint p2, int fill, int width )
} }
/*******************************************************************************/ /*******************************************************************************/
void PlotArc( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, int width ) void PlotArc( wxPoint centre, int StAngle, int EndAngle, int rayon, bool fill, int width )
/*******************************************************************************/ /*******************************************************************************/
/* trace d'un arc de cercle: /* trace d'un arc de cercle:
...@@ -113,7 +113,7 @@ void PlotArc( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, in ...@@ -113,7 +113,7 @@ void PlotArc( wxPoint centre, int StAngle, int EndAngle, int rayon, int fill, in
/*******************************************************/ /*******************************************************/
void PlotCercle( wxPoint pos, int diametre, int fill, int width ) void PlotCercle( wxPoint pos, int diametre, bool fill, int width )
/*******************************************************/ /*******************************************************/
{ {
switch( g_PlotFormat ) switch( g_PlotFormat )
...@@ -130,7 +130,7 @@ void PlotCercle( wxPoint pos, int diametre, int fill, int width ) ...@@ -130,7 +130,7 @@ void PlotCercle( wxPoint pos, int diametre, int fill, int width )
/******************************************************************/ /******************************************************************/
void PlotPoly( int nb, int* coord, int fill, int width ) void PlotPoly( int nb, int* coord, bool fill, int width )
/******************************************************************/ /******************************************************************/
/* Trace un polygone ferme /* Trace un polygone ferme
...@@ -480,7 +480,7 @@ static void PlotPinSymbol( int posX, int posY, int len, int orient, int Shape ) ...@@ -480,7 +480,7 @@ static void PlotPinSymbol( int posX, int posY, int len, int orient, int Shape )
{ {
PlotCercle( wxPoint( MapX1 * INVERT_PIN_RADIUS + x1, PlotCercle( wxPoint( MapX1 * INVERT_PIN_RADIUS + x1,
MapY1 * INVERT_PIN_RADIUS + y1), MapY1 * INVERT_PIN_RADIUS + y1),
INVERT_PIN_RADIUS * 2,0 ); false, INVERT_PIN_RADIUS * 2 );
Move_Plume( wxPoint( MapX1 * INVERT_PIN_RADIUS * 2 + x1, Move_Plume( wxPoint( MapX1 * INVERT_PIN_RADIUS * 2 + x1,
MapY1 * INVERT_PIN_RADIUS * 2 + y1 ), 'U' ); MapY1 * INVERT_PIN_RADIUS * 2 + y1 ), 'U' );
......
...@@ -677,7 +677,7 @@ void WinEDA_PlotHPGLFrame::Plot_1_Page_HPGL( const wxString& FullFileName, ...@@ -677,7 +677,7 @@ void WinEDA_PlotHPGLFrame::Plot_1_Page_HPGL( const wxString& FullFileName,
#undef STRUCT #undef STRUCT
#define STRUCT ( (DrawJunctionStruct*) DrawList ) #define STRUCT ( (DrawJunctionStruct*) DrawList )
x1 = STRUCT->m_Pos.x; y1 = STRUCT->m_Pos.y; x1 = STRUCT->m_Pos.x; y1 = STRUCT->m_Pos.y;
PlotCercle( wxPoint( x1, y1 ), DRAWJUNCTION_SIZE * 2, 1 ); PlotCercle( wxPoint( x1, y1 ), true, DRAWJUNCTION_SIZE * 2 );
break; break;
case TYPE_SCH_TEXT: case TYPE_SCH_TEXT:
......
...@@ -290,8 +290,8 @@ int CheckAnnotate(WinEDA_SchematicFrame * frame, bool OneSheetOnly); ...@@ -290,8 +290,8 @@ int CheckAnnotate(WinEDA_SchematicFrame * frame, bool OneSheetOnly);
void SetCurrentLineWidth( int width); void SetCurrentLineWidth( int width);
void PlotArc(wxPoint centre, int StAngle, int EndAngle, int rayon, int width = -1); void PlotArc(wxPoint centre, int StAngle, int EndAngle, int rayon, int width = -1);
void PlotCercle(wxPoint centre, int diametre, int fill, int width = -1); void PlotCercle(wxPoint centre, int diametre, bool fill, int width = -1);
void PlotPoly( int nb, int * coord, int fill, int width = -1); void PlotPoly( int nb, int * coord, bool fill, int width = -1);
void PlotNoConnectStruct(DrawNoConnectStruct * Struct); void PlotNoConnectStruct(DrawNoConnectStruct * Struct);
void PlotLibPart( SCH_COMPONENT *DrawLibItem ); void PlotLibPart( SCH_COMPONENT *DrawLibItem );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment