LOCALE_IO toggle implementation for locale switches on scripting; code cleanups to comply with kicad coding style policy

pcbnew/class_footprint_wizard.cpp

@@ -36,12 +36,8 @@ void FOOTPRINT_WIZARD::register_wizard()
     FOOTPRINT_WIZARDS::register_wizard( this );
 }
 
-/**
- * FOOTPRINT_WIZARD system wide static list
- */
 std::vector<FOOTPRINT_WIZARD*>  FOOTPRINT_WIZARDS::m_FootprintWizards;
 
-
 FOOTPRINT_WIZARD* FOOTPRINT_WIZARDS::GetWizard( int aIndex )
 {
     return m_FootprintWizards[aIndex];

pcbnew/class_footprint_wizard.h

@@ -134,6 +134,9 @@ public:
 class FOOTPRINT_WIZARDS
 {
 private:
+    /**
+    * FOOTPRINT_WIZARD system wide static list
+    */
     static    std::vector<FOOTPRINT_WIZARD*>  m_FootprintWizards;
 
 public:

pcbnew/footprint_wizard.cpp

@@ -38,7 +38,10 @@ void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )
 
     case ID_FOOTPRINT_WIZARD_PREVIOUS:
         page = m_PageList->GetSelection() - 1;
-        if (page<0) page=0;
+
+        if( page<0 )
+            page = 0;
+
         m_PageList->SetSelection( page, true );
         break;
 
@@ -50,6 +53,7 @@ void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )
     }
 }
 
+
 /* Function OnLeftClick
  * Captures a left click event in the dialog
  *
@@ -58,6 +62,7 @@ void FOOTPRINT_WIZARD_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
 {
 }
 
+
 /* Function OnRightClick
  * Captures a right click event in the dialog
  *
@@ -86,6 +91,7 @@ void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos()
     SetTitle( msg );
 }
 
+
 void FOOTPRINT_WIZARD_FRAME::ReloadFootprint()
 {
     if( m_FootprintWizard == NULL )
@@ -95,6 +101,7 @@ void FOOTPRINT_WIZARD_FRAME::ReloadFootprint()
     // Delete the current footprint
     GetBoard()->m_Modules.DeleteAll();
     MODULE* m = m_FootprintWizard->GetModule();
+
     if( m )
     {
         /* Here we should make a copy of the object before adding to board*/
@@ -107,9 +114,11 @@ void FOOTPRINT_WIZARD_FRAME::ReloadFootprint()
     {
         printf( "m_FootprintWizard->GetModule() returns NULL\n" );
     }
+
     m_canvas->Refresh();
 }
 
+
 MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint()
 {
     if( m_FootprintWizard )
@@ -122,6 +131,7 @@ MODULE* FOOTPRINT_WIZARD_FRAME::GetBuiltFootprint()
     }
 }
 
+
 void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard()
 {
     DIALOG_FOOTPRINT_WIZARD_LIST* selectWizard =
@@ -142,23 +152,21 @@ void FOOTPRINT_WIZARD_FRAME::SelectFootprintWizard()
     DisplayWizardInfos();
     ReCreatePageList();
     ReCreateParameterList();
-
 }
 
+
 void FOOTPRINT_WIZARD_FRAME::SelectCurrentWizard( wxCommandEvent& event )
 {
-    
     SelectFootprintWizard();
-    
 }
 
+
 /**
  * Function SelectCurrentFootprint
  * Selects the current footprint name and display it
  */
 void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
 {
-    
     int page = m_PageList->GetSelection();
 
     if( page<0 )
@@ -176,21 +184,23 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
         // unit convert it back from the user format
         if( ptList[i]==wxT( "IU" ) )
         {
+            LOCALE_IO toggle;
             double dValue;
+
             value.ToDouble( &dValue );
 
             // convert from mils to inches where it's needed
-            if (g_UserUnit==INCHES)  dValue = dValue / 1000.0; 
+            if( g_UserUnit==INCHES )
+                dValue = dValue / 1000.0;
+
             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
         // to be scripting compatible
 
-        value.Replace( wxT( "," ), wxT( "." ) );
 
         arr.Add( value );
     }
@@ -199,7 +209,6 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
 
     ReloadFootprint();
     DisplayWizardInfos();
-    
 }
 
 

pcbnew/footprint_wizard_frame.cpp

@@ -79,7 +79,8 @@ BEGIN_EVENT_TABLE( FOOTPRINT_WIZARD_FRAME, EDA_DRAW_FRAME )
 
     /* listbox events */
     EVT_LISTBOX( ID_FOOTPRINT_WIZARD_PAGE_LIST, FOOTPRINT_WIZARD_FRAME::ClickOnPageList )
-    EVT_GRID_CMD_CELL_CHANGE( ID_FOOTPRINT_WIZARD_PARAMETER_LIST, FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
+    EVT_GRID_CMD_CELL_CHANGE( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
+                              FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
 
     EVT_MENU( ID_SET_RELATIVE_OFFSET, FOOTPRINT_WIZARD_FRAME::OnSetRelativeOffset )
 END_EVENT_TABLE()
@@ -203,7 +204,6 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent,
     m_ParameterGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
 
 
-
     ReCreatePageList();
 
     DisplayWizardInfos();
@@ -259,6 +259,7 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent,
         wxAuiPaneInfo& pane = m_auimgr.GetPane( m_PageListWindow );
         pane.MinSize( wxSize( m_PageListSize.x, -1 ) );
     }
+
     wxAuiPaneInfo& pane = m_auimgr.GetPane( m_ParameterGridWindow );
     pane.MinSize( wxSize( m_ParameterGridSize.x, -1 ) );
 
@@ -292,12 +293,13 @@ FOOTPRINT_WIZARD_FRAME::~FOOTPRINT_WIZARD_FRAME()
 void FOOTPRINT_WIZARD_FRAME::OnCloseWindow( wxCloseEvent& Event )
 {
     wxCommandEvent fakeEvent;
+
     ExportSelectedFootprint( fakeEvent );
 }
 
+
 void FOOTPRINT_WIZARD_FRAME::ExportSelectedFootprint( wxCommandEvent& aEvent )
 {
-
     SaveSettings();
 
     if( m_Semaphore )
@@ -311,8 +313,6 @@ void FOOTPRINT_WIZARD_FRAME::ExportSelectedFootprint( wxCommandEvent& aEvent )
     {
         Destroy();
     }
-
-
 }
 
 
@@ -330,6 +330,7 @@ void FOOTPRINT_WIZARD_FRAME::OnSashDrag( wxSashEvent& event )
     switch( event.GetId() )
     {
     case ID_FOOTPRINT_WIZARD_WINDOW:
+
         if( m_PageListWindow )
         {
             wxAuiPaneInfo& pane = m_auimgr.GetPane( m_PageListWindow );
@@ -337,6 +338,7 @@ void FOOTPRINT_WIZARD_FRAME::OnSashDrag( wxSashEvent& event )
             pane.MinSize( m_PageListSize );
             m_auimgr.Update();
         }
+
         break;
 
     case ID_FOOTPRINT_WIZARD_PARAMETERS_WINDOW:
@@ -363,6 +365,7 @@ void FOOTPRINT_WIZARD_FRAME::OnSize( wxSizeEvent& SizeEv )
     SizeEv.Skip();
 }
 
+
 /* Function OnSetRelativeOffset
  * Updates the cursor position and the status bar
  *
@@ -373,6 +376,7 @@ void FOOTPRINT_WIZARD_FRAME::OnSetRelativeOffset( wxCommandEvent& event )
     UpdateStatusBar();
 }
 
+
 /* Function ReCreatePageList
  * It recreates the list of pages for a new loaded wizard
  *
@@ -387,6 +391,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreatePageList()
 
     m_PageList->Clear();
     int max_page = m_FootprintWizard->GetNumParameterPages();
+
     for( int i = 0; i<max_page; i++ )
     {
         wxString name = m_FootprintWizard->GetParameterPageName( i );
@@ -401,6 +406,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreatePageList()
     m_canvas->Refresh();
 }
 
+
 /* Function ReCreateParameterList
  * It creates the parameter grid for a certain wizard page of the current wizard
  *
@@ -449,9 +455,12 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
 
         if( ptList[i]==wxT( "IU" ) )
         {
+            LOCALE_IO toggle;
+
             // We are handling internal units, so convert them to the current
             // system selected units and store into value.
             double dValue;
+
             value.ToDouble( &dValue );
 
             dValue = To_User_Unit( g_UserUnit, dValue );
@@ -467,7 +476,6 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
             }
 
             value.Printf( wxT( "%lf" ), dValue );
-            value.Replace( wxT( "," ), wxT( "." ) );
         }
         else if( ptList[i]==wxT( "UNITS" ) )    // 1,2,3,4,5 ... N
         {
@@ -480,7 +488,6 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
     }
 
     m_ParameterGrid->AutoSizeColumns();
-
 }
 
 
@@ -497,7 +504,6 @@ void FOOTPRINT_WIZARD_FRAME::ClickOnPageList( wxCommandEvent& event )
 }
 
 
-
 #define PARTLIST_WIDTH_KEY  wxT( "Partlist_width" )
 #define PARAMLIST_WIDTH_KEY wxT( "Paramlist_width" )
 
@@ -509,6 +515,7 @@ void FOOTPRINT_WIZARD_FRAME::LoadSettings( )
     EDA_DRAW_FRAME::LoadSettings();
 
     wxConfigPathChanger cpc( wxGetApp().GetSettings(), m_configPath );
+
     cfg = wxGetApp().GetSettings();
 
     m_PageListSize.x = 150;         // default width of libs list
@@ -523,7 +530,6 @@ void FOOTPRINT_WIZARD_FRAME::LoadSettings( )
 
     if( m_ParameterGridSize.x > m_FrameSize.x / 2 )
         m_ParameterGridSize.x = m_FrameSize.x / 2;
-
 }
 
 
@@ -534,6 +540,7 @@ void FOOTPRINT_WIZARD_FRAME::SaveSettings()
     EDA_DRAW_FRAME::SaveSettings();
 
     wxConfigPathChanger cpc( wxGetApp().GetSettings(), m_configPath );
+
     cfg = wxGetApp().GetSettings();
 
     if( m_PageListSize.x )
@@ -552,12 +559,12 @@ void FOOTPRINT_WIZARD_FRAME::OnActivate( wxActivateEvent& event )
         return;
 
     bool footprintWizardsChanged = false;
+
     if( footprintWizardsChanged )
     {
         // If we are here, the library list has changed, rebuild it
         ReCreatePageList();
         DisplayWizardInfos();
-
     }
 }
 
@@ -570,6 +577,7 @@ void FOOTPRINT_WIZARD_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPosition
     wxPoint         pos     = aPosition;
 
     wxCommandEvent  cmd( wxEVT_COMMAND_MENU_SELECTED );
+
     cmd.SetEventObject( this );
 
     pos = screen->GetNearestGridPosition( pos );
@@ -675,6 +683,7 @@ void FOOTPRINT_WIZARD_FRAME::Show3D_Frame( wxCommandEvent& event )
     m_Draw3DFrame->Show( true );
 }
 
+
 /**
  * Function Update3D_Frame
  * must be called after a footprint selection
@@ -692,6 +701,7 @@ void FOOTPRINT_WIZARD_FRAME::Update3D_Frame( bool aForceReloadFootprint )
     if( aForceReloadFootprint )
     {
         m_Draw3DFrame->ReloadRequest();
+
         // Force 3D screen refresh immediately
         if( GetBoard()->m_Modules )
             m_Draw3DFrame->NewDisplay();
@@ -747,6 +757,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateHToolbar()
                              HK_ZOOM_AUTO, IS_COMMENT );
         m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString,
                                 KiBitmap( zoom_fit_in_page_xpm ), msg );
+
         if( m_Semaphore )
         {
             // The library browser is called from a "load component" command
@@ -767,5 +778,4 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateHToolbar()
 
 void FOOTPRINT_WIZARD_FRAME::ReCreateVToolbar()
 {
-
 }

pcbnew/footprint_wizard_frame.h

@@ -62,12 +62,10 @@ private:
     wxString            m_configPath;       // < subpath for configuration
 
     FOOTPRINT_WIZARD*   m_FootprintWizard;
-
 protected:
     wxString            m_wizardName;           // < name of the current wizard
     wxString            m_wizardDescription;    // < description of the wizard
     wxString            m_wizardStatus;         // < current wizard status
-
 public:
     FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME*   parent,
                             wxSemaphore*            semaphore = NULL,
@@ -80,6 +78,7 @@ public:
 private:
 
     void            OnSize( wxSizeEvent& event );
+
     /**
      * Function ExportSelectedFootprint();
      * will let the caller exit from the wait loop, and get the built footprint
@@ -170,7 +169,6 @@ private:
     void            ParametersUpdated( wxGridEvent& event );
 
 
-
     bool            OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
 
     /**

pcbnew/scripting/pcbnew_footprint_wizards.cpp

@@ -29,7 +29,6 @@
 
 #include "pcbnew_footprint_wizards.h"
 #include <python_scripting.h>
-
 #include <stdio.h>
 
 
@@ -73,8 +72,8 @@ PyObject* PYTHON_FOOTPRINT_WIZARD::CallMethod( const char* aMethod, PyObject* aA
                                  "Exception: %s\n"
                                  "         : %s\n" ),
                             aMethod,
-                             PyString_AsString( PyObject_Str( v ) ),
+                            FROM_UTF8( PyString_AsString( PyObject_Str( v ) ) ),
-                             PyString_AsString( PyObject_Str( b ) )
+                            FROM_UTF8( PyString_AsString( PyObject_Str( b ) ) )
                             );
 
             wxMessageBox( message,
@@ -106,18 +105,20 @@ wxString PYTHON_FOOTPRINT_WIZARD::CallRetStrMethod( const char* aMethod, PyObjec
     PyLOCK      lock;
 
     PyObject*   result = CallMethod( aMethod, aArglist );
+
     if( result )
     {
         const char* str_res = PyString_AsString( result );
-         ret  = wxString::FromUTF8( str_res );
+        ret = FROM_UTF8( str_res );
         Py_DECREF( result );
     }
+
     return ret;
 }
 
 
-wxArrayString PYTHON_FOOTPRINT_WIZARD::CallRetArrayStrMethod
+wxArrayString PYTHON_FOOTPRINT_WIZARD::CallRetArrayStrMethod( const char*   aMethod,
-                        ( const char* aMethod, PyObject* aArglist )
+                                                              PyObject*     aArglist )
 {
     wxArrayString   ret;
     wxString        str_item;
@@ -130,7 +131,9 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::CallRetArrayStrMethod
         if( !PyList_Check( result ) )
         {
             Py_DECREF( result );
-             ret.Add( wxT( "PYTHON_FOOTPRINT_WIZARD::CallRetArrayStrMethod, result is not a list" ), 1 );
+            ret.Add( wxT(
+                         "PYTHON_FOOTPRINT_WIZARD::CallRetArrayStrMethod, result is not a list" ),
+                     1 );
             return ret;
         }
 
@@ -142,7 +145,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::CallRetArrayStrMethod
 
             const char* str_res = PyString_AsString( element );
 
-            str_item  = wxString::FromUTF8( str_res );
+            str_item = FROM_UTF8( str_res );
             ret.Add( str_item, 1 );
         }
 
@@ -212,9 +215,10 @@ wxString PYTHON_FOOTPRINT_WIZARD::GetParameterPageName( int aPage )
     if( result )
     {
         const char* str_res = PyString_AsString( result );
-         ret  = wxString::FromUTF8( str_res );
+        ret = FROM_UTF8( str_res );
         Py_DECREF( result );
     }
+
     return ret;
 }
 
@@ -225,6 +229,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterNames( int aPage )
     PyLOCK          lock;
 
     PyObject*       arglist = Py_BuildValue( "(i)", aPage );
+
     ret = CallRetArrayStrMethod( "GetParameterNames", arglist );
     Py_DECREF( arglist );
 
@@ -232,6 +237,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterNames( int aPage )
     {
         wxString    rest;
         wxString    item = ret[i];
+
         if( item.StartsWith( wxT( "*" ), &rest ) )
         {
             ret[i] = rest;
@@ -248,6 +254,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterTypes( int aPage )
     PyLOCK          lock;
 
     PyObject*       arglist = Py_BuildValue( "(i)", aPage );
+
     ret = CallRetArrayStrMethod( "GetParameterNames", arglist );
     Py_DECREF( arglist );
 
@@ -255,6 +262,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterTypes( int aPage )
     {
         wxString    rest;
         wxString    item = ret[i];
+
         if( item.StartsWith( wxT( "*" ), &rest ) )
         {
             ret[i] = wxT( "UNITS" );    // units
@@ -282,6 +290,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterValues( int aPage )
     return ret;
 }
 
+
 wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterErrors( int aPage )
 {
     PyLOCK          lock;
@@ -289,6 +298,7 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterErrors( int aPage )
     PyObject*       arglist = Py_BuildValue( "(i)", aPage );
 
     wxArrayString   ret = CallRetArrayStrMethod( "GetParameterErrors", arglist );
+
     Py_DECREF( arglist );
 
     return ret;
@@ -336,16 +346,7 @@ MODULE* PYTHON_FOOTPRINT_WIZARD::GetModule()
     PyObject* obj = PyObject_GetAttrString( result, "this" );
 
     if( PyErr_Occurred() )
-    {
-        /*
-        PyObject *t, *v, *b;
-        PyErr_Fetch( &t, &v, &b );
-        printf ( "calling GetModule()\n" );
-        printf ( "Exception: %s\n",PyString_AsString( PyObject_Str( v ) ) );
-        printf ( "         : %s\n",PyString_AsString( PyObject_Str( b ) ) );
-        */
         PyErr_Print();
-    }
 
     MODULE* mod = PyModule_to_MODULE( obj );
 
@@ -357,26 +358,5 @@ void PYTHON_FOOTPRINT_WIZARDS::register_wizard( PyObject* aPyWizard )
 {
     PYTHON_FOOTPRINT_WIZARD* fw = new PYTHON_FOOTPRINT_WIZARD( aPyWizard );
 
-
-    //printf( "Registered python footprint wizard '%s'\n",
-    //        ( const char* )fw->GetName().mb_str()
-    //       );
-
-    // this get the wizard registered in the common
-    // FOOTPRINT_WIZARDS class
-
     fw->register_wizard();
-
-#if 0
-    // just to test if it works correctly
-    int pages = fw->GetNumParameterPages();
-    printf( "             %d pages\n",pages );
-
-    for ( int n=0; n<pages; n++ )
-    {
-        printf( "                      page %d->'%s'\n",n,
-            ( const char* )fw->GetParameterPageName( n ).mb_str() );
-    }
-#endif
-
 }

pcbnew/scripting/pcbnew_footprint_wizards.h

@@ -34,10 +34,8 @@
 #include <class_footprint_wizard.h>
 
 
-
 class PYTHON_FOOTPRINT_WIZARD : public FOOTPRINT_WIZARD
 {
-
     PyObject* m_PyWizard;
     PyObject*       CallMethod( const char* aMethod, PyObject* aArglist = NULL );
     wxString        CallRetStrMethod( const char* aMethod, PyObject* aArglist = NULL );
@@ -65,8 +63,6 @@ class PYTHON_FOOTPRINT_WIZARDS
 {
 public:
     static void register_wizard( PyObject* aPyWizard );
-
 };
 
 #endif /* PCBNEW_FOOTPRINT_WIZARDS_H */
-

pcbnew/scripting/pcbnew_scripting_helpers.cpp

@@ -45,17 +45,19 @@ BOARD *GetBoard()
 {
     if( PcbEditFrame )
         return PcbEditFrame->GetBoard();
-	else return NULL;
+    else
+        return NULL;
 }
 
+
 void ScriptingSetPcbEditFrame( PCB_EDIT_FRAME* aPCBEdaFrame )
 {
     PcbEditFrame = aPCBEdaFrame;
 }
 
+
 BOARD* LoadBoard( wxString& aFileName )
 {
-
     if( aFileName.EndsWith( wxT( ".kicad_pcb" ) ) )
         return LoadBoard( aFileName, IO_MGR::KICAD );
 
@@ -64,19 +66,21 @@ BOARD* LoadBoard( wxString& aFileName )
 
     // as fall back for any other kind use the legacy format
     return LoadBoard( aFileName, IO_MGR::LEGACY );
-
 }
 
+
 BOARD* LoadBoard( wxString& aFileName, IO_MGR::PCB_FILE_T aFormat )
 {
     return IO_MGR::Load( aFormat, aFileName );
 }
 
+
 bool SaveBoard( wxString& aFilename, BOARD* aBoard )
 {
     return SaveBoard( aFilename, aBoard, IO_MGR::KICAD );
 }
 
+
 bool SaveBoard( wxString& aFileName, BOARD* aBoard,
                 IO_MGR::PCB_FILE_T aFormat )
 {
@@ -97,10 +101,6 @@ bool SaveBoard( wxString& aFileName, BOARD* aBoard,
     }
 
 
-
     IO_MGR::Save( aFormat, aFileName, aBoard, &props );
     return true;
-
 }
-
-

pcbnew/scripting/pcbnew_scripting_helpers.h

@@ -32,6 +32,7 @@
 
 #ifndef SWIG
 void    ScriptingSetPcbEditFrame( PCB_EDIT_FRAME* aPCBEdaFrame );
+
 #endif
 
 BOARD*  GetBoard();

scripting/python_scripting.cpp

@@ -86,6 +86,7 @@ static void swigAddBuiltin()
 
     /* copy all pre-existing python modules into our newly created table */
     i = 0;
+
     while( PyImport_Inittab[i].name )
     {
         swigAddModule( PyImport_Inittab[i].name, PyImport_Inittab[i].initfunc );
@@ -110,6 +111,7 @@ static void swigAddModules()
     // swigAddModule( "_kicad", init_kicad );
 }
 
+
 /* Function swigSwitchPythonBuiltin
  * switches python module table to our built one .
  *
@@ -120,6 +122,7 @@ static void swigSwitchPythonBuiltin()
     PyImport_Inittab = SwigImportInittab;
 }
 
+
 /* Function pcbnewInitPythonScripting
  * Initializes all the python environment and publish our interface inside it
  * initializes all the wxpython interface, and returns the python thread control structure
@@ -172,6 +175,7 @@ bool pcbnewInitPythonScripting()
     return true;
 }
 
+
 void pcbnewFinishPythonScripting()
 {
 #ifdef KICAD_SCRIPTING_WXPYTHON
@@ -189,39 +193,39 @@ void RedirectStdio()
     // redirects Python's stdout and stderr to a window that will popup
     // only on demand when something is printed, like a traceback.
     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;
+
     PyRun_SimpleString( python_redirect );
 }
 
 
 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;
@@ -235,6 +239,7 @@ def makeWindow(parent):\n\
 
     PyObject*   globals     = PyDict_New();
     PyObject*   builtins    = PyImport_ImportModule( "__builtin__" );
+
     PyDict_SetItemString( globals, "__builtins__", builtins );
     Py_DECREF( builtins );
 
@@ -247,6 +252,7 @@ def makeWindow(parent):\n\
         PyErr_Print();
         return NULL;
     }
+
     Py_DECREF( result );
 
     // Now there should be an object named 'makeWindow' in the dictionary that
@@ -286,4 +292,6 @@ def makeWindow(parent):\n\
 
     return window;
 }
+
+
 #endif

scripting/python_scripting.h

@@ -33,7 +33,6 @@ wxWindow* CreatePythonShellWindow( wxWindow* parent );
 class PyLOCK
 {
     wxPyBlock_t b;
-
 public:
 
     // @todo, find out why these are wxPython specific.  We need the GIL regardless.
@@ -47,7 +46,6 @@ public:
 class PyLOCK
 {
     PyGILState_STATE gil_state;
-
 public:
     PyLOCK()      { gil_state = PyGILState_Ensure(); }
     ~PyLOCK()     { PyGILState_Release( gil_state ); }