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>