AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-11 16:10:10 +00:00
Files Issues Releases Activity

fix code after file renaming

Browse Source
This commit is contained in:
jean-pierre charras 2018-01-31 09:23:20 +01:00
parent 32aedc99b7
commit 39b4afecfa
62 changed files with 112 additions and 111 deletions
common
CMakeLists.txtcolors_design_settings.cpplayer_box_selector.cpp
swig
kicad.i
undo_redo_container.cpp
cvpcb
CMakeLists.txt
eeschema
sch_edit_frame.h
gerbview
CMakeLists.txtgbr_layer_box_selector.hgbr_layout.hgerbview_draw_panel_gal.cppgerbview_frame.hgerbview_painter.cpp
include
base_screen.hblock_commande.hcommit.hlayer_box_selector.h
pcbnew
CMakeLists.txtclass_board.h
dialogs
dialog_dimension_editor_base.cppdialog_dimension_editor_base.fbpdialog_dimension_editor_base.hdialog_edit_module_text.cppdialog_edit_module_text_base.cppdialog_edit_module_text_base.fbpdialog_graphic_item_properties.cppdialog_graphic_item_properties_base.cppdialog_graphic_item_properties_base.fbpdialog_graphic_item_properties_base.hdialog_graphic_item_properties_for_Modedit.cppdialog_pcb_text_properties.cppdialog_pcb_text_properties_base.cppdialog_pcb_text_properties_base.fbpdialog_pcb_text_properties_base.hdialog_track_via_properties.cppdialog_track_via_properties_base.cppdialog_track_via_properties_base.fbpdialog_track_via_properties_base.h
dimension.cppedit.cppfootprint_edit_frame.cppfootprint_preview_panel.cpp
import_dxf
dialog_dxf_import.cppdialog_dxf_import_base.cppdialog_dxf_import_base.fbpdialog_dxf_import_base.h
loadcmp.cppmodedit.cpppcb_draw_panel_gal.cpppcb_edit_frame.cpppcb_edit_frame.hpcb_general_settings.hpcb_layer_box_selector.cpppcb_layer_box_selector.hpcb_layer_widget.cpppcb_layer_widget.hpcb_painter.cpp
router
pns_kicad_iface.cpp
sel_layer.cpptool_pcb.cpptoolbars_update_user_interface.cppzones_test_and_combine_areas.cpp

8
common/CMakeLists.txt
View File

@ -234,9 +234,7 @@ set( COMMON_SRCS
bitmap_base.cpp
block_commande.cpp
build_version.cpp
class_colors_design_settings.cpp
class_layer_box_selector.cpp
class_undoredo_container.cpp
colors_design_settings.cpp
colors.cpp
commit.cpp
common.cpp
@ -276,6 +274,7 @@ set( COMMON_SRCS
kiway_express.cpp
kiway_holder.cpp
kiway_player.cpp
layer_box_selector.cpp
lib_id.cpp
lib_table_base.cpp
lib_table_keywords.cpp
@ -297,6 +296,7 @@ set( COMMON_SRCS
settings.cpp
systemdirsappend.cpp
trigo.cpp
undo_redo_container.cpp
utf8.cpp
validators.cpp
wildcards_and_files_ext.cpp
@ -386,7 +386,6 @@ set( PCB_COMMON_SRCS
../pcbnew/class_board_item.cpp
../pcbnew/class_dimension.cpp
../pcbnew/class_drawsegment.cpp
../pcbnew/class_drc_item.cpp
../pcbnew/class_edge_mod.cpp
../pcbnew/class_marker_pcb.cpp
../pcbnew/class_module.cpp
@ -403,6 +402,7 @@ set( PCB_COMMON_SRCS
../pcbnew/connectivity_algo.cpp
../pcbnew/connectivity_data.cpp
../pcbnew/convert_drawsegment_list_to_polygon.cpp
../pcbnew/drc_item.cpp
../pcbnew/eagle_plugin.cpp
../pcbnew/gpcb_plugin.cpp
../pcbnew/io_mgr.cpp

4
common/colors_design_settings.cpp
View File

@ -23,13 +23,13 @@
*/
/**
* @file class_colors_design_settings.cpp
* @file colors_design_settings.cpp
* @brief Handle colors used to draw all items or layers.
*/
#include <fctsys.h>
#include <macros.h>
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
/* Class for handle list of color settings for designs
* in Eeschema, Pcbnew and GerbView

8
common/layer_box_selector.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
* Copyright (C) 2014 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
@ -22,7 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <common.h>
#include <layers_id_colors_and_visibility.h>
#include <bitmaps.h>
@ -30,8 +29,7 @@
#include <wx/ownerdrw.h>
#include <wx/menuitem.h>
#include <class_layer_box_selector.h>
#include <layer_box_selector.h>
LAYER_SELECTOR::LAYER_SELECTOR()
{
@ -73,8 +71,10 @@ void LAYER_SELECTOR::SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer )
bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );
}
/* class to display a layer list in a wxBitmapComboBox.
*/
LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
int n, const wxString choices[] ) :

4
common/swig/kicad.i
View File

@ -90,7 +90,7 @@ principle should be easily implemented by adapting the current STL containers.
#include <bitset>
#include <title_block.h>
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
#include <marker_base.h>
#include <eda_text.h>
#include <convert_to_biu.h>
@ -108,7 +108,7 @@ principle should be easily implemented by adapting the current STL containers.
%include common.h
%include title_block.h
%include gal/color4d.h
%include class_colors_design_settings.h
%include colors_design_settings.h
%include marker_base.h
%include eda_text.h

9
common/undo_redo_container.cpp
View File

@ -1,9 +1,9 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2009 jean-pierre.charras@gipsa-lab.inpg.fr
* Copyright (C) 2018 jp.charras at wanadoo.fr
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2009 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
* modify it under the terms of the GNU General Public License
@ -24,9 +24,8 @@
*/
#include <fctsys.h>
#include <common.h>
#include <base_struct.h>
#include <class_undoredo_container.h>
#include <undo_redo_container.h>
ITEM_PICKER::ITEM_PICKER( EDA_ITEM* aItem, UNDO_REDO_T aUndoRedoStatus )
@ -100,8 +99,6 @@ void PICKED_ITEMS_LIST::ClearItemsList()
void PICKED_ITEMS_LIST::ClearListAndDeleteItems()
{
bool show_error_message = true;
// Delete items is they are not flagged UR_NEW, or if this is a block operation
while( GetCount() > 0 )
{

2
cvpcb/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set( CVPCB_SRCS
../common/base_units.cpp
../pcbnew/board_items_to_polygon_shape_transform.cpp
../pcbnew/pcb_general_settings.cpp
../pcbnew/class_drc_item.cpp
../pcbnew/drc_item.cpp
auto_associate.cpp
cfg.cpp
components_listbox.cpp

2
eeschema/sch_edit_frame.h
View File

@ -32,7 +32,7 @@
#include <sch_base_frame.h>
#include <config_params.h>
#include <class_undoredo_container.h>
#include <undo_redo_container.h>
#include <template_fieldnames.h>
#include <block_commande.h>
#include <sch_collectors.h>

2
gerbview/CMakeLists.txt
View File

@ -77,7 +77,7 @@ set( GERBVIEW_EXTRA_SRCS
../common/base_screen.cpp
../common/base_units.cpp
../common/eda_text.cpp
../common/class_layer_box_selector.cpp
../common/layer_box_selector.cpp
../common/lset.cpp
../common/settings.cpp
../pcbnew/layer_widget.cpp

2
gerbview/gbr_layer_box_selector.h
View File

@ -25,7 +25,7 @@
#ifndef GBR_LAYER_BOX_SELECTOR_H
#define GBR_LAYER_BOX_SELECTOR_H 1
#include <class_layer_box_selector.h>
#include <layer_box_selector.h>
// class to display a layer list in GerbView.

2
gerbview/gbr_layout.h
View File

@ -34,7 +34,7 @@
#include <dlist.h>
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
#include <common.h> // PAGE_INFO
#include <gerbview.h> // GERBER_DRAWLAYERS_COUNT
#include <title_block.h>

2
gerbview/gerbview_draw_panel_gal.cpp
View File

@ -22,7 +22,7 @@
#include <view/wx_view_controls.h>
#include <gerbview_painter.h>
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
#include <gerbview_frame.h>
#include <gbr_display_options.h>
#include <gal/graphics_abstraction_layer.h>

2
gerbview/gerbview_frame.h
View File

@ -37,7 +37,7 @@
#include <gbr_screen.h>
#include <page_info.h>
#include <gbr_display_options.h>
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
extern COLORS_DESIGN_SETTINGS g_ColorsSettings;

2
gerbview/gerbview_painter.cpp
View File

@ -18,7 +18,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
#include <gerbview_painter.h>
#include <gal/graphics_abstraction_layer.h>

2
include/base_screen.h
View File

@ -33,7 +33,7 @@
#include <draw_frame.h>
#include <base_struct.h>
#include <class_undoredo_container.h>
#include <undo_redo_container.h>
#include <block_commande.h>
#include <common.h>
#include <id.h>

2
include/block_commande.h
View File

@ -33,7 +33,7 @@
#include <base_struct.h>
#include <class_undoredo_container.h>
#include <undo_redo_container.h>
#include <gr_basic.h>
#include <eda_rect.h>

2
include/commit.h
View File

@ -29,7 +29,7 @@
#include <set>
#include <vector>
#include <class_undoredo_container.h>
#include <undo_redo_container.h>
class EDA_ITEM;

8
include/layer_box_selector.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2011-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2014 KiCad Developers, see CHANGELOG.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
* modify it under the terms of the GNU General Public License
@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CLASS_LAYER_BOX_SELECTOR_H
#define CLASS_LAYER_BOX_SELECTOR_H 1
#ifndef LAYER_BOX_SELECTOR_H
#define LAYER_BOX_SELECTOR_H
#include <wx/bmpcbox.h>
#include <gal/color4d.h>
@ -104,4 +104,4 @@ public:
void ResyncBitmapOnly();
};
#endif // CLASS_LAYER_BOX_SELECTOR_H
#endif // LAYER_BOX_SELECTOR_H

6
pcbnew/CMakeLists.txt
View File

@ -209,9 +209,6 @@ set( PCBNEW_CLASS_SRCS
block_module_editor.cpp
board_netlist_updater.cpp
build_BOM_from_board.cpp
class_pcb_layer_box_selector.cpp
class_pcb_layer_widget.cpp
clean.cpp
connect.cpp
controle.cpp
cross-probing.cpp
@ -262,6 +259,8 @@ set( PCBNEW_CLASS_SRCS
onrightclick.cpp
pad_edition_functions.cpp
pcb_base_edit_frame.cpp
pcb_layer_box_selector.cpp
pcb_layer_widget.cpp
# pcb_draw_panel_gal.cpp
# pcb_view.cpp
pcb_edit_frame.cpp
@ -285,6 +284,7 @@ set( PCBNEW_CLASS_SRCS
toolbars_update_user_interface.cpp
tr_modif.cpp
tracepcb.cpp
tracks_cleaner.cpp
undo_redo.cpp
zone_filler.cpp
zones_by_polygon.cpp

2
pcbnew/class_board.h
View File

@ -38,7 +38,7 @@
#include <layers_id_colors_and_visibility.h>
#include <netinfo.h>
#include <class_pad.h>
#include <class_colors_design_settings.h>
#include <colors_design_settings.h>
#include <class_board_design_settings.h>
#include <title_block.h>
#include <zone_settings.h>

6
pcbnew/dialogs/dialog_dimension_editor_base.cpp
View File

@ -1,11 +1,11 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 22 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "class_pcb_layer_box_selector.h"
#include "pcb_layer_box_selector.h"
#include "widgets/text_ctrl_eval.h"
#include "dialog_dimension_editor_base.h"

2
pcbnew/dialogs/dialog_dimension_editor_base.fbp
View File

@ -1391,7 +1391,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">PCB_LAYER_BOX_SELECTOR; class_pcb_layer_box_selector.h</property>
<property name="subclass">PCB_LAYER_BOX_SELECTOR; pcb_layer_box_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>

5
pcbnew/dialogs/dialog_dimension_editor_base.h
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 22 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_DIMENSION_EDITOR_BASE_H__
@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class DIALOG_SHIM;
class PCB_LAYER_BOX_SELECTOR;
class TEXT_CTRL_EVAL;

2
pcbnew/dialogs/dialog_edit_module_text.cpp
View File

@ -48,7 +48,7 @@
#include <class_text_mod.h>
#include <class_board.h>
#include <class_pcb_layer_box_selector.h>
#include <pcb_layer_box_selector.h>
#include <dialog_edit_module_text.h>

2
pcbnew/dialogs/dialog_edit_module_text_base.cpp
View File

@ -5,7 +5,7 @@
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "class_pcb_layer_box_selector.h"
#include "pcb_layer_box_selector.h"
#include "widgets/text_ctrl_eval.h"
#include "dialog_edit_module_text_base.h"

2
pcbnew/dialogs/dialog_edit_module_text_base.fbp
View File

@ -1480,7 +1480,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">PCB_LAYER_BOX_SELECTOR; class_pcb_layer_box_selector.h</property>
<property name="subclass">PCB_LAYER_BOX_SELECTOR; pcb_layer_box_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>

Some files were not shown because too many files have changed in this diff Show More