beautification (00bda3c9) · Commits · Elphel / kicad-source-mirror

eeschema/eelibs_read_libraryfiles.cpp

+46 −16

Original line number	Original line	Diff line number	Diff line
	@@ -136,12 +136,16 @@ void LoadLibraries( WinEDA_DrawFrame* frame )

	if( LibName.IsEmpty() )		if( LibName.IsEmpty() )
	continue;		continue;

	FullLibName = MakeFileName( g_RealLibDirBuffer, LibName, g_LibExtBuffer );		FullLibName = MakeFileName( g_RealLibDirBuffer, LibName, g_LibExtBuffer );

	msg = wxT( "Loading " ) + FullLibName;		msg = wxT( "Loading " ) + FullLibName;

	if( LoadLibraryName( frame, FullLibName, LibName ) )		if( LoadLibraryName( frame, FullLibName, LibName ) )
	msg += wxT( " OK" );		msg += wxT( " OK" );
	else		else
	msg += wxT( " ->Error" );		msg += wxT( " ->Error" );

	frame->PrintMsg( msg );		frame->PrintMsg( msg );
	}		}

	@@ -348,7 +352,10 @@ EDA_LibComponentStruct* Read_Component_Definition( WinEDA_DrawFrame* frame, char
	*/		*/
	{		{
	int unused;		int unused;
	char* p, * Name, * Prefix = NULL;		char* p;
			char* name;
			char* prefix = NULL;

	EDA_LibComponentStruct* LibEntry = NULL;		EDA_LibComponentStruct* LibEntry = NULL;
	bool Res;		bool Res;
	wxString Msg;		wxString Msg;
	@@ -366,8 +373,8 @@ EDA_LibComponentStruct* Read_Component_Definition( WinEDA_DrawFrame* frame, char
	char drawnum = 0, drawname = 0;		char drawnum = 0, drawname = 0;
	LibEntry = new EDA_LibComponentStruct( NULL );		LibEntry = new EDA_LibComponentStruct( NULL );

	if( ( Name = strtok( NULL, " \t\n" ) ) == NULL /* Part name: */		if( ( name = strtok( NULL, " \t\n" ) ) == NULL /* Part name: */
	\|\| ( Prefix = strtok( NULL, " \t\n" ) ) == NULL /* Prefix name: */		\|\| ( prefix = strtok( NULL, " \t\n" ) ) == NULL /* Prefix name: */
	\|\| ( p = strtok( NULL, " \t\n" ) ) == NULL /* NumOfPins: */		\|\| ( p = strtok( NULL, " \t\n" ) ) == NULL /* NumOfPins: */
	\|\| sscanf( p, "%d", &unused ) != 1		\|\| sscanf( p, "%d", &unused ) != 1
	\|\| ( p = strtok( NULL, " \t\n" ) ) == NULL /* TextInside: */		\|\| ( p = strtok( NULL, " \t\n" ) ) == NULL /* TextInside: */
	@@ -394,23 +401,24 @@ EDA_LibComponentStruct* Read_Component_Definition( WinEDA_DrawFrame* frame, char
	{		{
	LibEntry->m_DrawPinNum = (drawnum == 'N') ? FALSE : TRUE;		LibEntry->m_DrawPinNum = (drawnum == 'N') ? FALSE : TRUE;
	LibEntry->m_DrawPinName = (drawname == 'N') ? FALSE : TRUE;		LibEntry->m_DrawPinName = (drawname == 'N') ? FALSE : TRUE;

	/* Copy part name and prefix. */		/* Copy part name and prefix. */
	strupper( Name );		strupper( name );
	if( Name[0] != '~' )		if( name[0] != '~' )
	LibEntry->m_Name.m_Text = CONV_FROM_UTF8( Name );		LibEntry->m_Name.m_Text = CONV_FROM_UTF8( name );
	else		else
	{		{
	LibEntry->m_Name.m_Text = CONV_FROM_UTF8( &Name[1] );		LibEntry->m_Name.m_Text = CONV_FROM_UTF8( &name[1] );
	LibEntry->m_Name.m_Attributs \|= TEXT_NO_VISIBLE;		LibEntry->m_Name.m_Attributs \|= TEXT_NO_VISIBLE;
	}		}

	if( strcmp( Prefix, "~" ) == 0 )		if( strcmp( prefix, "~" ) == 0 )
	{		{
	LibEntry->m_Prefix.m_Text.Empty();		LibEntry->m_Prefix.m_Text.Empty();
	LibEntry->m_Prefix.m_Attributs \|= TEXT_NO_VISIBLE;		LibEntry->m_Prefix.m_Attributs \|= TEXT_NO_VISIBLE;
	}		}
	else		else
	LibEntry->m_Prefix.m_Text = CONV_FROM_UTF8( Prefix );		LibEntry->m_Prefix.m_Text = CONV_FROM_UTF8( prefix );

	// Copy optional infos		// Copy optional infos
	if( ( p = strtok( NULL, " \t\n" ) ) != NULL ) // m_UnitSelectionLocked param		if( ( p = strtok( NULL, " \t\n" ) ) != NULL ) // m_UnitSelectionLocked param
	@@ -525,7 +533,10 @@ static LibEDA_BaseStruct* GetDrawEntry( WinEDA_DrawFrame* frame, FILE* f, char*
	&Arc->m_Width, chartmp, &startx, &starty, &endx, &endy );		&Arc->m_Width, chartmp, &startx, &starty, &endx, &endy );
	if( nbarg < 8 )		if( nbarg < 8 )
	Error = TRUE;		Error = TRUE;
	Arc->m_Unit = Unit; Arc->m_Convert = Convert;
			Arc->m_Unit = Unit;
			Arc->m_Convert = Convert;

	if( chartmp[0] == 'F' )		if( chartmp[0] == 'F' )
	Arc->m_Fill = FILLED_SHAPE;		Arc->m_Fill = FILLED_SHAPE;
	if( chartmp[0] == 'f' )		if( chartmp[0] == 'f' )
	@@ -625,8 +636,11 @@ static LibEDA_BaseStruct* GetDrawEntry( WinEDA_DrawFrame* frame, FILE* f, char*
	Pin->m_PinLen = ll;		Pin->m_PinLen = ll;
	Pin->m_Orient = chartmp1[0] & 255;		Pin->m_Orient = chartmp1[0] & 255;

	Pin->m_Unit = Unit; Pin->m_Convert = Convert;		Pin->m_Unit = Unit;
			Pin->m_Convert = Convert;

	strncpy( (char*) &Pin->m_PinNum, PinNum, 4 );		strncpy( (char*) &Pin->m_PinNum, PinNum, 4 );

	Error = (i != 11 && i != 12);		Error = (i != 11 && i != 12);

	Pin->m_PinName = CONV_FROM_UTF8( BufName );		Pin->m_PinName = CONV_FROM_UTF8( BufName );
	@@ -672,6 +686,7 @@ static LibEDA_BaseStruct* GetDrawEntry( WinEDA_DrawFrame* frame, FILE* f, char*
	}		}

	if( i == 12 ) /* Special Symbole defined */		if( i == 12 ) /* Special Symbole defined */
			{
	for( jj = strlen( Buffer ); jj > 0; )		for( jj = strlen( Buffer ); jj > 0; )
	{		{
	switch( Buffer[--jj] )		switch( Buffer[--jj] )
	@@ -700,6 +715,7 @@ static LibEDA_BaseStruct* GetDrawEntry( WinEDA_DrawFrame* frame, FILE* f, char*
	DisplayError( frame, MsgLine ); break;		DisplayError( frame, MsgLine ); break;
	}		}
	}		}
			}

	}		}
	break;		break;
	@@ -852,7 +868,8 @@ static bool GetLibEntryField( EDA_LibComponentStruct* LibEntry, char* line )

	if( *line == 0 )		if( *line == 0 )
	return 0;		return 0;
	line++; Text = line;		line++;
			Text = line;

	/* recherche fin de texte */		/* recherche fin de texte */
	while( line && (line != '"') )		while( line && (line != '"') )
	@@ -860,17 +877,23 @@ static bool GetLibEntryField( EDA_LibComponentStruct* LibEntry, char* line )

	if( *line == 0 )		if( *line == 0 )
	return 0;		return 0;
	*line = 0; line++;		*line = 0;
			line++;

	FieldUserName[0] = 0;		FieldUserName[0] = 0;

	nbparam = sscanf( line, " %d %d %d %c %c %c %c",		nbparam = sscanf( line, " %d %d %d %c %c %c %c",
	&posx, &posy, &size, Char1, Char2, Char3, Char4 );		&posx, &posy, &size, Char1, Char2, Char3, Char4 );
	orient = TEXT_ORIENT_HORIZ; if( Char1[0] == 'V' )		orient = TEXT_ORIENT_HORIZ;

			if( Char1[0] == 'V' )
	orient = TEXT_ORIENT_VERT;		orient = TEXT_ORIENT_VERT;
	draw = TRUE; if( Char2[0] == 'I' )		draw = TRUE; if( Char2[0] == 'I' )
	draw = FALSE;		draw = FALSE;

	hjustify = GR_TEXT_HJUSTIFY_CENTER;		hjustify = GR_TEXT_HJUSTIFY_CENTER;
	vjustify = GR_TEXT_VJUSTIFY_CENTER;		vjustify = GR_TEXT_VJUSTIFY_CENTER;

	if( nbparam >= 6 )		if( nbparam >= 6 )
	{		{
	if( *Char3 == 'L' )		if( *Char3 == 'L' )
	@@ -898,6 +921,7 @@ static bool GetLibEntryField( EDA_LibComponentStruct* LibEntry, char* line )
	default:		default:
	if( NumOfField >= NUMBER_OF_FIELDS )		if( NumOfField >= NUMBER_OF_FIELDS )
	break;		break;

	Field = new LibDrawField( NumOfField );		Field = new LibDrawField( NumOfField );

	Field->Pnext = LibEntry->Fields;		Field->Pnext = LibEntry->Fields;
	@@ -910,15 +934,19 @@ static bool GetLibEntryField( EDA_LibComponentStruct* LibEntry, char* line )

	Field->m_Pos.x = posx; Field->m_Pos.y = posy;		Field->m_Pos.x = posx; Field->m_Pos.y = posy;
	Field->m_Orient = orient;		Field->m_Orient = orient;

	if( draw == FALSE )		if( draw == FALSE )
	Field->m_Attributs \|= TEXT_NO_VISIBLE;		Field->m_Attributs \|= TEXT_NO_VISIBLE;

	Field->m_Size.x = Field->m_Size.y = size;		Field->m_Size.x = Field->m_Size.y = size;
	Field->m_Text = CONV_FROM_UTF8( Text );		Field->m_Text = CONV_FROM_UTF8( Text );

	if( NumOfField >= FIELD1 )		if( NumOfField >= FIELD1 )
	{		{
	ReadDelimitedText( FieldUserName, line, sizeof(FieldUserName) );		ReadDelimitedText( FieldUserName, line, sizeof(FieldUserName) );
	Field->m_Name = CONV_FROM_UTF8( FieldUserName );		Field->m_Name = CONV_FROM_UTF8( FieldUserName );
	}		}

	Field->m_HJustify = hjustify;		Field->m_HJustify = hjustify;
	Field->m_VJustify = vjustify;		Field->m_VJustify = vjustify;
	return TRUE;		return TRUE;
	@@ -992,7 +1020,8 @@ int LoadDocLib( WinEDA_DrawFrame* frame, const wxString& FullDocLibName, const w
	return 0;		return 0;

	if( GetLine( f, Line, &LineNum, sizeof(Line) ) == NULL )		if( GetLine( f, Line, &LineNum, sizeof(Line) ) == NULL )
	{ /* pas de lignes utiles */		{
			/* pas de lignes utiles */
	fclose( f );		fclose( f );
	return 0;		return 0;
	}		}
	@@ -1100,6 +1129,7 @@ void EDA_LibComponentStruct::SortDrawItems()

	BufentryBase =		BufentryBase =
	(LibEDA_BaseStruct*) MyZMalloc( (nbitems + 1) sizeof(LibEDA_BaseStruct *) );		(LibEDA_BaseStruct*) MyZMalloc( (nbitems + 1) sizeof(LibEDA_BaseStruct *) );

	/* memorisation du chainage : */		/* memorisation du chainage : */
	for( Entry = m_Drawings, ii = 0; Entry != NULL; Entry = Entry->Next() )		for( Entry = m_Drawings, ii = 0; Entry != NULL; Entry = Entry->Next() )
	BufentryBase[ii++] = Entry;		BufentryBase[ii++] = Entry;

eeschema/load_one_schematic_file.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -440,7 +440,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F

	screen->EEDrawList = Phead;		screen->EEDrawList = Phead;

	#if defined(DEBUG)		#if 0 && defined(DEBUG)
	screen->Show( 0, std::cout );		screen->Show( 0, std::cout );
	#endif		#endif

Admin message