More about italic and bold texts options in fields and graphic texts + code cleanup (348cfa79) · Commits · Elphel / kicad-source-mirror

CHANGELOG.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,12 @@ Please add newer entries at the top, list the date and your name with
		email address.


		2008-Dec-28 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
		================================================================================
		++Eeschema:
		More about italic and bold texts options in fields and graphic texts


		2008-Dec-22 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
		================================================================================
		++Pcbnew:

eeschema/CMakeLists.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ set(EESCHEMA_SRCS
		delete.cpp
		delsheet.cpp
		# dialog_backanno.cpp
		dialog_bodygraphictext_properties_base.cpp
		dialog_build_BOM.cpp
		# dialog_cmp_graphic_properties.cpp
		dialog_create_component.cpp
		@@ -94,7 +95,7 @@ set(EESCHEMA_SRCS
		sheetlab.cpp
		symbdraw.cpp
		symbedit.cpp
		symbtext.cpp
		edit_graphic_bodyitem_text.cpp
		tool_lib.cpp
		tool_sch.cpp
		tool_viewlib.cpp

eeschema/affiche.cpp

+10 −3

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ void LibEDA_BaseStruct::Display_Infos_DrawEntry( WinEDA_DrawFrame* frame )
		*/
		{
		wxString msg;
		int thickness = 0;

		frame->MsgPanel->EraseMsgBox();

		@@ -135,21 +136,27 @@ void LibEDA_BaseStruct::Display_Infos_DrawEntry( WinEDA_DrawFrame* frame )
		switch( Type() )
		{
		case COMPONENT_ARC_DRAW_TYPE:
		thickness = ( (LibDrawArc*) this )->m_Width;
		msg = wxT( "Arc" ); break;

		case COMPONENT_CIRCLE_DRAW_TYPE:
		thickness = ( (LibDrawCircle*) this )->m_Width;
		msg = wxT( "Circle" ); break;

		case COMPONENT_GRAPHIC_TEXT_DRAW_TYPE:
		thickness = ( (LibDrawText*) this )->m_Width;
		msg = wxT( "Text" ); break;

		case COMPONENT_RECT_DRAW_TYPE:
		thickness = ( (LibDrawSquare*) this )->m_Width;
		msg = wxT( "Rect" ); break;

		case COMPONENT_POLYLINE_DRAW_TYPE:
		thickness = ( (LibDrawPolyline*) this )->m_Width;
		msg = wxT( "PolyLine" ); break;

		case COMPONENT_LINE_DRAW_TYPE:
		thickness = ( (LibDrawSegment*) this )->m_Width;
		msg = wxT( "Segment" ); break;

		case COMPONENT_PIN_DRAW_TYPE:
		@@ -181,9 +188,9 @@ void LibEDA_BaseStruct::Display_Infos_DrawEntry( WinEDA_DrawFrame* frame )
		msg = wxT( "?" );
		Affiche_1_Parametre( frame, 14, _( "Convert" ), msg, BROWN );

		if( m_Width )
		msg = ReturnStringFromValue( g_UnitMetric, m_Width, EESCHEMA_INTERNAL_UNIT, true );
		if( thickness )
		msg = ReturnStringFromValue( g_UnitMetric, thickness, EESCHEMA_INTERNAL_UNIT, true );
		else
		msg = _( "default" );
		Affiche_1_Parametre( frame, 20, _( "Width" ), msg, BLUE );
		Affiche_1_Parametre( frame, 20, _( "Thickness" ), msg, BLUE );
		}

eeschema/class_library.cpp

+8 −17

Original line number	Diff line number	Diff line
		@@ -12,11 +12,6 @@

		#include "protos.h"


		/*******************************************************/
		/* Methodes relatives a la manipulation des librairies */
		/*******************************************************/

		/***************************************************************************************/
		LibraryStruct::LibraryStruct( int type, const wxString& name, const wxString& fullname )
		/***************************************************************************************/
		@@ -396,11 +391,6 @@ LibDrawField::LibDrawField( int idfield ) : LibEDA_BaseStruct( COMPONENT_FIELD_D
		if( m_FieldId >= NUMBER_OF_FIELDS )
		m_FieldId = NUMBER_OF_FIELDS - 1;
		m_Size.x = m_Size.y = DEFAULT_SIZE_TEXT;
		m_Orient = 0; /* Orientation */
		m_Attributs = 0; /* Attributs = unvisible ... */
		m_Width = 0;
		m_HJustify = GR_TEXT_HJUSTIFY_CENTER;
		m_VJustify = GR_TEXT_VJUSTIFY_CENTER; /* Horizontal and vertical text justification */
		}


		@@ -432,6 +422,7 @@ void LibDrawField::Copy( LibDrawField* Target )
		Target->m_Name = m_Name;
		Target->m_HJustify = m_HJustify;
		Target->m_VJustify = m_VJustify;
		Target->m_Italic = m_Italic;
		}


		@@ -494,13 +485,11 @@ LibDrawCircle* LibDrawCircle::GenCopy()


		/*****************************************************************/
		LibDrawText::LibDrawText() : LibEDA_BaseStruct( COMPONENT_GRAPHIC_TEXT_DRAW_TYPE )
		LibDrawText::LibDrawText() : LibEDA_BaseStruct( COMPONENT_GRAPHIC_TEXT_DRAW_TYPE ),
		EDA_TextStruct()
		/*****************************************************************/
		{
		m_Horiz = TEXT_ORIENT_HORIZ;
		m_Size = wxSize( 50, 50 );
		m_Type = 0;
		m_Width = 0;
		}


		@@ -511,14 +500,17 @@ LibDrawText* LibDrawText::GenCopy()
		LibDrawText* newitem = new LibDrawText();

		newitem->m_Pos = m_Pos;
		newitem->m_Horiz = m_Horiz;
		newitem->m_Orient = m_Orient;
		newitem->m_Size = m_Size;
		newitem->m_Type = m_Type;
		newitem->m_Attributs = m_Attributs;
		newitem->m_Unit = m_Unit;
		newitem->m_Convert = m_Convert;
		newitem->m_Flags = m_Flags;
		newitem->m_Text = m_Text;
		newitem->m_Width = m_Width;
		newitem->m_Italic = m_Italic;
		newitem->m_HJustify = m_HJustify;
		newitem->m_VJustify = m_VJustify;
		return newitem;
		}

		@@ -589,7 +581,6 @@ LibDrawPolyline* LibDrawPolyline::GenCopy()
		newitem->m_PolyList = (int*) MyMalloc( size );
		memcpy( newitem->m_PolyList, m_PolyList, size );
		}
		newitem->m_Pos = m_Pos;
		newitem->m_Width = m_Width;
		newitem->m_Unit = m_Unit;
		newitem->m_Convert = m_Convert;

eeschema/class_sch_cmp_field.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -198,14 +198,16 @@ bool SCH_CMP_FIELD::Save( FILE* aFile ) const
		else if( m_VJustify == GR_TEXT_VJUSTIFY_TOP )
		vjustify = 'T';

		if( fprintf( aFile, "F %d \"%s\" %c %-3d %-3d %-3d %4.4X %c %c",
		if( fprintf( aFile, "F %d \"%s\" %c %-3d %-3d %-3d %4.4X %c %c%c%c",
		m_FieldId,
		CONV_TO_UTF8( m_Text ),
		m_Orient == TEXT_ORIENT_HORIZ ? 'H' : 'V',
		m_Pos.x, m_Pos.y,
		m_Size.x,
		m_Attributs,
		hjustify, vjustify ) == EOF )
		hjustify, vjustify,
		m_Italic ? 'I' : 'N',
		m_Width > 1 ? 'B' : 'N' ) == EOF )
		{
		return false;
		}

Admin message