Commit 960ea566 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Cvpcb: minor fixes.

parent bf2f650e

cvpcb/autosel.cpp

+6 −3
Original line number Diff line number Diff line
@@ -220,9 +220,12 @@ void CVPCB_MAINFRAME::AutomaticFootprintMatching( wxCommandEvent& event ) 
            unsigned next = idx+1;

            unsigned previous = idx-1;



            if( next < equiv_List.size() && previous >= 0 &&

                ( equivItem.m_ComponentValue == equiv_List[next].m_ComponentValue ||

                equivItem.m_ComponentValue == equiv_List[previous].m_ComponentValue ) )

            if( next < equiv_List.size() &&

                equivItem.m_ComponentValue == equiv_List[next].m_ComponentValue )

                equ_is_unique = false;



            if( previous >= 0 &&

                equivItem.m_ComponentValue == equiv_List[previous].m_ComponentValue )

                equ_is_unique = false;



            // If the equivalence is unique, no ambiguity: use the association

cvpcb/dialogs/dialog_config_equfiles.cpp

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ void DIALOG_CONFIG_EQUFILES::OnAddFiles( wxCommandEvent& event ) 
        else

        {

            wxString msg;

            msg.Printf( _( "File '%s'already in list" ), equFilename.GetData() );

            msg.Printf( _( "File '%s' already exists in list" ), equFilename.GetData() );

            DisplayError( this, msg );

        }

    }

cvpcb/dialogs/dialog_config_equfiles_base.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWi 
	bMainSizer = new wxBoxSizer( wxVERTICAL );

	

	wxStaticBoxSizer* sbEquivChoiceSizer;

	sbEquivChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprint alias files (.equ files)") ), wxHORIZONTAL );

	sbEquivChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprint/Component equ files (.equ files)") ), wxHORIZONTAL );

	

	wxBoxSizer* bSizerFlist;

	bSizerFlist = new wxBoxSizer( wxVERTICAL );

cvpcb/dialogs/dialog_config_equfiles_base.fbp

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
                    <property name="proportion">1</property>

                    <object class="wxStaticBoxSizer" expanded="1">

                        <property name="id">wxID_ANY</property>

                        <property name="label">Footprint alias files (.equ files)</property>

                        <property name="label">Footprint/Component equ files (.equ files)</property>

                        <property name="minimum_size"></property>

                        <property name="name">sbEquivChoiceSizer</property>

                        <property name="orient">wxHORIZONTAL</property>