Move plotter headers into include folder.

common/basic_gal.cpp

@@ -32,7 +32,7 @@
  */
 
 #include <gr_basic.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 
 #include <basic_gal.h>

common/bitmap_base.cpp

@@ -28,11 +28,10 @@
 
 #include <bitmap_base.h>
 #include <eda_rect.h>     // for EDA_RECT
-#include <gal/color4d.h>  // for COLOR4D
 #include <gr_basic.h>
-#include <math/util.h>      // for KiROUND
+#include <math/util.h>    // for KiROUND
 #include <memory>         // for make_unique, unique_ptr
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <richio.h>
 #include <wx/bitmap.h>    // for wxBitmap
 #include <wx/mstream.h>

common/gr_text.cpp

@@ -30,11 +30,10 @@
  */
 
 #include <gr_basic.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <eda_text.h>           // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T
 #include <trigo.h>
 #include <base_screen.h>
-#include <gr_text.h>
 #include <math/util.h>          // for KiROUND
 
 #include <basic_gal.h>

common/plotters/DXF_plotter.cpp

@@ -25,7 +25,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "plotter_dxf.h"
+#include <plotters/plotter_dxf.h>
 #include <macros.h>
 #include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>

common/plotters/GERBER_plotter.cpp

@@ -32,8 +32,8 @@
 
 #include <build_version.h>
 
-#include "plotter_gerber.h"
-#include "gbr_plotter_aperture_macros.h"
+#include <plotters/plotter_gerber.h>
+#include <plotters/gbr_plotter_aperture_macros.h>
 
 #include <gbr_metadata.h>
 

common/plotters/HPGL_plotter.cpp

@@ -200,7 +200,7 @@
 #include <math/util.h>      // for KiROUND
 #include <trigo.h>
 
-#include "plotter_hpgl.h"
+#include <plotters/plotter_hpgl.h>
 
 
 /// Compute the distance between two DPOINT points.

common/plotters/PDF_plotter.cpp

@@ -37,7 +37,7 @@
 #include <macros.h>
 #include <trigo.h>
 
-#include "plotters_pslike.h"
+#include <plotters/plotters_pslike.h>
 
 
 std::string PDF_PLOTTER::encodeStringForPlotter( const wxString& aText )

common/plotters/PS_plotter.cpp

@@ -32,7 +32,7 @@
 #include <math/util.h>      // for KiROUND
 #include <trigo.h>
 
-#include "plotters_pslike.h"
+#include <plotters/plotters_pslike.h>
 
 
 /* Forward declaration of the font width metrics

common/plotters/SVG_plotter.cpp

@@ -100,7 +100,7 @@
 #include <cstdint>
 #include <wx/mstream.h>
 
-#include "plotters_pslike.h"
+#include <plotters/plotters_pslike.h>
 
 
 /**

common/plotters/common_plot_functions.cpp

@@ -23,7 +23,10 @@
  */
 
 #include <eda_item.h>
-#include <plotters_specific.h>
+#include <plotters/plotter_dxf.h>
+#include <plotters/plotter_hpgl.h>
+#include <plotters/plotters_pslike.h>
+#include <plotters/plotter_gerber.h>
 #include <drawing_sheet/ds_data_item.h>
 #include <drawing_sheet/ds_draw_item.h>
 #include <drawing_sheet/ds_painter.h>

common/plotters/plotter.cpp

@@ -37,11 +37,9 @@
  * is not handled here.
  */
 
-#include <fill_type.h>
-#include <vector>
 #include <trigo.h>
 #include <eda_item.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <geometry/shape_line_chain.h>
 #include <geometry/geometry_utils.h>
 #include <bezier_curves.h>

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -31,9 +31,9 @@
 #include <eeschema_settings.h>
 #include <kiface_i.h>
 #include <locale_io.h>
-#include "../../common/plotters/plotter_hpgl.h"
-#include "../../common/plotters/plotter_dxf.h"
-#include "../../common/plotters/plotters_pslike.h"
+#include <plotters/plotter_hpgl.h>
+#include <plotters/plotter_dxf.h>
+#include <plotters/plotters_pslike.h>
 #include <reporter.h>
 #include <trace_helpers.h>
 #include <settings/settings_manager.h>

eeschema/dialogs/dialog_plot_schematic.h

@@ -31,7 +31,7 @@
 #ifndef __DIALOG_PLOT_SCHEMATIC__
 #define __DIALOG_PLOT_SCHEMATIC__
 
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <dialog_plot_schematic_base.h>
 #include <widgets/unit_binder.h>
 

eeschema/lib_arc.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <widgets/msgpanel.h>

eeschema/lib_bezier.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <bezier_curves.h>
 #include <base_units.h>

eeschema/lib_circle.cpp

@@ -22,8 +22,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <eda_draw_frame.h>
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <widgets/msgpanel.h>

eeschema/lib_field.cpp

@@ -23,11 +23,10 @@
  */
 
 #include <eda_item.h>
-#include <gr_text.h>
 #include <string_utils.h>
 #include <sch_draw_panel.h>
 #include <eda_draw_frame.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <widgets/msgpanel.h>

eeschema/lib_polyline.cpp

@@ -23,8 +23,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <eda_draw_frame.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <widgets/msgpanel.h>

eeschema/lib_rectangle.cpp

@@ -22,13 +22,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+
+#include <eda_draw_frame.h>
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <widgets/msgpanel.h>
 #include <bitmaps.h>
-#include <eda_draw_frame.h>
 #include <general.h>
 #include <lib_rectangle.h>
 #include <settings/color_settings.h>

eeschema/lib_symbol.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <sch_screen.h>
 #include <richio.h>
 #include <general.h>

eeschema/lib_text.cpp

@@ -27,8 +27,7 @@
 
 #include <common.h>
 #include <sch_draw_panel.h>
-#include <plotter.h>
-#include <gr_text.h>
+#include <plotters/plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <widgets/msgpanel.h>

eeschema/sch_bitmap.cpp

@@ -27,7 +27,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <settings/color_settings.h>
 #include <bitmaps.h>
 #include <base_units.h>

eeschema/sch_field.cpp

@@ -34,9 +34,8 @@
 #include <wx/menu.h>
 #include <common.h>     // for ExpandTextVars
 #include <eda_item.h>
-#include <gr_text.h>
 #include <sch_edit_frame.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <bitmaps.h>
 #include <core/mirror.h>
 #include <kiway.h>

eeschema/sch_item.h

@@ -27,16 +27,12 @@
 
 #include <unordered_map>
 #include <unordered_set>
-#include <vector>
 
 #include <eda_item.h>
-#include <plotter.h>      // for PLOT_DASH_TYPE definition
-
-#include <gal/color4d.h>
+#include <plotters/plotter.h>      // for PLOT_DASH_TYPE definition
 
 #include <default_values.h>
 #include <sch_sheet_path.h>
-#include <render_settings.h>
 #include <netclass.h>
 
 class CONNECTION_GRAPH;

eeschema/sch_junction.cpp

@@ -29,7 +29,7 @@
 #include <sch_draw_panel.h>
 #include <trigo.h>
 #include <common.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <bitmaps.h>
 #include <core/mirror.h>
 #include <geometry/shape_rect.h>

eeschema/sch_line.cpp

@@ -25,7 +25,7 @@
 #include <bitmaps.h>
 #include <core/mirror.h>
 #include <sch_painter.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <sch_line.h>
 #include <sch_edit_frame.h>
 #include <settings/color_settings.h>

eeschema/sch_no_connect.cpp

@@ -28,7 +28,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <bitmaps.h>
 #include <schematic.h>
 #include <sch_no_connect.h>

eeschema/sch_painter.cpp

@@ -44,7 +44,7 @@
 #include <lib_rectangle.h>
 #include <lib_text.h>
 #include <math/util.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
 #include <sch_symbol.h>

eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h

@@ -28,9 +28,9 @@
 
 #include <sch_plugins/cadstar/cadstar_sch_archive_parser.h>
 
-#include <layer_ids.h> // SCH_LAYER_ID
-#include <plotter.h>                         // PLOT_DASH_TYPE
-#include <pin_type.h>                        // ELECTRICAL_PINTYPE
+#include <layer_ids.h>          // SCH_LAYER_ID
+#include <plotters/plotter.h>   // PLOT_DASH_TYPE
+#include <pin_type.h>           // ELECTRICAL_PINTYPE
 #include <sch_io_mgr.h>
 #include <wx/filename.h>
 

eeschema/sch_screen.cpp

@@ -36,7 +36,7 @@
 #include <id.h>
 #include <string_utils.h>
 #include <kiway.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <project.h>
 #include <reporter.h>
 #include <sch_draw_panel.h>

eeschema/sch_sheet.cpp

@@ -25,10 +25,9 @@
 #include <bitmaps.h>
 #include <core/mirror.h>
 #include <sch_draw_panel.h>
-#include <gr_text.h>
 #include <trigo.h>
 #include <sch_edit_frame.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <string_utils.h>
 #include <widgets/msgpanel.h>
 #include <math/util.h>      // for KiROUND

eeschema/sch_sheet_pin.cpp

@@ -27,9 +27,8 @@
 #include <bitmaps.h>
 #include <general.h>
 #include <geometry/shape_line_chain.h>
-#include <gr_text.h>
 #include <string_utils.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
 #include <sch_sheet.h>

eeschema/sch_text.cpp

@@ -30,7 +30,7 @@
 
 #include <sch_symbol.h>
 #include <sch_edit_frame.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <widgets/msgpanel.h>
 #include <gal/stroke_font.h>
 #include <bitmaps.h>

eeschema/symbol_editor/symbol_editor_plotter.cpp

@@ -25,7 +25,7 @@
 #include <sch_painter.h>
 #include <symbol_edit_frame.h>
 #include <locale_io.h>
-#include "../../common/plotters/plotters_pslike.h"
+#include <plotters/plotters_pslike.h>
 
 void SYMBOL_EDIT_FRAME::SVGPlotSymbol( const wxString& aFullFileName )
 {

include/plotters/plotter_dxf.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <plotter.h>
+#include "plotter.h"
 
 
 class DXF_PLOTTER : public PLOTTER

include/plotters/plotter_gerber.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <plotter.h>
+#include "plotter.h"
 #include "gbr_plotter_apertures.h"
 
 class SHAPE_ARC;

include/plotters/plotter_hpgl.h

@@ -27,7 +27,7 @@
 
 #include <list>
 
-#include <plotter.h>
+#include "plotter.h"
 
 
 class HPGL_PLOTTER : public PLOTTER

include/plotters/plotters_pslike.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <plotter.h>
+#include "plotter.h"
 
 
 /**

include/plotters_specific.h

@@ -1,32 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright (C) 2020 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2016-2020 KiCad Developers, see AUTHORS.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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Plotting engines (PostScript, Gerber, HPGL and DXF)
- *
- * @file plotters_specific.h
- */
-
-#pragma once
-
-#include <../common/plotters/plotter_hpgl.h>
-#include <../common/plotters/plotter_gerber.h>
-#include <../common/plotters/plotter_dxf.h>
-#include <../common/plotters/plotters_pslike.h>

pcbnew/dialogs/dialog_plot.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.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
@@ -23,7 +23,7 @@
 
 
 #include <kiface_i.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>

pcbnew/exporters/gen_drill_report_files.cpp

@@ -27,9 +27,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <plotters_specific.h>
+#include <plotters/plotter_dxf.h>
+#include <plotters/plotter_hpgl.h>
+#include <plotters/plotter_gerber.h>
+#include <plotters/plotters_pslike.h>
 #include <eda_item.h>
-#include <gr_text.h>
 #include <confirm.h>
 #include <string_utils.h>
 #include <locale_io.h>

pcbnew/exporters/gendrill_Excellon_writer.cpp

@@ -35,7 +35,7 @@
  * and the CNC-7 manual.
  */
 
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>

pcbnew/exporters/gendrill_gerber_writer.cpp

@@ -27,7 +27,7 @@
  * @brief Functions to create drill files in gerber X2 format.
  */
 
-#include "../../common/plotters/plotter_gerber.h"
+#include <plotters/plotter_gerber.h>
 #include <string_utils.h>
 #include <locale_io.h>
 #include <board.h>

pcbnew/exporters/gerber_jobfile_writer.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 Jean_Pierre Charras <jp.charras at wanadoo.fr>
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.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
@@ -34,7 +34,7 @@
 #include <build_version.h>
 #include <locale_io.h>
 #include <pcb_edit_frame.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 
 #include <board.h>
 #include <board_design_settings.h>

pcbnew/exporters/gerber_placefile_writer.cpp

@@ -27,7 +27,7 @@
 
 #include <vector>
 
-#include "../../common/plotters/plotter_gerber.h"
+#include <plotters/plotter_gerber.h>
 #include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>

pcbnew/pcb_plot_params.cpp

@@ -28,7 +28,7 @@
 #include <math/util.h> // for KiROUND
 #include <pcb_plot_params.h>
 #include <pcb_plot_params_parser.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <settings/color_settings.h>
 
 

pcbnew/pcb_plot_params.h

@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <outline_mode.h>
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <layer_ids.h>
 
 class COLOR_SETTINGS;

pcbnew/pcbplot.cpp

@@ -27,7 +27,7 @@
  * @file pcbnew/pcbplot.cpp
  */
 
-#include <plotter.h>
+#include <plotters/plotter.h>
 #include <pcbplot.h>
 #include <base_units.h>
 #include <locale_io.h>

pcbnew/plot_board_layers.cpp

@@ -49,7 +49,10 @@
 #include <pcb_dimension.h>
 
 #include <pcbplot.h>
-#include <plotters_specific.h>
+#include <plotters/plotter_dxf.h>
+#include <plotters/plotter_hpgl.h>
+#include <plotters/plotter_gerber.h>
+#include <plotters/plotters_pslike.h>
 #include <pcb_painter.h>
 #include <gbr_metadata.h>
 #include <advanced_config.h>

pcbnew/plot_brditems_plotter.cpp

@@ -35,7 +35,7 @@
 #include <macros.h>
 #include <math/util.h>                        // for KiROUND, Clamp
 #include <math/vector2d.h>                    // for VECTOR2I
-#include "../common/plotters/plotter_gerber.h"
+#include <plotters/plotter_gerber.h>
 #include <trigo.h>
 
 #include <board_design_settings.h>            // for BOARD_DESIGN_SETTINGS

pcbnew/python/swig/pcbnew.i

@@ -113,7 +113,7 @@ HANDLE_EXCEPTIONS(PLUGIN::FootprintDelete)
 
 %include <plotcontroller.h>
 %include <pcb_plot_params.h>
-%include <plotter.h>
+%include <plotters/plotter.h>
 %include <exporters/export_d356.h>
 %include <exporters/export_vrml.h>
 %include <exporters/gendrill_file_writer_base.h>