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

minor cleanup

This commit is contained in:
jean-pierre charras 2010-08-11 20:17:12 +02:00
parent f6962b6202 0980306f2a
commit 883d5b51c9
5 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/netform.cpp
View File

@ -335,8 +335,8 @@ wxString EXPORT_HELP::MakeCommandLine( const wxString& aFormatString,
wxFileName out = aFinalFile; wxFileName out = aFinalFile;
ret.Replace( wxT("%B"), out.GetName().GetData(), true ); ret.Replace( wxT("%B"), out.GetName().GetData(), true );
ret.Replace( wxT("%I"), in.GetFullName().GetData(), true ); ret.Replace( wxT("%I"), in.GetFullPath().GetData(), true );
ret.Replace( wxT("%O"), out.GetFullName().GetData(), true ); ret.Replace( wxT("%O"), out.GetFullPath().GetData(), true );
return ret; return ret;
} }
@ -398,6 +398,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
wxFileName tmpFile = aFullFileName; wxFileName tmpFile = aFullFileName;
tmpFile.SetExt( wxT( "tmp" ) ); tmpFile.SetExt( wxT( "tmp" ) );
D(printf("tmpFile:'%s'\n", CONV_TO_UTF8( tmpFile.GetFullPath() ) );)
ret = helper.WriteGENERICNetList( this, tmpFile.GetFullPath() ); ret = helper.WriteGENERICNetList( this, tmpFile.GetFullPath() );
if( !ret ) if( !ret )
break; break;
@ -415,6 +417,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
tmpFile.GetFullPath(), tmpFile.GetFullPath(),
aFullFileName ); aFullFileName );
D(printf("commandLine:'%s'\n", CONV_TO_UTF8( commandLine ) );)
ProcessExecute( commandLine, wxEXEC_SYNC ); ProcessExecute( commandLine, wxEXEC_SYNC );
// ::wxRemoveFile( tmpFile.GetFullPath() ); // ::wxRemoveFile( tmpFile.GetFullPath() );

36
eeschema/netlist_control.cpp
View File

@ -189,7 +189,9 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_SchematicFrame* parent ) :
SetSizer( GeneralBoxSizer ); SetSizer( GeneralBoxSizer );
m_NoteBook = new wxNotebook( this, ID_NETLIST_NOTEBOOK, m_NoteBook = new wxNotebook( this, ID_NETLIST_NOTEBOOK,
wxDefaultPosition, wxDefaultSize ); wxDefaultPosition, wxDefaultSize,
wxNB_TOP ); // @todo: tabs on top are being hidden on linux
GeneralBoxSizer->Add( m_NoteBook, 0, wxGROW | wxALL, 5 ); GeneralBoxSizer->Add( m_NoteBook, 0, wxGROW | wxALL, 5 );
// Add notebook pages: // Add notebook pages:
@ -227,8 +229,9 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_SchematicFrame* parent ) :
// Add custom panels: // Add custom panels:
InstallCustomPages(); InstallCustomPages();
GetSizer()->Fit( this ); // GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
} }
@ -443,8 +446,8 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
*/ */
{ {
wxFileName fn; wxFileName fn;
wxString FileWildcard, FileExt; wxString fileWildcard;
wxString msg, Command; wxString fileExt;
wxString title = _( "Save Netlist File" ); wxString title = _( "Save Netlist File" );
NetlistUpdateOpt(); NetlistUpdateOpt();
@ -458,30 +461,31 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
switch( CurrPage->m_IdNetType ) switch( CurrPage->m_IdNetType )
{ {
case NET_TYPE_SPICE: case NET_TYPE_SPICE:
FileExt = wxT( "cir" ); fileExt = wxT( "cir" );
FileWildcard = _( "SPICE netlist file (.cir)|*.cir" ); fileWildcard = _( "SPICE netlist file (.cir)|*.cir" );
break; break;
case NET_TYPE_CADSTAR: case NET_TYPE_CADSTAR:
FileExt = wxT( "frp" ); fileExt = wxT( "frp" );
FileWildcard = _( "CadStar netlist file (.frp)|*.frp" ); fileWildcard = _( "CadStar netlist file (.frp)|*.frp" );
break; break;
case NET_TYPE_PCBNEW: case NET_TYPE_PCBNEW:
FileExt = NetlistFileExtension; case NET_TYPE_ORCADPCB2:
FileWildcard = NetlistFileWildcard; fileExt = NetlistFileExtension;
fileWildcard = NetlistFileWildcard;
break; break;
default: // custom default: // custom, NET_TYPE_CUSTOM1 and greater
FileExt = wxT( "*" ); fileExt = wxEmptyString; // wxT( "" );
FileWildcard = AllFilesWildcard; fileWildcard = AllFilesWildcard;
title = _( "Generic Export" ); title.Printf( _( "%s Export" ), CurrPage->m_TitleStringCtrl->GetValue().GetData() );
} }
fn.SetExt( FileExt ); fn.SetExt( fileExt );
wxFileDialog dlg( this, title, fn.GetPath(), wxFileDialog dlg( this, title, fn.GetPath(),
fn.GetFullName(), FileWildcard, fn.GetFullName(), fileWildcard,
wxFD_SAVE ); wxFD_SAVE );
if( dlg.ShowModal() == wxID_CANCEL ) if( dlg.ShowModal() == wxID_CANCEL )

7
eeschema/plugins/netlist_form_pads-pcb.xsl
View File

@ -20,14 +20,15 @@
<!-- for each component --> <!-- for each component -->
<xsl:template match="comp"> <xsl:template match="comp">
<xsl:text> </xsl:text>
<xsl:value-of select="@ref"/> <xsl:value-of select="@ref"/>
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<xsl:choose> <xsl:choose>
<xsl:when test = "footprint = ''"> <xsl:when test = "footprint != '' ">
<xsl:text>unknown</xsl:text> <xsl:apply-templates select="footprint"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:apply-templates select="footprint"/> <xsl:text>unknown</xsl:text>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:text>&nl;</xsl:text> <xsl:text>&nl;</xsl:text>

12
pcbnew/automove.cpp
View File

@ -36,15 +36,12 @@ wxString ModulesMaskSelection = wxT( "*" );
void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event ) void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event )
{ {
int id = event.GetId(); int id = event.GetId();
wxPoint pos;
INSTALL_DC( dc, DrawPanel ); INSTALL_DC( dc, DrawPanel );
bool on_state; bool on_state;
if( m_HToolBar == NULL ) if( m_HToolBar == NULL )
return; return;
wxGetMousePosition( &pos.x, &pos.y );
switch( id ) switch( id )
{ {
case ID_TOOLBARH_PCB_AUTOPLACE: case ID_TOOLBARH_PCB_AUTOPLACE:
@ -172,12 +169,9 @@ void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event )
} }
/* Routine allocation of components in a rectangular format 4 / 3, /* Function to move components in a rectangular area format 4 / 3,
* Starting from the mouse cursor * starting from the mouse cursor
* The components with the FIXED status are not normally dives * The components with the FIXED status set are not moved
* According to the flags:
* All modules (not fixed) will be left
* Only PCB modules are not left
*/ */
void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb ) void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
{ {

8
pcbnew/tool_pcb.cpp
View File

@ -216,8 +216,12 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
#endif #endif
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( HELP_UNDO, s_Board_Editor_Hokeys_Descr,
HK_UNDO, false );
m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, wxBitmap( undo_xpm ), m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, wxBitmap( undo_xpm ),
HELP_UNDO ); HELP_UNDO );
msg = AddHotkeyName( HELP_REDO, s_Board_Editor_Hokeys_Descr,
HK_REDO, false );
m_HToolBar->AddTool( wxID_REDO, wxEmptyString, wxBitmap( redo_xpm ), m_HToolBar->AddTool( wxID_REDO, wxEmptyString, wxBitmap( redo_xpm ),
HELP_REDO ); HELP_REDO );
@ -272,11 +276,11 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOPLACE, wxEmptyString, m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOPLACE, wxEmptyString,
wxBitmap( mode_module_xpm ), wxBitmap( mode_module_xpm ),
_( "Manual and automatic move or place of modules" ), _( "Mode footprint: manual and automatic move and place modules" ),
wxITEM_CHECK ); wxITEM_CHECK );
m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOROUTE, wxEmptyString, m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOROUTE, wxEmptyString,
wxBitmap( mode_track_xpm ), wxBitmap( mode_track_xpm ),
_( "Mode Track and Autorouting" ), wxITEM_CHECK ); _( "Mode track: autorouting" ), wxITEM_CHECK );
// Fast call to FreeROUTE Web Bases router // Fast call to FreeROUTE Web Bases router
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();