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

Gerbview: fix code after renaming files

This commit is contained in:
jean-pierre charras 2018-01-29 13:26:58 +01:00
parent 6255239b52
commit a0ac1a48c2
51 changed files with 152 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gerbview/CMakeLists.txt
View File

@ -28,17 +28,17 @@ set( DIALOGS_SRCS
set( GERBVIEW_SRCS set( GERBVIEW_SRCS
block.cpp block.cpp
class_am_param.cpp am_param.cpp
class_aperture_macro.cpp am_primitive.cpp
class_DCodeSelectionbox.cpp DCodeSelectionbox.cpp
class_gbr_screen.cpp gbr_screen.cpp
class_gbr_layout.cpp gbr_layout.cpp
class_gerber_file_image.cpp gerber_file_image.cpp
class_gerber_file_image_list.cpp gerber_file_image_list.cpp
class_gerber_draw_item.cpp gerber_draw_item.cpp
class_gerbview_layer_widget.cpp gerbview_layer_widget.cpp
class_gbr_layer_box_selector.cpp gbr_layer_box_selector.cpp
class_X2_gerber_attributes.cpp X2_gerber_attributes.cpp
clear_gbr_drawlayers.cpp clear_gbr_drawlayers.cpp
controle.cpp controle.cpp
dcode.cpp dcode.cpp

2
gerbview/DCodeSelectionbox.cpp
View File

@ -27,7 +27,7 @@
#include <wxstruct.h> #include <wxstruct.h>
#include <dcode.h> #include <dcode.h>
#include <class_DCodeSelectionbox.h> #include <DCodeSelectionbox.h>
/*******************************************/ /*******************************************/
/* Helper class for displaying DCodes list */ /* Helper class for displaying DCodes list */

6
gerbview/DCodeSelectionbox.h
View File

@ -24,8 +24,8 @@
// file class_DCodeSelectionbox.h // file class_DCodeSelectionbox.h
#ifndef CLASS_DCODESELECTIONBOX_H #ifndef DCODESELECTIONBOX_H
#define CLASS_DCODESELECTIONBOX_H #define DCODESELECTIONBOX_H
/* helper class to display a DCode list and select a DCode id. /* helper class to display a DCode list and select a DCode id.
*/ */
@ -59,4 +59,4 @@ public: DCODE_SELECTION_BOX( wxAuiToolBar* aParent, wxWindowID aId,
void AppendDCodeList( const wxArrayString& aChoices ); void AppendDCodeList( const wxArrayString& aChoices );
}; };
#endif //CLASS_DCODESELECTIONBOX_H #endif //DCODESELECTIONBOX_H

6
gerbview/X2_gerber_attributes.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2010-2014 Jean-Pierre Charras jp.charras at wanadoo.fr * Copyright (C) 2010-2014 Jean-Pierre Charras jp.charras at wanadoo.fr
* Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -23,7 +23,7 @@
*/ */
/** /**
* @file class_X2_gerber_attributes.cpp * @file X2_gerber_attributes.cpp
*/ */
/* /*
@ -42,7 +42,7 @@
*/ */
#include <wx/log.h> #include <wx/log.h>
#include <class_X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
/* /*
* class X2_ATTRIBUTE * class X2_ATTRIBUTE

12
gerbview/X2_gerber_attributes.h
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2010-2014 Jean-Pierre Charras jp.charras at wanadoo.fr * Copyright (C) 2010-2018 Jean-Pierre Charras jp.charras at wanadoo.fr
* Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -23,11 +23,11 @@
*/ */
/** /**
* @file class_X2_gerber_attributes.h * @file X2_gerber_attributes.h
*/ */
#ifndef _CLASS_X2_GERBER_ATTRIBUTE_H_ #ifndef X2_GERBER_ATTRIBUTE_H
#define _CLASS_X2_GERBER_ATTRIBUTE_H_ #define X2_GERBER_ATTRIBUTE_H
/* /*
* Manage the gerber extensions (attributes) in the new X2 version * Manage the gerber extensions (attributes) in the new X2 version
@ -201,4 +201,4 @@ private:
void set_Z_Order(); void set_Z_Order();
}; };
#endif // _CLASS_X2_GERBER_ATTRIBUTE_H_ #endif // X2_GERBER_ATTRIBUTE_H

6
gerbview/am_param.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file class_am_param.cpp * @file am_param.cpp
*/ */
/* /*
@ -27,8 +27,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <class_am_param.h> #include <am_param.h>
#include <class_aperture_macro.h> #include <am_primitive.h>
extern int ReadInt( char*& text, bool aSkipSeparator = true ); extern int ReadInt( char*& text, bool aSkipSeparator = true );
extern double ReadDouble( char*& text, bool aSkipSeparator = true ); extern double ReadDouble( char*& text, bool aSkipSeparator = true );

2
gerbview/am_param.h
View File

@ -1,5 +1,5 @@
/** /**
* @file class_am_param.h * @file am_param.h
*/ */
/* /*

4
gerbview/am_primitive.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file class_aperture_macro.cpp * @file aperture_macro.cpp
*/ */
/* /*
@ -35,7 +35,7 @@
#include <gr_basic.h> #include <gr_basic.h>
#include <gerbview.h> #include <gerbview.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>

10
gerbview/am_primitive.h
View File

@ -1,9 +1,9 @@
/** /**
* @file class_aperture_macro.h * @file aperture_macro.h
*/ */
#ifndef _APERTURE_MACRO_H_ #ifndef AM_PRIMITIVE_H
#define _APERTURE_MACRO_H_ #define AM_PRIMITIVE_H
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
@ -34,7 +34,7 @@
#include <set> #include <set>
#include <base_struct.h> #include <base_struct.h>
#include <class_am_param.h> #include <am_param.h>
#include <eda_rect.h> #include <eda_rect.h>
class SHAPE_POLY_SET; class SHAPE_POLY_SET;
@ -259,4 +259,4 @@ typedef std::set<APERTURE_MACRO, APERTURE_MACRO_less_than> APERTURE_MACRO_SET;
typedef std::pair<APERTURE_MACRO_SET::iterator, bool> APERTURE_MACRO_SET_PAIR; typedef std::pair<APERTURE_MACRO_SET::iterator, bool> APERTURE_MACRO_SET_PAIR;
#endif // ifndef _APERTURE_MACRO_H_ #endif // ifndef AM_PRIMITIVE_H

6
gerbview/block.cpp
View File

@ -32,9 +32,9 @@
#include <common.h> #include <common.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_draw_item.h> #include <gerber_draw_item.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
// Call back function used in block command // Call back function used in block command
static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC,

6
gerbview/clear_gbr_drawlayers.cpp
View File

@ -32,9 +32,9 @@
#include <confirm.h> #include <confirm.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <class_gerbview_layer_widget.h> #include <gerbview_layer_widget.h>
#include <view/view.h> #include <view/view.h>
#include <tool/tool_manager.h> #include <tool/tool_manager.h>

2
gerbview/dcode.cpp
View File

@ -34,7 +34,7 @@
#include <trigo.h> #include <trigo.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <convert_to_biu.h> #include <convert_to_biu.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>

4
gerbview/dialogs/dialog_print_using_printer.cpp
View File

@ -34,8 +34,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
///@{ ///@{
/// \ingroup config /// \ingroup config

4
gerbview/draw_gerber_screen.cpp
View File

@ -37,8 +37,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <printout_controler.h> #include <printout_controler.h>

2
gerbview/evaluate.cpp
View File

@ -74,7 +74,7 @@
* Upon which you will get the result 11. * Upon which you will get the result 11.
*/ */
#include <class_am_param.h> #include <am_param.h>
/** /**
* Evaluate an basic arithmetic expression (infix notation) with precedence * Evaluate an basic arithmetic expression (infix notation) with precedence

8
gerbview/events_called_functions.cpp
View File

@ -36,11 +36,11 @@
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <kicad_device_context.h> #include <kicad_device_context.h>
#include <gerbview_id.h> #include <gerbview_id.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
#include <class_DCodeSelectionbox.h> #include <DCodeSelectionbox.h>
#include <class_gerbview_layer_widget.h> #include <gerbview_layer_widget.h>
#include <dialog_show_page_borders.h> #include <dialog_show_page_borders.h>
#include <tool/tool_manager.h> #include <tool/tool_manager.h>

6
gerbview/excellon_image.h
View File

@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef CLASS_EXCELLON_H #ifndef EXCELLON_IMAGE_H
#define CLASS_EXCELLON_H #define EXCELLON_IMAGE_H
enum drill_M_code_t { enum drill_M_code_t {
@ -318,4 +318,4 @@ private:
* M95 End of the header * M95 End of the header
*/ */
#endif // CLASS_EXCELLON_H #endif // EXCELLON_IMAGE_H

8
gerbview/excellon_read_drill_file.cpp
View File

@ -68,11 +68,11 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <class_excellon.h> #include <excellon_image.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <class_X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
#include <view/view.h> #include <view/view.h>
#include <cmath> #include <cmath>

4
gerbview/export_to_pcbnew.cpp
View File

@ -36,8 +36,8 @@
#include <trigo.h> #include <trigo.h>
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <select_layers_to_pcb.h> #include <select_layers_to_pcb.h>
#include <build_version.h> #include <build_version.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>

4
gerbview/files.cpp
View File

@ -38,8 +38,8 @@
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <gerbview_id.h> #include <gerbview_id.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerbview_layer_widget.h> #include <gerbview_layer_widget.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
// HTML Messages used more than one time: // HTML Messages used more than one time:

2
gerbview/gbr_display_options.h
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file class_gbr_display_options.h * @file gbr_display_options.h
* @brief Class GBR_DISPLAY_OPTIONS is a helper class to handle display options * @brief Class GBR_DISPLAY_OPTIONS is a helper class to handle display options
* (filling modes and afew other options * (filling modes and afew other options
*/ */

6
gerbview/gbr_layer_box_selector.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file class_gbr_layer_box_selector.cpp * @file gbr_layer_box_selector.cpp
* @brief a derived class of LAYER_BOX_SELECTOR to handle the layer box selector * @brief a derived class of LAYER_BOX_SELECTOR to handle the layer box selector
* in GerbView * in GerbView
*/ */
@ -31,9 +31,9 @@
#include <common.h> #include <common.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <class_gbr_layer_box_selector.h> #include <gbr_layer_box_selector.h>
void GBR_LAYER_BOX_SELECTOR::Resync() void GBR_LAYER_BOX_SELECTOR::Resync()
{ {

6
gerbview/gbr_layer_box_selector.h
View File

@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef CLASS_GBR_LAYER_BOX_SELECTOR_H #ifndef GBR_LAYER_BOX_SELECTOR_H
#define CLASS_GBR_LAYER_BOX_SELECTOR_H 1 #define GBR_LAYER_BOX_SELECTOR_H 1
#include <class_layer_box_selector.h> #include <class_layer_box_selector.h>
@ -56,4 +56,4 @@ public:
wxString GetLayerName( int aLayer ) const override; wxString GetLayerName( int aLayer ) const override;
}; };
#endif //CLASS_GBR_LAYER_BOX_SELECTOR_H #endif //GBR_LAYER_BOX_SELECTOR_H

8
gerbview/gbr_layout.cpp
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file class_gbr_layout.cpp * @file gbr_layout.cpp
* @brief GBR_LAYOUT class functions. * @brief GBR_LAYOUT class functions.
*/ */
@ -32,9 +32,9 @@
#include <draw_graphic_text.h> #include <draw_graphic_text.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <class_gbr_layout.h> #include <gbr_layout.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
GBR_LAYOUT::GBR_LAYOUT() : GBR_LAYOUT::GBR_LAYOUT() :
EDA_ITEM( (EDA_ITEM*)NULL, GERBER_LAYOUT_T ) EDA_ITEM( (EDA_ITEM*)NULL, GERBER_LAYOUT_T )

12
gerbview/gbr_layout.h
View File

@ -23,13 +23,13 @@
*/ */
/** /**
* @file class_gbr_layout.h * @file gbr_layout.h
* @brief Class CLASS_GBR_LAYOUT to handle info to draw/print loaded Gerber images * @brief Class CLASS_GBR_LAYOUT to handle info to draw/print loaded Gerber images
* and page frame reference * and page frame reference
*/ */
#ifndef CLASS_GBR_LAYOUT_H #ifndef GBR_LAYOUT_H
#define CLASS_GBR_LAYOUT_H #define GBR_LAYOUT_H
#include <dlist.h> #include <dlist.h>
@ -38,8 +38,8 @@
#include <common.h> // PAGE_INFO #include <common.h> // PAGE_INFO
#include <gerbview.h> // GERBER_DRAWLAYERS_COUNT #include <gerbview.h> // GERBER_DRAWLAYERS_COUNT
#include <title_block.h> #include <title_block.h>
#include <class_gerber_draw_item.h> #include <gerber_draw_item.h>
#include <class_gbr_display_options.h> #include <gbr_display_options.h>
#include <gr_basic.h> #include <gr_basic.h>
#include <eda_rect.h> #include <eda_rect.h>
@ -193,4 +193,4 @@ public:
#endif #endif
}; };
#endif // #ifndef CLASS_GBR_LAYOUT_H #endif // #ifndef GBR_LAYOUT_H

4
gerbview/gbr_screen.cpp
View File

@ -23,13 +23,13 @@
*/ */
/** /**
* @file class_gbr_screen.cpp * @file gbr_screen.cpp
*/ */
#include <fctsys.h> #include <fctsys.h>
#include <common.h> #include <common.h>
#include <macros.h> #include <macros.h>
#include <class_gbr_screen.h> #include <gbr_screen.h>
#include <gerbview_id.h> #include <gerbview_id.h>

10
gerbview/gbr_screen.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2012-2014 Jean-Pierre Charras jp.charras at wanadoo.fr * Copyright (C) 2012-2014 Jean-Pierre Charras jp.charras at wanadoo.fr
* Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -23,11 +23,11 @@
*/ */
/** /**
* @file class_gbr_screen.h * @file gbr_screen.h
*/ */
#ifndef CLASS_GBR_SCREEN_H_ #ifndef GBR_SCREEN_H
#define CLASS_GBR_SCREEN_H_ #define GBR_SCREEN_H
#include <base_units.h> #include <base_units.h>
@ -60,4 +60,4 @@ public:
}; };
#endif // CLASS_GBR_SCREEN_H_ #endif // GBR_SCREEN_H

8
gerbview/gerber_draw_item.cpp
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file class_gerber_draw_item.cpp * @file gerber_draw_item.cpp
*/ */
#include <fctsys.h> #include <fctsys.h>
@ -35,9 +35,9 @@
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <class_gerber_draw_item.h> #include <gerber_draw_item.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
GERBER_DRAW_ITEM::GERBER_DRAW_ITEM( GERBER_FILE_IMAGE* aGerberImageFile ) : GERBER_DRAW_ITEM::GERBER_DRAW_ITEM( GERBER_FILE_IMAGE* aGerberImageFile ) :

8
gerbview/gerber_draw_item.h
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file class_gerber_draw_item.h * @file gerber_draw_item.h
*/ */
#ifndef CLASS_GERBER_DRAW_ITEM_H #ifndef GERBER_DRAW_ITEM_H
#define CLASS_GERBER_DRAW_ITEM_H #define GERBER_DRAW_ITEM_H
#include <base_struct.h> #include <base_struct.h>
#include <dlist.h> #include <dlist.h>
@ -332,4 +332,4 @@ class GERBER_NEGATIVE_IMAGE_BACKDROP : public EDA_ITEM
}; };
#endif /* CLASS_GERBER_DRAW_ITEM_H */ #endif /* GERBER_DRAW_ITEM_H */

6
gerbview/gerber_file_image.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file class_gerber_file_image.cpp * @file gerber_file_image.cpp
* a GERBER class handle for a given layer info about used D_CODES and how the layer is drawn * a GERBER class handle for a given layer info about used D_CODES and how the layer is drawn
*/ */
@ -35,8 +35,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
#include <algorithm> #include <algorithm>
#include <map> #include <map>

10
gerbview/gerber_file_image.h
View File

@ -22,15 +22,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef CLASS_GERBER_FILE_IMAGE_H #ifndef GERBER_FILE_IMAGE_H
#define CLASS_GERBER_FILE_IMAGE_H #define GERBER_FILE_IMAGE_H
#include <vector> #include <vector>
#include <set> #include <set>
#include <dcode.h> #include <dcode.h>
#include <class_gerber_draw_item.h> #include <gerber_draw_item.h>
#include <class_aperture_macro.h> #include <am_primitive.h>
#include <gbr_netlist_metadata.h> #include <gbr_netlist_metadata.h>
// An useful macro used when reading gerber files; // An useful macro used when reading gerber files;
@ -389,4 +389,4 @@ public:
#endif #endif
}; };
#endif // ifndef CLASS_GERBER_FILE_IMAGE_H #endif // ifndef GERBER_FILE_IMAGE_H

8
gerbview/gerber_file_image_list.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file class_gerber_file_image.cpp * @file gerber_file_image.cpp
* a GERBER class handle for a given layer info about used D_CODES and how the layer is drawn * a GERBER class handle for a given layer info about used D_CODES and how the layer is drawn
*/ */
@ -31,9 +31,9 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <class_X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
#include <map> #include <map>

10
gerbview/gerber_file_image_list.h
View File

@ -22,14 +22,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef CLASS_GERBER_FILE_IMAGE_LIST_H #ifndef GERBER_FILE_IMAGE_LIST_H
#define CLASS_GERBER_FILE_IMAGE_LIST_H #define GERBER_FILE_IMAGE_LIST_H
#include <vector> #include <vector>
#include <set> #include <set>
#include <class_gerber_draw_item.h> #include <gerber_draw_item.h>
#include <class_aperture_macro.h> #include <am_primitive.h>
/* gerber files have different parameters to define units and how items must be plotted. /* gerber files have different parameters to define units and how items must be plotted.
* some are for the entire file, and other can change along a file. * some are for the entire file, and other can change along a file.
@ -128,4 +128,4 @@ public:
#endif #endif
}; };
#endif // ifndef CLASS_GERBER_FILE_IMAGE_LIST_H #endif // ifndef GERBER_FILE_IMAGE_LIST_H

2
gerbview/gerbview_draw_panel_gal.cpp
View File

@ -24,7 +24,7 @@
#include <class_colors_design_settings.h> #include <class_colors_design_settings.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gbr_display_options.h> #include <gbr_display_options.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>
#include <functional> #include <functional>

10
gerbview/gerbview_frame.cpp
View File

@ -30,7 +30,7 @@
#include <build_version.h> #include <build_version.h>
#include <trigo.h> #include <trigo.h>
#include <base_units.h> #include <base_units.h>
#include <class_gbr_layer_box_selector.h> #include <gbr_layer_box_selector.h>
#include <msgpanel.h> #include <msgpanel.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
@ -39,11 +39,11 @@
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <gerbview_id.h> #include <gerbview_id.h>
#include <hotkeys.h> #include <hotkeys.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
#include <class_DCodeSelectionbox.h> #include <DCodeSelectionbox.h>
#include <class_gerbview_layer_widget.h> #include <gerbview_layer_widget.h>
#include <gerbview_draw_panel_gal.h> #include <gerbview_draw_panel_gal.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>

6
gerbview/gerbview_frame.h
View File

@ -33,10 +33,10 @@
#include <gerbview.h> #include <gerbview.h>
#include <convert_to_biu.h> #include <convert_to_biu.h>
#include <class_gbr_layout.h> #include <gbr_layout.h>
#include <class_gbr_screen.h> #include <gbr_screen.h>
#include <page_info.h> #include <page_info.h>
#include <class_gbr_display_options.h> #include <gbr_display_options.h>
#include <class_colors_design_settings.h> #include <class_colors_design_settings.h>
extern COLORS_DESIGN_SETTINGS g_ColorsSettings; extern COLORS_DESIGN_SETTINGS g_ColorsSettings;

8
gerbview/gerbview_layer_widget.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2004-2010 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2004-2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2016 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -33,13 +33,13 @@
#include <common.h> #include <common.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <macros.h> #include <macros.h>
#include <class_gbr_layer_box_selector.h> #include <gbr_layer_box_selector.h>
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <layer_widget.h> #include <layer_widget.h>
#include <class_gerbview_layer_widget.h> #include <gerbview_layer_widget.h>
#include <view/view.h> #include <view/view.h>
#include <gerbview_painter.h> #include <gerbview_painter.h>

6
gerbview/gerbview_layer_widget.h
View File

@ -28,8 +28,8 @@
/* class_gerber_layer_widget.h : header for the layers manager */ /* class_gerber_layer_widget.h : header for the layers manager */
/************************************************************/ /************************************************************/
#ifndef _CLASS_GERBER_LAYER_WIDGET_H_ #ifndef GERBER_LAYER_WIDGET_H
#define _CLASS_GERBER_LAYER_WIDGET_H_ #define GERBER_LAYER_WIDGET_H
#include <layer_widget.h> #include <layer_widget.h>
@ -138,4 +138,4 @@ protected:
}; };
}; };
#endif // _CLASS_GERBER_LAYER_WIDGET_H_ #endif // GERBER_LAYER_WIDGET_H

4
gerbview/gerbview_painter.cpp
View File

@ -26,8 +26,8 @@
#include <convert_to_biu.h> #include <convert_to_biu.h>
#include <gerbview.h> #include <gerbview.h>
#include <class_gerber_draw_item.h> #include <gerber_draw_item.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
using namespace KIGFX; using namespace KIGFX;

2
gerbview/gerbview_painter.h
View File

@ -23,7 +23,7 @@
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
#include <painter.h> #include <painter.h>
#include <class_gbr_display_options.h> #include <gbr_display_options.h>
#include <geometry/shape_poly_set.h> #include <geometry/shape_poly_set.h>
#include <memory> #include <memory>

2
gerbview/hotkeys.cpp
View File

@ -33,7 +33,7 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <class_gerbview_layer_widget.h> #include <gerbview_layer_widget.h>
#include <hotkeys.h> #include <hotkeys.h>

4
gerbview/job_file_reader.cpp
View File

@ -33,8 +33,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <richio.h> #include <richio.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <reporter.h> #include <reporter.h>
#include <plot_auxiliary_data.h> #include <plot_auxiliary_data.h>

4
gerbview/locate.cpp
View File

@ -32,8 +32,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
/* locate a gerber item and return a pointer to it. /* locate a gerber item and return a pointer to it.

4
gerbview/onleftclick.cpp
View File

@ -27,8 +27,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
/* Process the command triggered by the left button of the mouse /* Process the command triggered by the left button of the mouse

4
gerbview/printout_control.cpp
View File

@ -37,8 +37,8 @@
#include <base_screen.h> #include <base_screen.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <printout_controler.h> #include <printout_controler.h>

4
gerbview/readgerb.cpp
View File

@ -28,8 +28,8 @@
#include <kicad_string.h> #include <kicad_string.h>
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <view/view.h> #include <view/view.h>
#include <html_messagebox.h> #include <html_messagebox.h>

2
gerbview/rs274_read_XY_and_IJ_coordinates.cpp
View File

@ -25,7 +25,7 @@
#include <fctsys.h> #include <fctsys.h>
#include <common.h> #include <common.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <base_units.h> #include <base_units.h>

4
gerbview/rs274d.cpp
View File

@ -32,8 +32,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <trigo.h> #include <trigo.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
#include <cmath> #include <cmath>

4
gerbview/rs274x.cpp
View File

@ -32,8 +32,8 @@
#include <base_units.h> #include <base_units.h>
#include <gerbview.h> #include <gerbview.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_X2_gerber_attributes.h> #include <X2_gerber_attributes.h>
extern int ReadInt( char*& text, bool aSkipSeparator = true ); extern int ReadInt( char*& text, bool aSkipSeparator = true );
extern double ReadDouble( char*& text, bool aSkipSeparator = true ); extern double ReadDouble( char*& text, bool aSkipSeparator = true );

4
gerbview/select_layers_to_pcb.cpp
View File

@ -31,8 +31,8 @@
#include <gerbview.h> #include <gerbview.h>
#include <gerbview_frame.h> #include <gerbview_frame.h>
#include <gerbview_id.h> #include <gerbview_id.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <select_layers_to_pcb.h> #include <select_layers_to_pcb.h>

8
gerbview/toolbars_gerber.cpp
View File

@ -32,10 +32,10 @@
#include <bitmaps.h> #include <bitmaps.h>
#include <gerbview_id.h> #include <gerbview_id.h>
#include <hotkeys.h> #include <hotkeys.h>
#include <class_gerber_file_image.h> #include <gerber_file_image.h>
#include <class_gerber_file_image_list.h> #include <gerber_file_image_list.h>
#include <class_gbr_layer_box_selector.h> #include <gbr_layer_box_selector.h>
#include <class_DCodeSelectionbox.h> #include <DCodeSelectionbox.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
#include <bitmaps.h> #include <bitmaps.h>