Commit e73e94ed authored by dickelbeck's avatar dickelbeck

fixed a bug plotting pins with circles in them

parent 9fdc316d
...@@ -418,10 +418,10 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -418,10 +418,10 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
{ {
int i, x1, y1, x2, y2, t1, t2, orient; int i, x1, y1, x2, y2, t1, t2, orient;
LibEDA_BaseStruct* DEntry = NULL; LibEDA_BaseStruct* DEntry = NULL;
int CharColor; int CharColor;
int fill_option; FILL_T fill_option;
int SetHightColor; int SetHightColor;
int LineWidth; int LineWidth;
//#define GETCOLOR(l) Color < 0 ? (ReturnLayerColor(l)| SetHightColor) : Color; //#define GETCOLOR(l) Color < 0 ? (ReturnLayerColor(l)| SetHightColor) : Color;
#define GETCOLOR( l ) Color < 0 ? SetHightColor ?\ #define GETCOLOR( l ) Color < 0 ? SetHightColor ?\
...@@ -471,9 +471,11 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -471,9 +471,11 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
{ {
EXCHG( x1, x2 ); EXCHG( y1, y2 ) EXCHG( x1, x2 ); EXCHG( y1, y2 )
} }
fill_option = Arc->m_Fill; fill_option = Arc->m_Fill;
if ( g_IsPrinting && fill_option == FILLED_WITH_BG_BODYCOLOR && GetGRForceBlackPenState( ) ) if ( g_IsPrinting && fill_option == FILLED_WITH_BG_BODYCOLOR && GetGRForceBlackPenState( ) )
fill_option = NO_FILL; fill_option = NO_FILL;
if( Color < 0 ) // Normal Color Layer if( Color < 0 ) // Normal Color Layer
{ {
if( fill_option == FILLED_WITH_BG_BODYCOLOR ) if( fill_option == FILLED_WITH_BG_BODYCOLOR )
......
This diff is collapsed.
...@@ -27,7 +27,7 @@ static void MoveLibDrawItemAt( LibEDA_BaseStruct* DrawItem, wxPoint newpos ); ...@@ -27,7 +27,7 @@ static void MoveLibDrawItemAt( LibEDA_BaseStruct* DrawItem, wxPoint newpos );
/* Variables locales */ /* Variables locales */
static int StateDrawArc, ArcStartX, ArcStartY, ArcEndX, ArcEndY; static int StateDrawArc, ArcStartX, ArcStartY, ArcEndX, ArcEndY;
static wxPoint InitPosition, StartCursor, ItemPreviousPos; static wxPoint InitPosition, StartCursor, ItemPreviousPos;
static int FlSymbol_Fill = NO_FILL; static FILL_T FlSymbol_Fill = NO_FILL;
/************************************/ /************************************/
...@@ -46,8 +46,10 @@ bodygraphics_PropertiesAccept( wxCommandEvent& event ) ...@@ -46,8 +46,10 @@ bodygraphics_PropertiesAccept( wxCommandEvent& event )
{ {
g_FlDrawSpecificConvert = m_CommonConvert->GetValue() ? FALSE : TRUE; g_FlDrawSpecificConvert = m_CommonConvert->GetValue() ? FALSE : TRUE;
g_FlDrawSpecificUnit = m_CommonUnit->GetValue() ? FALSE : TRUE; g_FlDrawSpecificUnit = m_CommonUnit->GetValue() ? FALSE : TRUE;
if( m_Filled ) if( m_Filled )
FlSymbol_Fill = m_Filled->GetSelection(); FlSymbol_Fill = (FILL_T) m_Filled->GetSelection();
g_LibSymbolDefaultLineWidth = m_GraphicShapeWidthCtrl->GetValue(); g_LibSymbolDefaultLineWidth = m_GraphicShapeWidthCtrl->GetValue();
if( CurrentDrawItem ) if( CurrentDrawItem )
......
...@@ -791,7 +791,7 @@ void PlotCircle( int format_plot, int thickness, wxPoint centre, int radius ) ...@@ -791,7 +791,7 @@ void PlotCircle( int format_plot, int thickness, wxPoint centre, int radius )
break; break;
case PLOT_FORMAT_POST: case PLOT_FORMAT_POST:
PlotCirclePS( centre, radius * 2, 0, thickness); PlotCirclePS( centre, radius * 2, false, thickness );
break; break;
} }
} }
......
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