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

fix bug plot arc to dxf-format in back_silkscreen, comment and draw layers

This commit is contained in:
Andrey Fedorushkov 2012-02-01 15:42:18 +04:00
parent 0c00c88f11
commit c5f104a548
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/pcbplot.h
View File

@ -5,7 +5,7 @@
#ifndef PCBPLOT_H #ifndef PCBPLOT_H
#define PCBPLOT_H #define PCBPLOT_H
#include <pcb_plot_params.h> #include "pcb_plot_params.h"
class PLOTTER; class PLOTTER;
@ -52,7 +52,7 @@ void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* PtMire, int masque_layer,
EDA_DRAW_MODE_T trace_mode ); EDA_DRAW_MODE_T trace_mode );
void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* PtEdge, void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* PtEdge,
EDA_DRAW_MODE_T trace_mode ); EDA_DRAW_MODE_T trace_mode, int masque_layer );
void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone, void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone,
EDA_DRAW_MODE_T trace_mode ); EDA_DRAW_MODE_T trace_mode );

63
pcbnew/plot_rtn.cpp
View File

@ -3,29 +3,29 @@
* @brief Common plot routines. * @brief Common plot routines.
*/ */
#include <fctsys.h> #include "fctsys.h"
#include <common.h> #include "common.h"
#include <plot_common.h> #include "plot_common.h"
#include <base_struct.h> #include "base_struct.h"
#include <drawtxt.h> #include "drawtxt.h"
#include <confirm.h> #include "confirm.h"
#include <trigo.h> #include "trigo.h"
#include <wxBasePcbFrame.h> #include "wxBasePcbFrame.h"
#include <pcbcommon.h> #include "pcbcommon.h"
#include <macros.h> #include "macros.h"
#include <class_board.h> #include "class_board.h"
#include <class_module.h> #include "class_module.h"
#include <class_track.h> #include "class_track.h"
#include <class_edge_mod.h> #include "class_edge_mod.h"
#include <class_pcb_text.h> #include "class_pcb_text.h"
#include <class_zone.h> #include "class_zone.h"
#include <class_drawsegment.h> #include "class_drawsegment.h"
#include <class_mire.h> #include "class_mire.h"
#include <class_dimension.h> #include "class_dimension.h"
#include <pcbnew.h> #include "pcbnew.h"
#include <pcbplot.h> #include "pcbplot.h"
static void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask, static void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask,
EDA_DRAW_MODE_T trace_mode ); EDA_DRAW_MODE_T trace_mode );
@ -375,14 +375,14 @@ void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask, EDA_DRAW_
if( ( GetLayerMask( edge->GetLayer() ) & aLayerMask ) == 0 ) if( ( GetLayerMask( edge->GetLayer() ) & aLayerMask ) == 0 )
continue; continue;
Plot_1_EdgeModule( plotter, edge, trace_mode ); Plot_1_EdgeModule( plotter, edge, trace_mode, aLayerMask );
} }
} }
} }
/** Plot a graphic item (outline) relative to a footprint */ /** Plot a graphic item (outline) relative to a footprint */
void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T trace_mode ) void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T trace_mode, int masque_layer )
{ {
int type_trace; // Type of item to plot. int type_trace; // Type of item to plot.
int thickness; // Segment thickness. int thickness; // Segment thickness.
@ -418,7 +418,16 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T tr
double endAngle = startAngle + aEdge->GetAngle(); double endAngle = startAngle + aEdge->GetAngle();
plotter->thick_arc( pos, if ( ( g_PcbPlotOptions.GetPlotFormat() == PLOT_FORMAT_DXF ) &&
( masque_layer & ( SILKSCREEN_LAYER_BACK | DRAW_LAYER | COMMENT_LAYER ) ) )
plotter->thick_arc( pos,
-startAngle,
-endAngle,
radius,
thickness,
trace_mode );
else
plotter->thick_arc( pos,
-endAngle, -endAngle,
-startAngle, -startAngle,
radius, radius,
@ -791,7 +800,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter,
{ {
case PCB_MODULE_EDGE_T: case PCB_MODULE_EDGE_T:
if( aLayerMask & GetLayerMask( item->GetLayer() ) ) if( aLayerMask & GetLayerMask( item->GetLayer() ) )
Plot_1_EdgeModule( aPlotter, (EDGE_MODULE*) item, aPlotMode ); Plot_1_EdgeModule( aPlotter, (EDGE_MODULE*) item, aPlotMode, aLayerMask );
break; break;
@ -1008,13 +1017,13 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER* aPlotter,
continue; continue;
pos = pts->m_Start; pos = pts->m_Start;
// It is quite possible that the real drill value is less then small drill value. // It is quite possible that the real drill value is less then small drill value.
if( g_PcbPlotOptions.m_DrillShapeOpt == PCB_PLOT_PARAMS::SMALL_DRILL_SHAPE ) if( g_PcbPlotOptions.m_DrillShapeOpt == PCB_PLOT_PARAMS::SMALL_DRILL_SHAPE )
diam.x = diam.y = MIN( SMALL_DRILL, pts->GetDrillValue() ); diam.x = diam.y = MIN( SMALL_DRILL, pts->GetDrillValue() );
else else
diam.x = diam.y = pts->GetDrillValue(); diam.x = diam.y = pts->GetDrillValue();
diam.x -= aPlotter->get_plot_width_adj(); diam.x -= aPlotter->get_plot_width_adj();
diam.x = doIntValueFitToBand( diam.x, 1, pts->m_Width - 1 ); diam.x = doIntValueFitToBand( diam.x, 1, pts->m_Width - 1 );
aPlotter->flash_pad_circle( pos, diam.x, aTraceMode ); aPlotter->flash_pad_circle( pos, diam.x, aTraceMode );