Skip to content

K
kicad-source-mirror
Commit 155ea57c authored by Miguel Angel Ajo's avatar Miguel Angel Ajo
Browse files
Options

LOCALE_IO toggle implementation for locale switches on scripting; code... 

LOCALE_IO toggle implementation for locale switches on scripting; code cleanups to comply with kicad coding style policy
parent cefd3cd5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 451 additions and 452 deletions
pcbnew/class_footprint_wizard.cpp
View file @ 155ea57c
...@@ -36,12 +36,8 @@ void FOOTPRINT_WIZARD::register_wizard() ...@@ -36,12 +36,8 @@ void FOOTPRINT_WIZARD::register_wizard()
FOOTPRINT_WIZARDS::register_wizard( this ); FOOTPRINT_WIZARDS::register_wizard( this );
} }
/**
* FOOTPRINT_WIZARD system wide static list
*/
std::vector<FOOTPRINT_WIZARD*> FOOTPRINT_WIZARDS::m_FootprintWizards; std::vector<FOOTPRINT_WIZARD*> FOOTPRINT_WIZARDS::m_FootprintWizards;
FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( int aIndex ) FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( int aIndex )
{ {
return m_FootprintWizards[aIndex]; return m_FootprintWizards[aIndex];
...@@ -50,17 +46,17 @@ FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( int aIndex ) ...@@ -50,17 +46,17 @@ FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( int aIndex )
FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( wxString aName ) FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( wxString aName )
{ {
int max = GetSize(); int max = GetSize();
for( int i=0; i<max; i++ ) for( int i=0; i<max; i++ )
{ {
FOOTPRINT_WIZARD *wizard = GetWizard( i ); FOOTPRINT_WIZARD *wizard = GetWizard( i );
wxString name = wizard->GetName(); wxString name = wizard->GetName();
if ( name.Cmp( aName ) ) if ( name.Cmp( aName ) )
return wizard; return wizard;
} }
return NULL; return NULL;
} }
...@@ -71,10 +67,10 @@ int FOOTPRINT_WIZARDS::GetSize() ...@@ -71,10 +67,10 @@ int FOOTPRINT_WIZARDS::GetSize()
void FOOTPRINT_WIZARDS::register_wizard(FOOTPRINT_WIZARD *aWizard) void FOOTPRINT_WIZARDS::register_wizard(FOOTPRINT_WIZARD *aWizard)
{ {
wxString name = aWizard->GetName(); wxString name = aWizard->GetName();
m_FootprintWizards.push_back( aWizard ); m_FootprintWizards.push_back( aWizard );
} }
......
pcbnew/class_footprint_wizard.h
View file @ 155ea57c
...@@ -134,6 +134,9 @@ public: ...@@ -134,6 +134,9 @@ public:
class FOOTPRINT_WIZARDS class FOOTPRINT_WIZARDS
{ {
private: private:
/**
* FOOTPRINT_WIZARD system wide static list
*/
static std::vector<FOOTPRINT_WIZARD*> m_FootprintWizards; static std::vector<FOOTPRINT_WIZARD*> m_FootprintWizards;
public: public:
......
pcbnew/footprint_wizard.cpp
View file @ 155ea57c
...@@ -20,25 +20,28 @@ ...@@ -20,25 +20,28 @@
#include <dialogs/dialog_footprint_wizard_list.h> #include <dialogs/dialog_footprint_wizard_list.h>
#include <base_units.h> #include <base_units.h>
#define NEXT_PART 1 #define NEXT_PART 1
#define NEW_PART 0 #define NEW_PART 0
#define PREVIOUS_PART -1 #define PREVIOUS_PART -1
void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event ) void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )
{ {
wxString msg; wxString msg;
int page; int page;
switch( event.GetId() ) switch( event.GetId() )
{ {
case ID_FOOTPRINT_WIZARD_NEXT: case ID_FOOTPRINT_WIZARD_NEXT:
m_PageList->SetSelection( m_PageList->GetSelection()+1, true ); m_PageList->SetSelection( m_PageList->GetSelection() + 1, true );
break; break;
case ID_FOOTPRINT_WIZARD_PREVIOUS: case ID_FOOTPRINT_WIZARD_PREVIOUS:
page = m_PageList->GetSelection()-1; page = m_PageList->GetSelection() - 1;
if (page<0) page=0;
if( page<0 )
page = 0;
m_PageList->SetSelection( page, true ); m_PageList->SetSelection( page, true );
break; break;
...@@ -50,17 +53,19 @@ void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event ) ...@@ -50,17 +53,19 @@ void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )
} }
} }
/* Function OnLeftClick /* Function OnLeftClick
* Captures a left click event in the dialog * Captures a left click event in the dialog
* *
*/ */
void FOOTPRINT_WIZARD_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) void FOOTPRINT_WIZARD_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
{ {
} }
/* Function OnRightClick /* Function OnRightClick
* Captures a right click event in the dialog * Captures a right click event in the dialog
* *
*/ */
bool FOOTPRINT_WIZARD_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu ) bool FOOTPRINT_WIZARD_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )
{ {
...@@ -71,12 +76,12 @@ bool FOOTPRINT_WIZARD_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopM ...@@ -71,12 +76,12 @@ bool FOOTPRINT_WIZARD_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopM
/* Displays the name of the current opened library in the caption */ /* Displays the name of the current opened library in the caption */
void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos() void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos()
{ {
wxString msg; wxString msg;
msg = _( "Footprint Wizard" ); msg = _( "Footprint Wizard" );
msg << wxT( " [" ); msg << wxT( " [" );
if( ! m_wizardName.IsEmpty() ) if( !m_wizardName.IsEmpty() )
msg << m_wizardName; msg << m_wizardName;
else else
msg += _( "no wizard selected" ); msg += _( "no wizard selected" );
...@@ -86,6 +91,7 @@ void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos() ...@@ -86,6 +91,7 @@ void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos()
SetTitle( msg ); SetTitle( msg );
} }
void FOOTPRINT_WIZARD_FRAME::ReloadFootprint() void FOOTPRINT_WIZARD_FRAME::ReloadFootprint()
{ {
if( m_FootprintWizard == NULL ) if( m_FootprintWizard == NULL )
...@@ -94,25 +100,28 @@ void FOOTPRINT_WIZARD_FRAME::ReloadFootprint() ...@@ -94,25 +100,28 @@ void FOOTPRINT_WIZARD_FRAME::ReloadFootprint()
SetCurItem( NULL ); SetCurItem( NULL );
// Delete the current footprint // Delete the current footprint
GetBoard()->m_Modules.DeleteAll(); GetBoard()->m_Modules.DeleteAll();
MODULE *m = m_FootprintWizard->GetModule(); MODULE* m = m_FootprintWizard->GetModule();
if ( m )
if( m )
{ {
/* Here we should make a copy of the object before adding to board*/ /* Here we should make a copy of the object before adding to board*/
m->SetParent((EDA_ITEM*)GetBoard()); m->SetParent( (EDA_ITEM*) GetBoard() );
GetBoard()->m_Modules.Append(m); GetBoard()->m_Modules.Append( m );
wxPoint p( 0 , 0 ); wxPoint p( 0, 0 );
m->SetPosition( p ); m->SetPosition( p );
} }
else else
{ {
printf ("m_FootprintWizard->GetModule() returns NULL\n"); printf( "m_FootprintWizard->GetModule() returns NULL\n" );
} }
m_canvas->Refresh(); m_canvas->Refresh();
} }
MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint() MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint()
{ {
if ( m_FootprintWizard ) if( m_FootprintWizard )
{ {
return m_FootprintWizard->GetModule(); return m_FootprintWizard->GetModule();
} }
...@@ -122,16 +131,17 @@ MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint() ...@@ -122,16 +131,17 @@ MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint()
} }
} }
void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard() void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard()
{ {
DIALOG_FOOTPRINT_WIZARD_LIST *selectWizard = DIALOG_FOOTPRINT_WIZARD_LIST* selectWizard =
new DIALOG_FOOTPRINT_WIZARD_LIST( this ); new DIALOG_FOOTPRINT_WIZARD_LIST( this );
selectWizard->ShowModal(); selectWizard->ShowModal();
m_FootprintWizard = selectWizard->GetWizard(); m_FootprintWizard = selectWizard->GetWizard();
if ( m_FootprintWizard ) if( m_FootprintWizard )
{ {
m_wizardName = m_FootprintWizard->GetName(); m_wizardName = m_FootprintWizard->GetName();
m_wizardDescription = m_FootprintWizard->GetDescription(); m_wizardDescription = m_FootprintWizard->GetDescription();
...@@ -142,64 +152,63 @@ void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard() ...@@ -142,64 +152,63 @@ void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard()
DisplayWizardInfos(); DisplayWizardInfos();
ReCreatePageList(); ReCreatePageList();
ReCreateParameterList(); ReCreateParameterList();
} }
void FOOTPRINT_WIZARD_FRAME::SelectCurrentWizard( wxCommandEvent& event ) void FOOTPRINT_WIZARD_FRAME::SelectCurrentWizard( wxCommandEvent& event )
{ {
SelectFootprintWizard(); SelectFootprintWizard();
} }
/** /**
* Function SelectCurrentFootprint * Function SelectCurrentFootprint
* Selects the current footprint name and display it * Selects the current footprint name and display it
*/ */
void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event ) void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
{ {
int page = m_PageList->GetSelection(); int page = m_PageList->GetSelection();
if ( page<0 ) if( page<0 )
return; return;
int n=m_ParameterGrid->GetNumberRows(); int n = m_ParameterGrid->GetNumberRows();
wxArrayString arr; wxArrayString arr;
wxArrayString ptList = m_FootprintWizard->GetParameterTypes(page); wxArrayString ptList = m_FootprintWizard->GetParameterTypes( page );
for ( int i=0; i<n; i++ ) for( int i = 0; i<n; i++ )
{ {
wxString value = m_ParameterGrid->GetCellValue( i, 1 ); wxString value = m_ParameterGrid->GetCellValue( i, 1 );
// if this parameter is expected to be an internal // if this parameter is expected to be an internal
// unit convert it back from the user format // unit convert it back from the user format
if (ptList[i]==wxT("IU")) if( ptList[i]==wxT( "IU" ) )
{ {
LOCALE_IO toggle;
double dValue; double dValue;
value.ToDouble( &dValue ); value.ToDouble( &dValue );
// convert from mils to inches where it's needed // convert from mils to inches where it's needed
if (g_UserUnit==INCHES) dValue = dValue / 1000.0; if( g_UserUnit==INCHES )
dValue = From_User_Unit( g_UserUnit, dValue); dValue = dValue / 1000.0;
value.Printf( wxT("%lf"), dValue ); dValue = From_User_Unit( g_UserUnit, dValue );
value.Printf( wxT( "%lf" ), dValue );
} }
// If our locale is set to use , for decimal point, just change it // If our locale is set to use , for decimal point, just change it
// to be scripting compatible // to be scripting compatible
value.Replace( wxT( "," ), wxT( "." ) );
arr.Add( value ); arr.Add( value );
} }
wxString res = m_FootprintWizard->SetParameterValues( page, arr ); wxString res = m_FootprintWizard->SetParameterValues( page, arr );
ReloadFootprint(); ReloadFootprint();
DisplayWizardInfos(); DisplayWizardInfos();
} }
...@@ -207,8 +216,8 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event ) ...@@ -207,8 +216,8 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
* Function RedrawActiveWindow * Function RedrawActiveWindow
* Display the current selected component. * Display the current selected component.
* If the component is an alias, the ROOT component is displayed * If the component is an alias, the ROOT component is displayed
* *
*/ */
void FOOTPRINT_WIZARD_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) void FOOTPRINT_WIZARD_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
{ {
if( !GetBoard() ) if( !GetBoard() )
...@@ -219,7 +228,7 @@ void FOOTPRINT_WIZARD_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) ...@@ -219,7 +228,7 @@ void FOOTPRINT_WIZARD_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
MODULE* module = GetBoard()->m_Modules; MODULE* module = GetBoard()->m_Modules;
if ( module ) if( module )
SetMsgPanel( module ); SetMsgPanel( module );
m_canvas->DrawCrossHair( DC ); m_canvas->DrawCrossHair( DC );
......
pcbnew/footprint_wizard_frame.cpp
View file @ 155ea57c
This diff is collapsed.
pcbnew/footprint_wizard_frame.h
View file @ 155ea57c
...@@ -48,105 +48,104 @@ class FOOTPRINT_WIZARD_FRAME : public PCB_BASE_FRAME ...@@ -48,105 +48,104 @@ class FOOTPRINT_WIZARD_FRAME : public PCB_BASE_FRAME
{ {
private: private:
wxSashLayoutWindow* m_PageListWindow; //< List of libraries (for selection ) wxSashLayoutWindow* m_PageListWindow; // < List of libraries (for selection )
wxListBox* m_PageList; //< The list of pages wxListBox* m_PageList; // < The list of pages
wxSize m_PageListSize; //< size of the window wxSize m_PageListSize; // < size of the window
wxSashLayoutWindow* m_ParameterGridWindow; //< List of components in the selected library wxSashLayoutWindow* m_ParameterGridWindow; // < List of components in the selected library
wxGrid* m_ParameterGrid; //< The list of parameters wxGrid* m_ParameterGrid; // < The list of parameters
wxSize m_ParameterGridSize; //< size of the window wxSize m_ParameterGridSize; // < size of the window
// Flags // Flags
wxSemaphore* m_Semaphore; //< != NULL if the frame must emulate a modal dialog wxSemaphore* m_Semaphore; // < != NULL if the frame must emulate a modal dialog
wxString m_configPath; //< subpath for configuration wxString m_configPath; // < subpath for configuration
FOOTPRINT_WIZARD* m_FootprintWizard;
FOOTPRINT_WIZARD* m_FootprintWizard;
protected: protected:
wxString m_wizardName; //< name of the current wizard wxString m_wizardName; // < name of the current wizard
wxString m_wizardDescription; //< description of the wizard wxString m_wizardDescription; // < description of the wizard
wxString m_wizardStatus; //< current wizard status wxString m_wizardStatus; // < current wizard status
public: public:
FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent,
wxSemaphore* semaphore = NULL, wxSemaphore* semaphore = NULL,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE ); long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
~FOOTPRINT_WIZARD_FRAME(); ~FOOTPRINT_WIZARD_FRAME();
MODULE* GetBuiltFootprint( void ); MODULE* GetBuiltFootprint( void );
private: private:
void OnSize( wxSizeEvent& event ); void OnSize( wxSizeEvent& event );
/** /**
* Function ExportSelectedFootprint(); * Function ExportSelectedFootprint();
* will let the caller exit from the wait loop, and get the built footprint * will let the caller exit from the wait loop, and get the built footprint
* *
*/ */
void ExportSelectedFootprint( wxCommandEvent& aEvent ); void ExportSelectedFootprint( wxCommandEvent& aEvent );
/** /**
* Function OnSashDrag * Function OnSashDrag
* resizes the child windows when dragging a sash window border. * resizes the child windows when dragging a sash window border.
*/ */
void OnSashDrag( wxSashEvent& event ); void OnSashDrag( wxSashEvent& event );
/** /**
* Function ReCreatePageList * Function ReCreatePageList
* Creates or recreates the list of parameter pages for the current wizard. * Creates or recreates the list of parameter pages for the current wizard.
* This list is sorted * This list is sorted
*/ */
void ReCreatePageList(); void ReCreatePageList();
/** /**
* Function ReCreateParameterList * Function ReCreateParameterList
* Creates the list of parameters for the current page * Creates the list of parameters for the current page
*/ */
void ReCreateParameterList(); void ReCreateParameterList();
/** /**
* Function SelectFootprintWizard * Function SelectFootprintWizard
* Shows the list of footprint wizards available into the system * Shows the list of footprint wizards available into the system
*/ */
void SelectFootprintWizard(); void SelectFootprintWizard();
/** /**
* Function ReloadFootprint * Function ReloadFootprint
* Reloads the current footprint * Reloads the current footprint
*/ */
void ReloadFootprint(); void ReloadFootprint();
void Process_Special_Functions( wxCommandEvent& event ); void Process_Special_Functions( wxCommandEvent& event );
/** /**
* Function DisplayWizardInfos * Function DisplayWizardInfos
* Shows all the details about the current wizard * Shows all the details about the current wizard
*/ */
void DisplayWizardInfos(); void DisplayWizardInfos();
void RedrawActiveWindow( wxDC* DC, bool EraseBg ); void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void OnCloseWindow( wxCloseEvent& Event ); void OnCloseWindow( wxCloseEvent& Event );
void ReCreateHToolbar(); void ReCreateHToolbar();
void ReCreateVToolbar(); void ReCreateVToolbar();
void OnLeftClick( wxDC* DC, const wxPoint& MousePos ); void OnLeftClick( wxDC* DC, const wxPoint& MousePos );
void ClickOnPageList( wxCommandEvent& event ); void ClickOnPageList( wxCommandEvent& event );
void OnSetRelativeOffset( wxCommandEvent& event ); void OnSetRelativeOffset( wxCommandEvent& event );
void GeneralControl( wxDC* aDC, const wxPoint& aPosition, int aHotKey = 0 ); void GeneralControl( wxDC* aDC, const wxPoint& aPosition, int aHotKey = 0 );
/** /**
* Function LoadSettings * Function LoadSettings
* loads the library viewer frame specific configuration settings. * loads the library viewer frame specific configuration settings.
* *
* Don't forget to call this base method from any derived classes or the * Don't forget to call this base method from any derived classes or the
* settings will not get loaded. * settings will not get loaded.
*/ */
void LoadSettings(); void LoadSettings();
/** /**
* Function SaveSettings * Function SaveSettings
...@@ -155,7 +154,7 @@ private: ...@@ -155,7 +154,7 @@ private:
* Don't forget to call this base method from any derived classes or the * Don't forget to call this base method from any derived classes or the
* settings will not get saved. * settings will not get saved.
*/ */
void SaveSettings(); void SaveSettings();
/** /**
...@@ -163,21 +162,20 @@ private: ...@@ -163,21 +162,20 @@ private:
* is called when the frame frame is activate to reload the libraries and component lists * is called when the frame frame is activate to reload the libraries and component lists
* that can be changed by the schematic editor or the library editor. * that can be changed by the schematic editor or the library editor.
*/ */
virtual void OnActivate( wxActivateEvent& event ); virtual void OnActivate( wxActivateEvent& event );
void SelectCurrentWizard( wxCommandEvent& event );
void ParametersUpdated( wxGridEvent& event ); void SelectCurrentWizard( wxCommandEvent& event );
void ParametersUpdated( wxGridEvent& event );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu ); bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
/** /**
* Function Show3D_Frame (virtual) * Function Show3D_Frame (virtual)
* displays 3D view of the footprint (module) being edited. * displays 3D view of the footprint (module) being edited.
*/ */
void Show3D_Frame( wxCommandEvent& event ); void Show3D_Frame( wxCommandEvent& event );
/** /**
* Function Update3D_Frame * Function Update3D_Frame
...@@ -186,18 +184,18 @@ private: ...@@ -186,18 +184,18 @@ private:
* @param aForceReloadFootprint = true to reload data (default) * @param aForceReloadFootprint = true to reload data (default)
* = false to update title only -(aftre creating the 3D viewer) * = false to update title only -(aftre creating the 3D viewer)
*/ */
void Update3D_Frame( bool aForceReloadFootprint = true ); void Update3D_Frame( bool aForceReloadFootprint = true );
/* /*
* Virtual functions, not used here, but needed by PCB_BASE_FRAME * Virtual functions, not used here, but needed by PCB_BASE_FRAME
* (virtual pure functions ) * (virtual pure functions )
*/ */
void OnLeftDClick(wxDC*, const wxPoint&) {} void OnLeftDClick( wxDC*, const wxPoint& ) {}
void SaveCopyInUndoList(BOARD_ITEM*, UNDO_REDO_T, const wxPoint&) {} void SaveCopyInUndoList( BOARD_ITEM*, UNDO_REDO_T, const wxPoint& ) {}
void SaveCopyInUndoList(PICKED_ITEMS_LIST&, UNDO_REDO_T, const wxPoint&) {} void SaveCopyInUndoList( PICKED_ITEMS_LIST&, UNDO_REDO_T, const wxPoint& ) {}
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // FOOTPRINT_WIZARD_FRM_H_ #endif // FOOTPRINT_WIZARD_FRM_H_
pcbnew/scripting/pcbnew_footprint_wizards.h
View file @ 155ea57c
...@@ -28,45 +28,41 @@ ...@@ -28,45 +28,41 @@
*/ */
#ifndef PCBNEW_FOOTPRINT_WIZARDS_H #ifndef PCBNEW_FOOTPRINT_WIZARDS_H
#define PCBNEW_FOOTPRINT_WIZARDS_H #define PCBNEW_FOOTPRINT_WIZARDS_H
#include <Python.h> #include <Python.h>
#include <vector> #include <vector>
#include <class_footprint_wizard.h> #include <class_footprint_wizard.h>
class PYTHON_FOOTPRINT_WIZARD : public FOOTPRINT_WIZARD
class PYTHON_FOOTPRINT_WIZARD: public FOOTPRINT_WIZARD
{ {
PyObject* m_PyWizard;
PyObject *m_PyWizard; PyObject* CallMethod( const char* aMethod, PyObject* aArglist = NULL );
PyObject *CallMethod( const char *aMethod, PyObject *aArglist=NULL ); wxString CallRetStrMethod( const char* aMethod, PyObject* aArglist = NULL );
wxString CallRetStrMethod( const char *aMethod, PyObject *aArglist=NULL ); wxArrayString CallRetArrayStrMethod( const char* aMethod,
wxArrayString CallRetArrayStrMethod( const char *aMethod, PyObject* aArglist = NULL );
PyObject *aArglist=NULL );
public: public:
PYTHON_FOOTPRINT_WIZARD( PyObject *wizard ); PYTHON_FOOTPRINT_WIZARD( PyObject* wizard );
~PYTHON_FOOTPRINT_WIZARD(); ~PYTHON_FOOTPRINT_WIZARD();
wxString GetName(); wxString GetName();
wxString GetImage(); wxString GetImage();
wxString GetDescription(); wxString GetDescription();
int GetNumParameterPages(); int GetNumParameterPages();
wxString GetParameterPageName( int aPage ); wxString GetParameterPageName( int aPage );
wxArrayString GetParameterNames( int aPage ); wxArrayString GetParameterNames( int aPage );
wxArrayString GetParameterTypes( int aPage ); wxArrayString GetParameterTypes( int aPage );
wxArrayString GetParameterValues( int aPage ); wxArrayString GetParameterValues( int aPage );
wxArrayString GetParameterErrors( int aPage ); wxArrayString GetParameterErrors( int aPage );
wxString SetParameterValues( int aPage, wxArrayString& aValues ); //< must return "OK" or error description wxString SetParameterValues( int aPage, wxArrayString& aValues ); // < must return "OK" or error description
MODULE* GetModule(); MODULE* GetModule();
}; };
class PYTHON_FOOTPRINT_WIZARDS class PYTHON_FOOTPRINT_WIZARDS
{ {
public: public:
static void register_wizard( PyObject *aPyWizard ); static void register_wizard( PyObject* aPyWizard );
}; };
#endif /* PCBNEW_FOOTPRINT_WIZARDS_H */ #endif /* PCBNEW_FOOTPRINT_WIZARDS_H */
pcbnew/scripting/pcbnew_scripting_helpers.cpp
View file @ 155ea57c
...@@ -39,68 +39,68 @@ ...@@ -39,68 +39,68 @@
#include <macros.h> #include <macros.h>
#include <stdlib.h> #include <stdlib.h>
static PCB_EDIT_FRAME *PcbEditFrame=NULL; static PCB_EDIT_FRAME* PcbEditFrame = NULL;
BOARD *GetBoard() BOARD* GetBoard()
{ {
if (PcbEditFrame) if( PcbEditFrame )
return PcbEditFrame->GetBoard(); return PcbEditFrame->GetBoard();
else return NULL; else
return NULL;
} }
void ScriptingSetPcbEditFrame( PCB_EDIT_FRAME *aPCBEdaFrame )
void ScriptingSetPcbEditFrame( PCB_EDIT_FRAME* aPCBEdaFrame )
{ {
PcbEditFrame = aPCBEdaFrame; PcbEditFrame = aPCBEdaFrame;
} }
BOARD* LoadBoard( wxString& aFileName ) BOARD* LoadBoard( wxString& aFileName )
{ {
if( aFileName.EndsWith( wxT( ".kicad_pcb" ) ) )
return LoadBoard( aFileName, IO_MGR::KICAD );
if ( aFileName.EndsWith( wxT( ".kicad_pcb" ) ) ) else if( aFileName.EndsWith( wxT( ".brd" ) ) )
return LoadBoard(aFileName,IO_MGR::KICAD); return LoadBoard( aFileName, IO_MGR::LEGACY );
else if (aFileName.EndsWith(wxT(".brd")))
return LoadBoard(aFileName,IO_MGR::LEGACY);
// as fall back for any other kind use the legacy format // as fall back for any other kind use the legacy format
return LoadBoard(aFileName,IO_MGR::LEGACY); return LoadBoard( aFileName, IO_MGR::LEGACY );
} }
BOARD* LoadBoard( wxString& aFileName, IO_MGR::PCB_FILE_T aFormat ) BOARD* LoadBoard( wxString& aFileName, IO_MGR::PCB_FILE_T aFormat )
{ {
return IO_MGR::Load( aFormat, aFileName ); return IO_MGR::Load( aFormat, aFileName );
} }
bool SaveBoard( wxString& aFilename, BOARD* aBoard ) bool SaveBoard( wxString& aFilename, BOARD* aBoard )
{ {
return SaveBoard( aFilename, aBoard,IO_MGR::KICAD ); return SaveBoard( aFilename, aBoard, IO_MGR::KICAD );
} }
bool SaveBoard( wxString& aFileName, BOARD* aBoard, bool SaveBoard( wxString& aFileName, BOARD* aBoard,
IO_MGR::PCB_FILE_T aFormat ) IO_MGR::PCB_FILE_T aFormat )
{ {
aBoard->m_Status_Pcb &= ~CONNEXION_OK; aBoard->m_Status_Pcb &= ~CONNEXION_OK;
aBoard->SynchronizeNetsAndNetClasses(); aBoard->SynchronizeNetsAndNetClasses();
aBoard->SetCurrentNetClass( aBoard->m_NetClasses.GetDefault()->GetName() ); aBoard->SetCurrentNetClass( aBoard->m_NetClasses.GetDefault()->GetName() );
wxString header;
PROPERTIES props;
if ( aFormat==IO_MGR::LEGACY )
{
header = wxString::Format(
wxT( "PCBNEW-BOARD Version %d date %s\n\n# Created by Pcbnew%s scripting\n\n" ),
LEGACY_BOARD_FILE_VERSION, DateAndTime().GetData(),
GetBuildVersion().GetData() );
props["header"] = header;
}
wxString header;
PROPERTIES props;
if( aFormat==IO_MGR::LEGACY )
{
header = wxString::Format(
wxT( "PCBNEW-BOARD Version %d date %s\n\n# Created by Pcbnew%s scripting\n\n" ),
LEGACY_BOARD_FILE_VERSION, DateAndTime().GetData(),
GetBuildVersion().GetData() );
props["header"] = header;
}
IO_MGR::Save( aFormat, aFileName, aBoard, &props );
return true;
IO_MGR::Save( aFormat, aFileName, aBoard, &props );
return true;
} }
pcbnew/scripting/pcbnew_scripting_helpers.h
View file @ 155ea57c
...@@ -31,16 +31,17 @@ ...@@ -31,16 +31,17 @@
* we want plain pcbnew.<method_name> access from python */ * we want plain pcbnew.<method_name> access from python */
#ifndef SWIG #ifndef SWIG
void ScriptingSetPcbEditFrame( PCB_EDIT_FRAME *aPCBEdaFrame ); void ScriptingSetPcbEditFrame( PCB_EDIT_FRAME* aPCBEdaFrame );
#endif
BOARD *GetBoard(); #endif
BOARD* GetBoard();
BOARD* LoadBoard( wxString& aFileName, IO_MGR::PCB_FILE_T aFormat ); BOARD* LoadBoard( wxString& aFileName, IO_MGR::PCB_FILE_T aFormat );
BOARD* LoadBoard( wxString& aFileName ); BOARD* LoadBoard( wxString& aFileName );
bool SaveBoard( wxString& aFileName, BOARD* aBoard, IO_MGR::PCB_FILE_T aFormat ); bool SaveBoard( wxString& aFileName, BOARD* aBoard, IO_MGR::PCB_FILE_T aFormat );
bool SaveBoard( wxString& aFileName, BOARD* aBoard ); bool SaveBoard( wxString& aFileName, BOARD* aBoard );
#endif #endif
scripting/python_scripting.cpp
View file @ 155ea57c
...@@ -54,18 +54,18 @@ extern "C" void init_pcbnew( void ); ...@@ -54,18 +54,18 @@ extern "C" void init_pcbnew( void );
* our own ones * our own ones
*/ */
struct _inittab *SwigImportInittab; struct _inittab* SwigImportInittab;
static int SwigNumModules = 0; static int SwigNumModules = 0;
/* Add a name + initfuction to our SwigImportInittab */ /* Add a name + initfuction to our SwigImportInittab */
static void swigAddModule( const char* name, void (* initfunc)() ) static void swigAddModule( const char* name, void (* initfunc)() )
{ {
SwigImportInittab[SwigNumModules].name = (char*) name; SwigImportInittab[SwigNumModules].name = (char*) name;
SwigImportInittab[SwigNumModules].initfunc = initfunc; SwigImportInittab[SwigNumModules].initfunc = initfunc;
SwigNumModules++; SwigNumModules++;
SwigImportInittab[SwigNumModules].name = (char*) 0; SwigImportInittab[SwigNumModules].name = (char*) 0;
SwigImportInittab[SwigNumModules].initfunc = 0; SwigImportInittab[SwigNumModules].initfunc = 0;
} }
...@@ -81,11 +81,12 @@ static void swigAddBuiltin() ...@@ -81,11 +81,12 @@ static void swigAddBuiltin()
i++; i++;
/* allocate memory for the python module table */ /* allocate memory for the python module table */
SwigImportInittab = (struct _inittab*) malloc( SwigImportInittab = (struct _inittab*) malloc(
sizeof(struct _inittab)*(i+EXTRA_PYTHON_MODULES)); sizeof(struct _inittab) * (i + EXTRA_PYTHON_MODULES) );
/* copy all pre-existing python modules into our newly created table */ /* copy all pre-existing python modules into our newly created table */
i=0; i = 0;
while( PyImport_Inittab[i].name ) while( PyImport_Inittab[i].name )
{ {
swigAddModule( PyImport_Inittab[i].name, PyImport_Inittab[i].initfunc ); swigAddModule( PyImport_Inittab[i].name, PyImport_Inittab[i].initfunc );
...@@ -107,9 +108,10 @@ static void swigAddModules() ...@@ -107,9 +108,10 @@ static void swigAddModules()
// finally it seems better to include all in just one module // finally it seems better to include all in just one module
// but in case we needed to include any other modules, // but in case we needed to include any other modules,
// it must be done like this: // it must be done like this:
// swigAddModule("_kicad",init_kicad); // swigAddModule( "_kicad", init_kicad );
} }
/* Function swigSwitchPythonBuiltin /* Function swigSwitchPythonBuiltin
* switches python module table to our built one . * switches python module table to our built one .
* *
...@@ -120,6 +122,7 @@ static void swigSwitchPythonBuiltin() ...@@ -120,6 +122,7 @@ static void swigSwitchPythonBuiltin()
PyImport_Inittab = SwigImportInittab; PyImport_Inittab = SwigImportInittab;
} }
/* Function pcbnewInitPythonScripting /* Function pcbnewInitPythonScripting
* Initializes all the python environment and publish our interface inside it * Initializes all the python environment and publish our interface inside it
* initializes all the wxpython interface, and returns the python thread control structure * initializes all the wxpython interface, and returns the python thread control structure
...@@ -142,9 +145,9 @@ bool pcbnewInitPythonScripting() ...@@ -142,9 +145,9 @@ bool pcbnewInitPythonScripting()
// Load the wxPython core API. Imports the wx._core_ module and sets a // Load the wxPython core API. Imports the wx._core_ module and sets a
// local pointer to a function table located there. The pointer is used // local pointer to a function table located there. The pointer is used
// internally by the rest of the API functions. // internally by the rest of the API functions.
if( ! wxPyCoreAPI_IMPORT() ) if( !wxPyCoreAPI_IMPORT() )
{ {
wxLogError(wxT("***** Error importing the wxPython API! *****")); wxLogError( wxT( "***** Error importing the wxPython API! *****" ) );
PyErr_Print(); PyErr_Print();
Py_Finalize(); Py_Finalize();
return false; return false;
...@@ -160,7 +163,7 @@ bool pcbnewInitPythonScripting() ...@@ -160,7 +163,7 @@ bool pcbnewInitPythonScripting()
#endif #endif
{ {
PyLOCK lock; PyLOCK lock;
PyRun_SimpleString( "import sys\n" PyRun_SimpleString( "import sys\n"
"sys.path.append(\".\")\n" "sys.path.append(\".\")\n"
...@@ -172,10 +175,11 @@ bool pcbnewInitPythonScripting() ...@@ -172,10 +175,11 @@ bool pcbnewInitPythonScripting()
return true; return true;
} }
void pcbnewFinishPythonScripting() void pcbnewFinishPythonScripting()
{ {
#ifdef KICAD_SCRIPTING_WXPYTHON #ifdef KICAD_SCRIPTING_WXPYTHON
wxPyEndAllowThreads(g_PythonMainTState); wxPyEndAllowThreads( g_PythonMainTState );
#endif #endif
Py_Finalize(); Py_Finalize();
} }
...@@ -189,54 +193,55 @@ void RedirectStdio() ...@@ -189,54 +193,55 @@ void RedirectStdio()
// redirects Python's stdout and stderr to a window that will popup // redirects Python's stdout and stderr to a window that will popup
// only on demand when something is printed, like a traceback. // only on demand when something is printed, like a traceback.
const char* python_redirect = const char* python_redirect =
"import sys\n\ "import sys\n"
import wx\n\ "import wx\n"
output = wx.PyOnDemandOutputWindow()\n\ "output = wx.PyOnDemandOutputWindow()\n"
c sys.stderr = output\n"; "sys.stderr = output\n";
PyLOCK lock;
PyLOCK lock;
PyRun_SimpleString( python_redirect ); PyRun_SimpleString( python_redirect );
} }
wxWindow* CreatePythonShellWindow(wxWindow* parent) wxWindow* CreatePythonShellWindow( wxWindow* parent )
{ {
const char* pycrust_panel =
const char* pycrust_panel = "\ "import wx\n"
import wx\n\ "from wx.py import shell, version\n"
from wx.py import shell, version\n\ "\n"
\n\ "class PyCrustPanel(wx.Panel):\n"
class PyCrustPanel(wx.Panel):\n\ "\tdef __init__(self, parent):\n"
\tdef __init__(self, parent):\n\ "\t\twx.Panel.__init__(self, parent, -1, style=wx.SUNKEN_BORDER)\n"
\t\twx.Panel.__init__(self, parent, -1, style=wx.SUNKEN_BORDER)\n\ "\t\t\n"
\t\t\n\ "\t\t\n"
\t\t\n\ "\t\tintro = \"Welcome To PyCrust %s - KiCAD Python Shell\" % version.VERSION\n"
\t\tintro = \"Welcome To PyCrust %s - KiCAD Python Shell\" % version.VERSION\n\ "\t\tpycrust = shell.Shell(self, -1, introText=intro)\n"
\t\tpycrust = shell.Shell(self, -1, introText=intro)\n\ "\t\t\n"
\t\t\n\ "\t\tsizer = wx.BoxSizer(wx.VERTICAL)\n\n"
\t\tsizer = wx.BoxSizer(wx.VERTICAL)\n\n\ "\t\tsizer.Add(pycrust, 1, wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, 10)\n\n"
\t\tsizer.Add(pycrust, 1, wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, 10)\n\n\ "\t\tself.SetSizer(sizer)\n\n"
\t\tself.SetSizer(sizer)\n\n\ "\n"
\n\ "def makeWindow(parent):\n"
def makeWindow(parent):\n\ " win = PyCrustPanel(parent)\n"
win = PyCrustPanel(parent)\n\ " return win\n"
return win\n\ "\n";
";
wxWindow* window = NULL;
wxWindow* window = NULL; PyObject* result;
PyObject* result;
// As always, first grab the GIL // As always, first grab the GIL
PyLOCK lock; PyLOCK lock;
// Now make a dictionary to serve as the global namespace when the code is // Now make a dictionary to serve as the global namespace when the code is
// executed. Put a reference to the builtins module in it. // executed. Put a reference to the builtins module in it.
PyObject* globals = PyDict_New(); PyObject* globals = PyDict_New();
PyObject* builtins = PyImport_ImportModule( "__builtin__" ); PyObject* builtins = PyImport_ImportModule( "__builtin__" );
PyDict_SetItemString( globals, "__builtins__", builtins ); PyDict_SetItemString( globals, "__builtins__", builtins );
Py_DECREF(builtins); Py_DECREF( builtins );
// Execute the code to make the makeWindow function we defined above // Execute the code to make the makeWindow function we defined above
result = PyRun_String( pycrust_panel, Py_file_input, globals, globals ); result = PyRun_String( pycrust_panel, Py_file_input, globals, globals );
...@@ -247,7 +252,8 @@ def makeWindow(parent):\n\ ...@@ -247,7 +252,8 @@ def makeWindow(parent):\n\
PyErr_Print(); PyErr_Print();
return NULL; return NULL;
} }
Py_DECREF(result);
Py_DECREF( result );
// Now there should be an object named 'makeWindow' in the dictionary that // Now there should be an object named 'makeWindow' in the dictionary that
// we can grab a pointer to: // we can grab a pointer to:
...@@ -258,10 +264,10 @@ def makeWindow(parent):\n\ ...@@ -258,10 +264,10 @@ def makeWindow(parent):\n\
// use of another wxPython API to take a wxWindows object and build a // use of another wxPython API to take a wxWindows object and build a
// wxPython object that wraps it. // wxPython object that wraps it.
PyObject* arg = wxPyMake_wxObject( parent, false ); PyObject* arg = wxPyMake_wxObject( parent, false );
wxASSERT( arg != NULL ); wxASSERT( arg != NULL );
PyObject* tuple = PyTuple_New( 1 ); PyObject* tuple = PyTuple_New( 1 );
PyTuple_SET_ITEM( tuple, 0, arg ); PyTuple_SET_ITEM( tuple, 0, arg );
result = PyEval_CallObject( func, tuple ); result = PyEval_CallObject( func, tuple );
...@@ -273,11 +279,11 @@ def makeWindow(parent):\n\ ...@@ -273,11 +279,11 @@ def makeWindow(parent):\n\
{ {
// Otherwise, get the returned window out of Python-land and // Otherwise, get the returned window out of Python-land and
// into C++-ville... // into C++-ville...
bool success = wxPyConvertSwigPtr(result, (void**)&window, _T("wxWindow") ); bool success = wxPyConvertSwigPtr( result, (void**) &window, _T( "wxWindow" ) );
(void)success; (void) success;
wxASSERT_MSG(success, _T("Returned object was not a wxWindow!") ); wxASSERT_MSG( success, _T( "Returned object was not a wxWindow!" ) );
Py_DECREF(result); Py_DECREF( result );
} }
// Release the python objects we still have // Release the python objects we still have
...@@ -286,4 +292,6 @@ def makeWindow(parent):\n\ ...@@ -286,4 +292,6 @@ def makeWindow(parent):\n\
return window; return window;
} }
#endif #endif
scripting/python_scripting.h
View file @ 155ea57c
#ifndef __PYTHON_SCRIPTING_H #ifndef __PYTHON_SCRIPTING_H
#define __PYTHON_SCRIPTING_H #define __PYTHON_SCRIPTING_H
// undefs explained here: https://bugzilla.redhat.com/show_bug.cgi?id=427617 // undefs explained here: https://bugzilla.redhat.com/show_bug.cgi?id=427617
#ifdef _POSIX_C_SOURCE #ifdef _POSIX_C_SOURCE
#undef _POSIX_C_SOURCE #undef _POSIX_C_SOURCE
...@@ -21,19 +21,18 @@ ...@@ -21,19 +21,18 @@
* Initializes the Python engine inside pcbnew * Initializes the Python engine inside pcbnew
*/ */
bool pcbnewInitPythonScripting(); bool pcbnewInitPythonScripting();
void pcbnewFinishPythonScripting(); void pcbnewFinishPythonScripting();
#ifdef KICAD_SCRIPTING_WXPYTHON #ifdef KICAD_SCRIPTING_WXPYTHON
void RedirectStdio(); void RedirectStdio();
wxWindow* CreatePythonShellWindow( wxWindow* parent ); wxWindow* CreatePythonShellWindow( wxWindow* parent );
class PyLOCK class PyLOCK
{ {
wxPyBlock_t b; wxPyBlock_t b;
public: public:
// @todo, find out why these are wxPython specific. We need the GIL regardless. // @todo, find out why these are wxPython specific. We need the GIL regardless.
...@@ -46,13 +45,12 @@ public: ...@@ -46,13 +45,12 @@ public:
#else #else
class PyLOCK class PyLOCK
{ {
PyGILState_STATE gil_state; PyGILState_STATE gil_state;
public: public:
PyLOCK() { gil_state = PyGILState_Ensure(); } PyLOCK() { gil_state = PyGILState_Ensure(); }
~PyLOCK() { PyGILState_Release( gil_state ); } ~PyLOCK() { PyGILState_Release( gil_state ); }
}; };
#endif #endif
#endif // __PYTHON_SCRIPTING_H #endif // __PYTHON_SCRIPTING_H
scripting/wx_python_helpers.cpp
View file @ 155ea57c
...@@ -65,8 +65,8 @@ wxString* newWxStringFromPy( PyObject* src ) ...@@ -65,8 +65,8 @@ wxString* newWxStringFromPy( PyObject* src )
{ {
bool must_unref_str = false; bool must_unref_str = false;
wxString* result = NULL; wxString* result = NULL;
PyObject* obj = src; PyObject* obj = src;
#if wxUSE_UNICODE #if wxUSE_UNICODE
bool must_unref_obj = false; bool must_unref_obj = false;
...@@ -111,14 +111,14 @@ wxString* newWxStringFromPy( PyObject* src ) ...@@ -111,14 +111,14 @@ wxString* newWxStringFromPy( PyObject* src )
// normal string (or object) to normal python string // normal string (or object) to normal python string
PyObject* str = src; PyObject* str = src;
if( PyUnicode_Check( src ) ) // if it's unicode convert to normal string if( PyUnicode_Check( src ) ) // if it's unicode convert to normal string
{ {
str = PyUnicode_AsEncodedString( src, wxPythonEncoding, "strict" ); str = PyUnicode_AsEncodedString( src, wxPythonEncoding, "strict" );
if( PyErr_Occurred() ) if( PyErr_Occurred() )
return NULL; return NULL;
} }
else if( !PyString_Check( src ) ) // if it's not a string, str(obj) else if( !PyString_Check( src ) ) // if it's not a string, str(obj)
{ {
str = PyObject_Str( src ); str = PyObject_Str( src );
must_unref_str = true; must_unref_str = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment