Eeschema: fixed: root components non found in schematic (3806557f) · Commits · Elphel / kicad-source-mirror

common/about_kicad.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@
	#include "appl_wxstruct.h"		#include "appl_wxstruct.h"


	#define BUILD_VERSION "(20090808-unstable)"		#define BUILD_VERSION "(20090827-unstable)"


	#ifdef HAVE_SVN_VERSION		#ifdef HAVE_SVN_VERSION

eeschema/bus-wire-junction.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -588,12 +588,12 @@ static void AbortCreateNewLine( WinEDA_DrawPanel* Panel, wxDC* DC )

	if( Screen->GetCurItem() ) /* trace en cours */		if( Screen->GetCurItem() ) /* trace en cours */
	{		{
	Panel->ManageCurseur( Panel, DC, FALSE );
	Panel->ManageCurseur = NULL;		Panel->ManageCurseur = NULL;
	Panel->ForceCloseManageCurseur = NULL;		Panel->ForceCloseManageCurseur = NULL;
	EraseStruct( (SCH_ITEM) Screen->GetCurItem(), (SCH_SCREEN) Screen );		EraseStruct( (SCH_ITEM) Screen->GetCurItem(), (SCH_SCREEN) Screen );
	Screen->SetCurItem( NULL );		Screen->SetCurItem( NULL );
	RestoreOldWires( Screen );		RestoreOldWires( Screen );
			Panel->Refresh();
	}		}
	else		else
	g_ItemToRepeat = NULL; // Fin de commande generale		g_ItemToRepeat = NULL; // Fin de commande generale

eeschema/class_library.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -124,13 +124,14 @@ LibCmpEntry* LibraryStruct::FindEntry( const wxChar* name, LibrEntryType type )
	if( entry != NULL && entry->Type != ROOT && type == ROOT )		if( entry != NULL && entry->Type != ROOT && type == ROOT )
	{		{
	EDA_LibCmpAliasStruct* alias = ( EDA_LibCmpAliasStruct* ) entry;		EDA_LibCmpAliasStruct* alias = ( EDA_LibCmpAliasStruct* ) entry;
			const wxChar* rootname = alias->m_RootName.GetData();

	PQCompFunc( (PQCompFuncType) LibraryEntryCompare );		PQCompFunc( (PQCompFuncType) LibraryEntryCompare );
	entry = (LibCmpEntry*) PQFirst( &m_Entries, false );		entry = (LibCmpEntry*) PQFirst( &m_Entries, false );

	while( entry )		while( entry )
	{		{
	if( entry->m_Name.m_Text.CmpNoCase( name ) == 0		if( entry->m_Name.m_Text.CmpNoCase( rootname ) == 0
	&& entry->Type == ROOT )		&& entry->Type == ROOT )
	break;		break;

eeschema/class_library.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,7 @@ public:
	* should give better search capability.		* should give better search capability.
	*		*
	* @param names - String array to place entry names into.		* @param names - String array to place entry names into.
	* @parem nameSearch - Name wild card search criteria.		* @param nameSearch - Name wild card search criteria.
	* @param keySearch - Key word search criteria.		* @param keySearch - Key word search criteria.
	* @param sort - Sort names if true.		* @param sort - Sort names if true.
	*/		*/

eeschema/onrightclick.cpp

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -484,13 +484,14 @@ void AddMenusForWire( wxMenu* PopMenu, EDA_DrawLineStruct* Wire,
	wxPoint pos = frame->GetScreen()->m_Curseur;		wxPoint pos = frame->GetScreen()->m_Curseur;

	if( is_new )		if( is_new )
			{
	ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Wire End" ), apply_xpm );		ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Wire End" ), apply_xpm );

	ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Wire" ), delete_xpm );

	if( is_new )
	return;		return;
			}

			ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_WIRE_REQUEST, _( "Drag Wire" ), move_track_xpm );
			PopMenu->AppendSeparator();
			ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Wire" ), delete_xpm );
	ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete Node" ), delete_node_xpm );		ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete Node" ), delete_node_xpm );
	ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CONNECTION, _(		ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CONNECTION, _(
	"Delete Connection" ), delete_connection_xpm );		"Delete Connection" ), delete_connection_xpm );
	@@ -523,12 +524,14 @@ void AddMenusForBus( wxMenu* PopMenu, EDA_DrawLineStruct* Bus,
	wxPoint pos = frame->GetScreen()->m_Curseur;		wxPoint pos = frame->GetScreen()->m_Curseur;

	if( is_new )		if( is_new )
			{
	ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Bus End" ), apply_xpm );		ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Bus End" ), apply_xpm );
			return;
			}

	ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE,		ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE,
	_( "Delete Bus" ), delete_bus_xpm );		_( "Delete Bus" ), delete_bus_xpm );

	if( !is_new )
	ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE,		ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE,
	_( "Break Bus" ), break_bus_xpm );		_( "Break Bus" ), break_bus_xpm );

Admin message