Commit 155ea57c authored by Miguel Angel Ajo's avatar Miguel Angel Ajo
Browse files

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

pcbnew/class_footprint_wizard.cpp

+8 −12
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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

+62 −53
Original line number Diff line number Diff line
@@ -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

+105 −95
Original line number Diff line number Diff line
@@ -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

+47 −49
Original line number Diff line number Diff line
@@ -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 );



    /**