Commit 3a9f3f89 authored by Felix Morgner's avatar Felix Morgner
Browse files

merge with upstream

parents 6c2c6477 4a9681d5

common/drawframe.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent, 




EDA_DRAW_FRAME::~EDA_DRAW_FRAME()

EDA_DRAW_FRAME::~EDA_DRAW_FRAME()

{

{

    SAFE_DELETE( m_currentScreen );

    delete m_currentScreen;

    m_currentScreen = NULL;





    m_auimgr.UnInit();

    m_auimgr.UnInit();

}

}

cvpcb/autosel.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ void CVPCB_MAINFRAME::AssocieModule( wxCommandEvent& event ) 
        bool found = false;

        bool found = false;

        m_ListCmp->SetSelection( ii++, true );

        m_ListCmp->SetSelection( ii++, true );





        if( !component->GetFootprintLibName().IsEmpty() )

        if( !component->GetFootprintName().IsEmpty() )

            continue;

            continue;





        BOOST_FOREACH( FOOTPRINT_ALIAS& alias, aliases )

        BOOST_FOREACH( FOOTPRINT_ALIAS& alias, aliases )

cvpcb/cvframe.cpp

+7 −7
Original line number Original line Diff line number Diff line
@@ -344,7 +344,7 @@ void CVPCB_MAINFRAME::ToFirstNA( wxCommandEvent& event ) 




    for( unsigned jj = 0;  jj < m_netlist.GetCount();  jj++ )

    for( unsigned jj = 0;  jj < m_netlist.GetCount();  jj++ )

    {

    {

        if( m_netlist.GetComponent( jj )->GetFootprintLibName().IsEmpty() && ii > selection )

        if( m_netlist.GetComponent( jj )->GetFootprintName().IsEmpty() && ii > selection )

        {

        {

            m_ListCmp->SetSelection( ii );

            m_ListCmp->SetSelection( ii );

            SendMessageToEESCHEMA();

            SendMessageToEESCHEMA();
@@ -374,7 +374,7 @@ void CVPCB_MAINFRAME::ToPreviousNA( wxCommandEvent& event ) 




    for( unsigned kk = m_netlist.GetCount() - 1;  kk >= 0;  kk-- )

    for( unsigned kk = m_netlist.GetCount() - 1;  kk >= 0;  kk-- )

    {

    {

        if( m_netlist.GetComponent( kk )->GetFootprintLibName().IsEmpty() && ii < selection )

        if( m_netlist.GetComponent( kk )->GetFootprintName().IsEmpty() && ii < selection )

        {

        {

            m_ListCmp->SetSelection( ii );

            m_ListCmp->SetSelection( ii );

            SendMessageToEESCHEMA();

            SendMessageToEESCHEMA();
@@ -414,7 +414,7 @@ void CVPCB_MAINFRAME::DelAssociations( wxCommandEvent& event ) 




        for( unsigned i = 0;  i < m_netlist.GetCount();  i++ )

        for( unsigned i = 0;  i < m_netlist.GetCount();  i++ )

        {

        {

            m_netlist.GetComponent( i )->SetFootprintLibName( wxEmptyString );

            m_netlist.GetComponent( i )->SetFootprintName( wxEmptyString );

            SetNewPkg( wxEmptyString );

            SetNewPkg( wxEmptyString );

        }

        }
@@ -568,7 +568,7 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event ) 




    if( FindFocus() ==  m_ListCmp )

    if( FindFocus() ==  m_ListCmp )

    {

    {

        wxString module = m_netlist.GetComponent( selection )->GetFootprintLibName();

        wxString module = m_netlist.GetComponent( selection )->GetFootprintName();





        bool found = false;

        bool found = false;

        for( int ii = 0; ii < m_FootprintList->GetCount(); ii++ )

        for( int ii = 0; ii < m_FootprintList->GetCount(); ii++ )
@@ -788,8 +788,8 @@ int CVPCB_MAINFRAME::ReadSchematicNetlist() 
    // not the actual name of the footprint.

    // not the actual name of the footprint.

    for( unsigned ii = 0; ii < m_netlist.GetCount(); ii++ )

    for( unsigned ii = 0; ii < m_netlist.GetCount(); ii++ )

    {

    {

        if( m_netlist.GetComponent( ii )->GetFootprintLibName() == wxT( "$noname" ) )

        if( m_netlist.GetComponent( ii )->GetFootprintName() == wxT( "$noname" ) )

            m_netlist.GetComponent( ii )->SetFootprintLibName( wxEmptyString );

            m_netlist.GetComponent( ii )->SetFootprintName( wxEmptyString );

    }

    }





    // Sort components by reference:

    // Sort components by reference:
@@ -840,7 +840,7 @@ bool CVPCB_MAINFRAME::WriteComponentLinkFile( const wxString& aFullFileName ) 
        retval |= fprintf( outputFile, "Reference = %s;\n", TO_UTF8( component->GetReference() ) );

        retval |= fprintf( outputFile, "Reference = %s;\n", TO_UTF8( component->GetReference() ) );

        retval |= fprintf( outputFile, "ValeurCmp = %s;\n", TO_UTF8( component->GetValue() ) );

        retval |= fprintf( outputFile, "ValeurCmp = %s;\n", TO_UTF8( component->GetValue() ) );

        retval |= fprintf( outputFile, "IdModule  = %s;\n",

        retval |= fprintf( outputFile, "IdModule  = %s;\n",

                           TO_UTF8( component->GetFootprintLibName() ) );

                           TO_UTF8( component->GetFootprintName() ) );

        retval |= fprintf( outputFile, "EndCmp\n" );

        retval |= fprintf( outputFile, "EndCmp\n" );

    }

    }

cvpcb/listboxes.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ void CVPCB_MAINFRAME::BuildCmpListBox() 
        msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,

        msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,

                    GetChars( component->GetReference() ),

                    GetChars( component->GetReference() ),

                    GetChars( component->GetValue() ),

                    GetChars( component->GetValue() ),

                    GetChars( component->GetFootprintLibName() ) );

                    GetChars( component->GetFootprintName() ) );

        m_ListCmp->m_ComponentList.Add( msg );

        m_ListCmp->m_ComponentList.Add( msg );

    }

    }

cvpcb/readwrite_dlgs.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -71,16 +71,16 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName ) 




        // Check to see if the component has already a footprint set.

        // Check to see if the component has already a footprint set.





        hasFootprint = !(component->GetFootprintLibName().IsEmpty());

        hasFootprint = !(component->GetFootprintName().IsEmpty());





        component->SetFootprintLibName( aFootprintName );

        component->SetFootprintName( aFootprintName );





        // create the new component description

        // create the new component description





        description.Printf( CMP_FORMAT, componentIndex + 1,

        description.Printf( CMP_FORMAT, componentIndex + 1,

                            GetChars( component->GetReference() ),

                            GetChars( component->GetReference() ),

                            GetChars( component->GetValue() ),

                            GetChars( component->GetValue() ),

                            GetChars( component->GetFootprintLibName() ) );

                            GetChars( component->GetFootprintName() ) );





        // If the component hasn't had a footprint associated with it

        // If the component hasn't had a footprint associated with it

        // it now has, so we decrement the count of components without

        // it now has, so we decrement the count of components without
@@ -135,10 +135,10 @@ bool CVPCB_MAINFRAME::ReadNetListAndLinkFiles() 
        msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,

        msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,

                    GetChars( component->GetReference() ),

                    GetChars( component->GetReference() ),

                    GetChars( component->GetValue() ),

                    GetChars( component->GetValue() ),

                    GetChars( component->GetFootprintLibName() ) );

                    GetChars( component->GetFootprintName() ) );

        m_ListCmp->AppendLine( msg );

        m_ListCmp->AppendLine( msg );





        if( component->GetFootprintLibName().IsEmpty() )

        if( component->GetFootprintName().IsEmpty() )

            m_undefinedComponentCnt += 1;

            m_undefinedComponentCnt += 1;

    }

    }