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

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

Minor code change (which removes a SWIG warning)
parent 2d008c79

common/class_plotter.cpp

+5 −6
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void PLOTTER::markerSquare( const wxPoint& position, int radius ) 
    corner.y = position.y + r;

    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 ) 
 */

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 ) 
    corner.y = position.y + radius;

    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 ) 
	if( pat & 0100 )

	    markerCircle( position, radius );

    }



}

pcbnew/legacy_plugin.cpp

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#include <class_edge_mod.h>

#include <3d_struct.h>

#include <pcb_plot_params.h>

#include <pcb_plot_params_parser.h>

#include <drawtxt.h>

#include <convert_to_biu.h>

#include <trigo.h>

pcbnew/pcb_parser.cpp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <class_track.h>

#include <class_zone.h>

#include <kicad_plugin.h>

#include <pcb_plot_params_parser.h>

#include <pcb_plot_params.h>

#include <zones.h>

#include <pcb_parser.h>

pcbnew/pcb_plot_params.cpp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include <wx/wx.h>

#include <pcb_plot_params_parser.h>

#include <pcb_plot_params.h>

#include <layers_id_colors_and_visibility.h>

#include <plot_common.h>

pcbnew/pcb_plot_params.h

+1 −46
Original line number Diff line number Diff line
@@ -24,56 +24,11 @@ 
 */



#include <wx/wx.h>

#include <pcb_plot_params_lexer.h>

#include <eda_text.h>                // EDA_DRAW_MODE_T

#include <plot_common.h>

#include <layers_id_colors_and_visibility.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 );

};



class PCB_PLOT_PARAMS_PARSER;



/**

 * Class PCB_PLOT_PARAMS