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

Fix code after renaming files. Minor other fix.

This commit is contained in:
jean-pierre charras 2018-01-30 20:23:06 +01:00
parent d8b9f1081b
commit 6d6ef0097b
11 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/CMakeLists.txt
View File

@ -394,8 +394,6 @@ set( PCB_COMMON_SRCS
../pcbnew/netinfo_item.cpp
../pcbnew/netinfo_list.cpp
../pcbnew/class_pad.cpp
../pcbnew/class_pad_custom_shape_functions.cpp
../pcbnew/class_pad_draw_functions.cpp
../pcbnew/class_pcb_target.cpp
../pcbnew/class_pcb_text.cpp
../pcbnew/class_text_mod.cpp
@ -414,6 +412,8 @@ set( PCB_COMMON_SRCS
../pcbnew/legacy_netlist_reader.cpp
../pcbnew/legacy_plugin.cpp
../pcbnew/netlist_reader.cpp
../pcbnew/pad_custom_shape_functions.cpp
../pcbnew/pad_draw_functions.cpp
../pcbnew/pcb_display_options.cpp
../pcbnew/pcb_draw_panel_gal.cpp
../pcbnew/pcb_general_settings.cpp

3
pcbnew/CMakeLists.txt
View File

@ -166,6 +166,7 @@ set( PCBNEW_DIALOGS
dialogs/wizard_add_fplib_base.cpp
footprint_wizard.cpp
footprint_wizard_frame.cpp
footprint_wizard_frame_functions.cpp
${GITHUB_3DLIBRARIES_WIZARD}
)
@ -208,7 +209,6 @@ set( PCBNEW_CLASS_SRCS
block_module_editor.cpp
board_netlist_updater.cpp
build_BOM_from_board.cpp
class_footprint_wizard.cpp
class_pcb_layer_box_selector.cpp
class_pcb_layer_widget.cpp
clean.cpp
@ -233,6 +233,7 @@ set( PCBNEW_CLASS_SRCS
event_handlers_tracks_vias_sizes.cpp
files.cpp
footprint_info_impl.cpp
footprint_wizard.cpp
globaleditpad.cpp
highlight.cpp
hotkeys.cpp

10
pcbnew/dialogs/dialog_footprint_wizard_list.cpp
View File

@ -28,11 +28,9 @@
#include <wx/grid.h>
#include <fctsys.h>
#include <pcbnew.h>
#include <kiface_i.h>
#include <dialog_footprint_wizard_list.h>
#include <class_footprint_wizard.h>
#include <footprint_wizard_frame.h>
#if defined(KICAD_SCRIPTING) || defined(KICAD_SCRIPTING_WXPYTHON)
@ -91,10 +89,10 @@ void DIALOG_FOOTPRINT_WIZARD_LIST::initLists()
// Current wizard selection, empty or first
m_footprintWizard = NULL;
int n_wizards = FOOTPRINT_WIZARDS::GetWizardsCount();
int n_wizards = FOOTPRINT_WIZARD_LIST::GetWizardsCount();
if( n_wizards )
m_footprintWizard = FOOTPRINT_WIZARDS::GetWizard( 0 );
m_footprintWizard = FOOTPRINT_WIZARD_LIST::GetWizard( 0 );
// Choose selection mode and insert the needed rows
@ -112,7 +110,7 @@ void DIALOG_FOOTPRINT_WIZARD_LIST::initLists()
for( int ii = 0; ii < n_wizards; ii++ )
{
wxString num = wxString::Format( "%d", ii+1 );
FOOTPRINT_WIZARD *wizard = FOOTPRINT_WIZARDS::GetWizard( ii );
FOOTPRINT_WIZARD *wizard = FOOTPRINT_WIZARD_LIST::GetWizard( ii );
wxString name = wizard->GetName();
wxString description = wizard->GetDescription();
wxString image = wizard->GetImage();
@ -168,7 +166,7 @@ void DIALOG_FOOTPRINT_WIZARD_LIST::onUpdatePythonModulesClick( wxCommandEvent& e
void DIALOG_FOOTPRINT_WIZARD_LIST::OnCellFpGeneratorClick( wxGridEvent& event )
{
int click_row = event.GetRow();
m_footprintWizard = FOOTPRINT_WIZARDS::GetWizard( click_row );
m_footprintWizard = FOOTPRINT_WIZARD_LIST::GetWizard( click_row );
m_footprintGeneratorsGrid->SelectRow( event.GetRow(), false );
// Move the grid cursor to the active line, mainly for aesthetic reasons:
m_footprintGeneratorsGrid->GoToCell( event.GetRow(), FP_GEN_ROW_NUMBER );

2
pcbnew/dialogs/dialog_footprint_wizard_list.h
View File

@ -26,7 +26,7 @@
#define _DIALOG_FOOTPRINT_WIZARD_LIST_H_
#include <dialog_footprint_wizard_list_base.h>
#include <class_footprint_wizard.h>
#include <footprint_wizard.h>
class DIALOG_FOOTPRINT_WIZARD_LIST: public DIALOG_FOOTPRINT_WIZARD_LIST_BASE
{

20
pcbnew/footprint_wizard.cpp
View File

@ -24,11 +24,11 @@
/**
* @file class_footprint_wizard.cpp
* @brief Class FOOTPRINT_WIZARD and FOOTPRINT_WIZARDS
* @file footprint_wizard.cpp
* @brief Class FOOTPRINT_WIZARD and FOOTPRINT_WIZARD_LIST
*/
#include "class_footprint_wizard.h"
#include "footprint_wizard.h"
FOOTPRINT_WIZARD::~FOOTPRINT_WIZARD()
@ -38,19 +38,19 @@ FOOTPRINT_WIZARD::~FOOTPRINT_WIZARD()
void FOOTPRINT_WIZARD::register_wizard()
{
FOOTPRINT_WIZARDS::register_wizard( this );
FOOTPRINT_WIZARD_LIST::register_wizard( this );
}
std::vector<FOOTPRINT_WIZARD*> FOOTPRINT_WIZARDS::m_FootprintWizards;
std::vector<FOOTPRINT_WIZARD*> FOOTPRINT_WIZARD_LIST::m_FootprintWizards;
FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( int aIndex )
FOOTPRINT_WIZARD* FOOTPRINT_WIZARD_LIST::GetWizard( int aIndex )
{
return m_FootprintWizards[aIndex];
}
FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( const wxString& aName )
FOOTPRINT_WIZARD* FOOTPRINT_WIZARD_LIST::GetWizard( const wxString& aName )
{
int max = GetWizardsCount();
@ -68,13 +68,13 @@ FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( const wxString& aName )
}
int FOOTPRINT_WIZARDS::GetWizardsCount()
int FOOTPRINT_WIZARD_LIST::GetWizardsCount()
{
return m_FootprintWizards.size();
}
void FOOTPRINT_WIZARDS::register_wizard( FOOTPRINT_WIZARD* aWizard )
void FOOTPRINT_WIZARD_LIST::register_wizard( FOOTPRINT_WIZARD* aWizard )
{
// Search for this entry do not register twice this wizard):
for( int ii = 0; ii < GetWizardsCount(); ii++ )
@ -100,7 +100,7 @@ void FOOTPRINT_WIZARDS::register_wizard( FOOTPRINT_WIZARD* aWizard )
}
bool FOOTPRINT_WIZARDS::deregister_object( void* aObject )
bool FOOTPRINT_WIZARD_LIST::deregister_object( void* aObject )
{
int max = GetWizardsCount();

13
pcbnew/footprint_wizard.h
View File

@ -24,12 +24,13 @@
/**
* @file class_footprint_wizard.h
* @brief Class PCBNEW_FOOTPRINT_WIZARDS
* @file footprint_wizard.h
* @brief Class FOOTPRINT_WIZARD and FOOTPRINT_WIZARDS
*/
#ifndef CLASS_FOOTPRINT_WIZARD_H
#define CLASS_FOOTPRINT_WIZARD_H
#ifndef FOOTPRINT_WIZARD_H
#define FOOTPRINT_WIZARD_H
#include <vector>
#include <pcb_edit_frame.h>
@ -162,13 +163,13 @@ public:
/**
* Function register_wizard
* It's the standard method of a "FOOTPRINT_WIZARD" to register itself into
* the FOOTPRINT_WIZARDS singleton manager
* the FOOTPRINT_WIZARD_LIST singleton manager
*/
void register_wizard();
};
class FOOTPRINT_WIZARDS
class FOOTPRINT_WIZARD_LIST
{
private:
/**

2
pcbnew/footprint_wizard_frame.h
View File

@ -32,7 +32,7 @@
#include <wx/gdicmn.h>
#include <class_footprint_wizard.h>
#include <footprint_wizard.h>
class wxSashLayoutWindow;
class wxListBox;
class wxGrid;

6
pcbnew/footprint_wizard_frame_functions.cpp
View File

@ -24,7 +24,7 @@
*/
/**
* @file footprint_wizard.cpp
* @file footprint_wizard_frame_functions.cpp
*/
#include <fctsys.h>
@ -165,7 +165,7 @@ FOOTPRINT_WIZARD* FOOTPRINT_WIZARD_FRAME::GetMyWizard()
if( m_wizardName.Length() == 0 )
return NULL;
FOOTPRINT_WIZARD* footprintWizard = FOOTPRINT_WIZARDS::GetWizard( m_wizardName );
FOOTPRINT_WIZARD* footprintWizard = FOOTPRINT_WIZARD_LIST::GetWizard( m_wizardName );
if( !footprintWizard )
{
@ -179,7 +179,7 @@ FOOTPRINT_WIZARD* FOOTPRINT_WIZARD_FRAME::GetMyWizard()
MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint()
{
FOOTPRINT_WIZARD* footprintWizard = FOOTPRINT_WIZARDS::GetWizard( m_wizardName );
FOOTPRINT_WIZARD* footprintWizard = FOOTPRINT_WIZARD_LIST::GetWizard( m_wizardName );
if( footprintWizard && m_modal_ret_val )
{

8
pcbnew/swig/pcbnew_footprint_wizards.cpp
View File

@ -24,7 +24,7 @@
/**
* @file pcbnew_footprint_wizards.cpp
* @brief Class PCBNEW_PYTHON_FOOTPRINT_WIZARDS
* @brief Class and PYTHON_FOOTPRINT_WIZARD_LIST and PYTHON_FOOTPRINT_WIZARD_LIST
*/
#include "pcbnew_footprint_wizards.h"
@ -361,7 +361,7 @@ void* PYTHON_FOOTPRINT_WIZARD::GetObject()
}
void PYTHON_FOOTPRINT_WIZARDS::register_wizard( PyObject* aPyWizard )
void PYTHON_FOOTPRINT_WIZARD_LIST::register_wizard( PyObject* aPyWizard )
{
PYTHON_FOOTPRINT_WIZARD* fw = new PYTHON_FOOTPRINT_WIZARD( aPyWizard );
@ -369,8 +369,8 @@ void PYTHON_FOOTPRINT_WIZARDS::register_wizard( PyObject* aPyWizard )
}
void PYTHON_FOOTPRINT_WIZARDS::deregister_wizard( PyObject* aPyWizard )
void PYTHON_FOOTPRINT_WIZARD_LIST::deregister_wizard( PyObject* aPyWizard )
{
// deregister also destroyes the previously created "PYTHON_FOOTPRINT_WIZARD object"
FOOTPRINT_WIZARDS::deregister_object( (void*) aPyWizard );
FOOTPRINT_WIZARD_LIST::deregister_object( (void*) aPyWizard );
}

4
pcbnew/swig/pcbnew_footprint_wizards.h
View File

@ -31,7 +31,7 @@
#define PCBNEW_FOOTPRINT_WIZARDS_H
#include <Python.h>
#include <vector>
#include <class_footprint_wizard.h>
#include <footprint_wizard.h>
class PYTHON_FOOTPRINT_WIZARD : public FOOTPRINT_WIZARD
@ -66,7 +66,7 @@ public:
};
class PYTHON_FOOTPRINT_WIZARDS
class PYTHON_FOOTPRINT_WIZARD_LIST
{
public:
static void register_wizard( PyObject* aPyWizard );

2
pcbnew/swig/plugins.i
View File

@ -27,7 +27,7 @@
#include <pcbnew_action_plugins.h>
%}
class PYTHON_FOOTPRINT_WIZARDS
class PYTHON_FOOTPRINT_WIZARD_LIST
{
public:
static void register_wizard( PyObject* wizard );