minor cleanup (883d5b51) · Commits · Elphel / kicad-source-mirror

eeschema/netform.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -335,8 +335,8 @@ wxString EXPORT_HELP::MakeCommandLine( const wxString& aFormatString,
		wxFileName out = aFinalFile;

		ret.Replace( wxT("%B"), out.GetName().GetData(), true );
		ret.Replace( wxT("%I"), in.GetFullName().GetData(), true );
		ret.Replace( wxT("%O"), out.GetFullName().GetData(), true );
		ret.Replace( wxT("%I"), in.GetFullPath().GetData(), true );
		ret.Replace( wxT("%O"), out.GetFullPath().GetData(), true );

		return ret;
		}
		@@ -398,6 +398,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
		wxFileName tmpFile = aFullFileName;
		tmpFile.SetExt( wxT( "tmp" ) );

		D(printf("tmpFile:'%s'\n", CONV_TO_UTF8( tmpFile.GetFullPath() ) );)

		ret = helper.WriteGENERICNetList( this, tmpFile.GetFullPath() );
		if( !ret )
		break;
		@@ -415,6 +417,8 @@ bool WinEDA_SchematicFrame::WriteNetListFile( int aFormat, const wxString& aFull
		tmpFile.GetFullPath(),
		aFullFileName );

		D(printf("commandLine:'%s'\n", CONV_TO_UTF8( commandLine ) );)

		ProcessExecute( commandLine, wxEXEC_SYNC );

		// ::wxRemoveFile( tmpFile.GetFullPath() );

eeschema/netlist_control.cpp

+22 −18

Original line number	Diff line number	Diff line
		@@ -189,7 +189,9 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_SchematicFrame* parent ) :
		SetSizer( GeneralBoxSizer );

		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 );

		// Add notebook pages:
		@@ -227,8 +229,9 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_SchematicFrame* parent ) :
		// Add custom panels:
		InstallCustomPages();

		GetSizer()->Fit( this );
		// GetSizer()->Fit( this );
		GetSizer()->SetSizeHints( this );

		Centre();
		}

		@@ -443,8 +446,8 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
		*/
		{
		wxFileName fn;
		wxString FileWildcard, FileExt;
		wxString msg, Command;
		wxString fileWildcard;
		wxString fileExt;
		wxString title = _( "Save Netlist File" );

		NetlistUpdateOpt();
		@@ -458,30 +461,31 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
		switch( CurrPage->m_IdNetType )
		{
		case NET_TYPE_SPICE:
		FileExt = wxT( "cir" );
		FileWildcard = _( "SPICE netlist file (.cir)\|*.cir" );
		fileExt = wxT( "cir" );
		fileWildcard = _( "SPICE netlist file (.cir)\|*.cir" );
		break;

		case NET_TYPE_CADSTAR:
		FileExt = wxT( "frp" );
		FileWildcard = _( "CadStar netlist file (.frp)\|*.frp" );
		fileExt = wxT( "frp" );
		fileWildcard = _( "CadStar netlist file (.frp)\|*.frp" );
		break;

		case NET_TYPE_PCBNEW:
		FileExt = NetlistFileExtension;
		FileWildcard = NetlistFileWildcard;
		case NET_TYPE_ORCADPCB2:
		fileExt = NetlistFileExtension;
		fileWildcard = NetlistFileWildcard;
		break;

		default: // custom
		FileExt = wxT( "*" );
		FileWildcard = AllFilesWildcard;
		title = _( "Generic Export" );
		default: // custom, NET_TYPE_CUSTOM1 and greater
		fileExt = wxEmptyString; // wxT( "" );
		fileWildcard = AllFilesWildcard;
		title.Printf( _( "%s Export" ), CurrPage->m_TitleStringCtrl->GetValue().GetData() );
		}

		fn.SetExt( FileExt );
		fn.SetExt( fileExt );

		wxFileDialog dlg( this, title, fn.GetPath(),
		fn.GetFullName(), FileWildcard,
		fn.GetFullName(), fileWildcard,
		wxFD_SAVE );

		if( dlg.ShowModal() == wxID_CANCEL )

eeschema/plugins/netlist_form_pads-pcb.xsl

+4 −3

Original line number	Diff line number	Diff line
		@@ -20,14 +20,15 @@

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

pcbnew/automove.cpp

+3 −9

Original line number	Diff line number	Diff line
		@@ -36,15 +36,12 @@ wxString ModulesMaskSelection = wxT( "*" );
		void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event )
		{
		int id = event.GetId();
		wxPoint pos;
		INSTALL_DC( dc, DrawPanel );
		bool on_state;

		if( m_HToolBar == NULL )
		return;

		wxGetMousePosition( &pos.x, &pos.y );

		switch( id )
		{
		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,
		* Starting from the mouse cursor
		* The components with the FIXED status are not normally dives
		* According to the flags:
		* All modules (not fixed) will be left
		* Only PCB modules are not left
		/* Function to move components in a rectangular area format 4 / 3,
		* starting from the mouse cursor
		* The components with the FIXED status set are not moved
		*/
		void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
		{

pcbnew/tool_pcb.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -216,8 +216,12 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
		#endif

		m_HToolBar->AddSeparator();
		msg = AddHotkeyName( HELP_UNDO, s_Board_Editor_Hokeys_Descr,
		HK_UNDO, false );
		m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, wxBitmap( undo_xpm ),
		HELP_UNDO );
		msg = AddHotkeyName( HELP_REDO, s_Board_Editor_Hokeys_Descr,
		HK_REDO, false );
		m_HToolBar->AddTool( wxID_REDO, wxEmptyString, wxBitmap( redo_xpm ),
		HELP_REDO );

		@@ -272,11 +276,11 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
		m_HToolBar->AddSeparator();
		m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOPLACE, wxEmptyString,
		wxBitmap( mode_module_xpm ),
		_( "Manual and automatic move or place of modules" ),
		_( "Mode footprint: manual and automatic move and place modules" ),
		wxITEM_CHECK );
		m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOROUTE, wxEmptyString,
		wxBitmap( mode_track_xpm ),
		_( "Mode Track and Autorouting" ), wxITEM_CHECK );
		_( "Mode track: autorouting" ), wxITEM_CHECK );

		// Fast call to FreeROUTE Web Bases router
		m_HToolBar->AddSeparator();

Admin message