haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cvpcb: minor fixes.

This commit is contained in:
jean-pierre charras 2015-01-13 09:33:17 +01:00
parent bf2f650eb9
commit 960ea566d6
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cvpcb/autosel.cpp
View File

@ -220,9 +220,12 @@ void CVPCB_MAINFRAME::AutomaticFootprintMatching( wxCommandEvent& event )
unsigned next = idx+1; unsigned next = idx+1;
unsigned previous = idx-1; unsigned previous = idx-1;
if( next < equiv_List.size() && previous >= 0 && if( next < equiv_List.size() &&
( equivItem.m_ComponentValue == equiv_List[next].m_ComponentValue || equivItem.m_ComponentValue == equiv_List[next].m_ComponentValue )
equivItem.m_ComponentValue == equiv_List[previous].m_ComponentValue ) ) equ_is_unique = false;
if( previous >= 0 &&
equivItem.m_ComponentValue == equiv_List[previous].m_ComponentValue )
equ_is_unique = false; equ_is_unique = false;
// If the equivalence is unique, no ambiguity: use the association // If the equivalence is unique, no ambiguity: use the association

2
cvpcb/dialogs/dialog_config_equfiles.cpp
View File

@ -277,7 +277,7 @@ void DIALOG_CONFIG_EQUFILES::OnAddFiles( wxCommandEvent& event )
else else
{ {
wxString msg; wxString msg;
msg.Printf( _( "File '%s'already in list" ), equFilename.GetData() ); msg.Printf( _( "File '%s' already exists in list" ), equFilename.GetData() );
DisplayError( this, msg ); DisplayError( this, msg );
} }
} }

2
cvpcb/dialogs/dialog_config_equfiles_base.cpp
View File

@ -17,7 +17,7 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWi
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbEquivChoiceSizer; 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; wxBoxSizer* bSizerFlist;
bSizerFlist = new wxBoxSizer( wxVERTICAL ); bSizerFlist = new wxBoxSizer( wxVERTICAL );

2
cvpcb/dialogs/dialog_config_equfiles_base.fbp
View File

@ -99,7 +99,7 @@
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1"> <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property> <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="minimum_size"></property>
<property name="name">sbEquivChoiceSizer</property> <property name="name">sbEquivChoiceSizer</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>