Commit 82339a92 authored by jean-pierre charras's avatar jean-pierre charras

Fix bug #1358742 (drill map file output faulty), which was Gerber format specific.

Minor code change (which removes a SWIG warning)
parent 2d008c79
...@@ -194,7 +194,7 @@ void PLOTTER::markerSquare( const wxPoint& position, int radius ) ...@@ -194,7 +194,7 @@ void PLOTTER::markerSquare( const wxPoint& position, int radius )
corner.y = position.y + r; corner.y = position.y + r;
corner_list.push_back( corner ); corner_list.push_back( corner );
PlotPoly( corner_list, NO_FILL ); PlotPoly( corner_list, NO_FILL, GetCurrentLineWidth() );
} }
/** /**
...@@ -202,7 +202,7 @@ void PLOTTER::markerSquare( const wxPoint& position, int radius ) ...@@ -202,7 +202,7 @@ void PLOTTER::markerSquare( const wxPoint& position, int radius )
*/ */
void PLOTTER::markerCircle( const wxPoint& position, int radius ) void PLOTTER::markerCircle( const wxPoint& position, int radius )
{ {
Circle( position, radius * 2, NO_FILL ); Circle( position, radius * 2, NO_FILL, GetCurrentLineWidth() );
} }
/** /**
...@@ -228,7 +228,7 @@ void PLOTTER::markerLozenge( const wxPoint& position, int radius ) ...@@ -228,7 +228,7 @@ void PLOTTER::markerLozenge( const wxPoint& position, int radius )
corner.y = position.y + radius; corner.y = position.y + radius;
corner_list.push_back( corner ); corner_list.push_back( corner );
PlotPoly( corner_list, NO_FILL ); PlotPoly( corner_list, NO_FILL, GetCurrentLineWidth() );
} }
/** /**
...@@ -376,7 +376,6 @@ void PLOTTER::Marker( const wxPoint& position, int diametre, unsigned aShapeId ) ...@@ -376,7 +376,6 @@ void PLOTTER::Marker( const wxPoint& position, int diametre, unsigned aShapeId )
if( pat & 0100 ) if( pat & 0100 )
markerCircle( position, radius ); markerCircle( position, radius );
} }
} }
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
#include <class_edge_mod.h> #include <class_edge_mod.h>
#include <3d_struct.h> #include <3d_struct.h>
#include <pcb_plot_params.h> #include <pcb_plot_params.h>
#include <pcb_plot_params_parser.h>
#include <drawtxt.h> #include <drawtxt.h>
#include <convert_to_biu.h> #include <convert_to_biu.h>
#include <trigo.h> #include <trigo.h>
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <class_track.h> #include <class_track.h>
#include <class_zone.h> #include <class_zone.h>
#include <kicad_plugin.h> #include <kicad_plugin.h>
#include <pcb_plot_params_parser.h>
#include <pcb_plot_params.h> #include <pcb_plot_params.h>
#include <zones.h> #include <zones.h>
#include <pcb_parser.h> #include <pcb_parser.h>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include <wx/wx.h> #include <wx/wx.h>
#include <pcb_plot_params_parser.h>
#include <pcb_plot_params.h> #include <pcb_plot_params.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
#include <plot_common.h> #include <plot_common.h>
......
...@@ -24,56 +24,11 @@ ...@@ -24,56 +24,11 @@
*/ */
#include <wx/wx.h> #include <wx/wx.h>
#include <pcb_plot_params_lexer.h>
#include <eda_text.h> // EDA_DRAW_MODE_T #include <eda_text.h> // EDA_DRAW_MODE_T
#include <plot_common.h> #include <plot_common.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
class PCB_PLOT_PARAMS; class PCB_PLOT_PARAMS_PARSER;
class LINE_READER;
/**
* Class PCB_PLOT_PARAMS_PARSER
* is the parser class for PCB_PLOT_PARAMS.
*/
class PCB_PLOT_PARAMS_PARSER : public PCB_PLOT_PARAMS_LEXER
{
public:
PCB_PLOT_PARAMS_PARSER( LINE_READER* aReader );
PCB_PLOT_PARAMS_PARSER( char* aLine, const wxString& aSource );
LINE_READER* GetReader() { return reader; };
void Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) throw( PARSE_ERROR, IO_ERROR );
private:
bool parseBool();
/**
* Function parseInt
* parses an integer and constrains it between two values.
* @param aMin is the smallest return value.
* @param aMax is the largest return value.
* @return int - the parsed integer.
*/
int parseInt( int aMin, int aMax );
/**
* Function parseDouble
* parses a double
* @return double - the parsed double.
*/
double parseDouble();
/**
* Function skipCurrent
* Skip the current token level, i.e
* search for the RIGHT parenthesis which closes the current description
*/
void skipCurrent() throw( IO_ERROR, PARSE_ERROR );
};
/** /**
* Class PCB_PLOT_PARAMS * Class PCB_PLOT_PARAMS
......
#ifndef PCB_PLOT_PARAMS_PARSER_H_
#define PCB_PLOT_PARAMS_PARSER_H_
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2011 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <pcb_plot_params_lexer.h>
//#include <plot_common.h>
class PCB_PLOT_PARAMS;
class LINE_READER;
/**
* Class PCB_PLOT_PARAMS_PARSER
* is the parser class for PCB_PLOT_PARAMS.
*/
class PCB_PLOT_PARAMS_PARSER : public PCB_PLOT_PARAMS_LEXER
{
public:
PCB_PLOT_PARAMS_PARSER( LINE_READER* aReader );
PCB_PLOT_PARAMS_PARSER( char* aLine, const wxString& aSource );
LINE_READER* GetReader() { return reader; };
void Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) throw( PARSE_ERROR, IO_ERROR );
private:
bool parseBool();
/**
* Function parseInt
* parses an integer and constrains it between two values.
* @param aMin is the smallest return value.
* @param aMax is the largest return value.
* @return int - the parsed integer.
*/
int parseInt( int aMin, int aMax );
/**
* Function parseDouble
* parses a double
* @return double - the parsed double.
*/
double parseDouble();
/**
* Function skipCurrent
* Skip the current token level, i.e
* search for the RIGHT parenthesis which closes the current description
*/
void skipCurrent() throw( IO_ERROR, PARSE_ERROR );
};
#endif // PCB_PLOT_PARAMS_PARSER_H_
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