Made the project default text size apply to all text things in eeschema,... (6d17ad71) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_edit_label.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -297,7 +297,7 @@ void DIALOG_LABEL_EDITOR::TextPropertiesAccept( wxCommandEvent& aEvent )

	// Make the text size the new default size ( if it is a new text ):		// Make the text size the new default size ( if it is a new text ):
	if( m_CurrentText->IsNew() )		if( m_CurrentText->IsNew() )
	m_Parent->SetDefaultLabelSize( m_CurrentText->GetSize().x );		SetDefaultTextSize( m_CurrentText->GetSize().x );

	m_Parent->GetCanvas()->RefreshDrawingRect( m_CurrentText->GetBoundingBox() );		m_Parent->GetCanvas()->RefreshDrawingRect( m_CurrentText->GetBoundingBox() );
	m_Parent->GetCanvas()->MoveCursorToCrossHair();		m_Parent->GetCanvas()->MoveCursorToCrossHair();

eeschema/edit_label.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,7 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( wxDC* aDC, int aType )
	textItem->SetBold( lastTextBold );		textItem->SetBold( lastTextBold );
	textItem->SetItalic( lastTextItalic );		textItem->SetItalic( lastTextItalic );
	textItem->SetOrientation( lastTextOrientation );		textItem->SetOrientation( lastTextOrientation );
	textItem->SetSize( wxSize( GetDefaultLabelSize(), GetDefaultLabelSize() ) );		textItem->SetSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
	textItem->SetFlags( IS_NEW \| IS_MOVED );		textItem->SetFlags( IS_NEW \| IS_MOVED );

	EditSchematicText( textItem );		EditSchematicText( textItem );

eeschema/eeschema_config.cpp

+17 −4

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@

	static EDA_COLOR_T s_layerColor[NB_SCH_LAYERS];		static EDA_COLOR_T s_layerColor[NB_SCH_LAYERS];

	// The width to draw busses that do not have a specific width		/// The width to draw busses that do not have a specific width
	static int s_defaultBusThickness;		static int s_defaultBusThickness;

	int GetDefaultBusThickness()		int GetDefaultBusThickness()
	@@ -73,6 +73,19 @@ void SetDefaultBusThickness( int aThickness)
	s_defaultBusThickness = 1;		s_defaultBusThickness = 1;
	}		}

			/// Default size for text (not only labels)
			static int s_defaultTextSize;

			int GetDefaultTextSize()
			{
			return s_defaultTextSize;
			}

			void SetDefaultTextSize( int aTextSize )
			{
			s_defaultTextSize = aTextSize;
			}

	/*		/*
	* Default line (in Eeschema units) thickness used to draw/plot items having a		* Default line (in Eeschema units) thickness used to draw/plot items having a
	* default thickness line value (i.e. = 0 ).		* default thickness line value (i.e. = 0 ).
	@@ -283,7 +296,7 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event )
	dlg.SetBusWidth( GetDefaultBusThickness() );		dlg.SetBusWidth( GetDefaultBusThickness() );
	dlg.SetLineWidth( GetDefaultLineThickness() );		dlg.SetLineWidth( GetDefaultLineThickness() );
	dlg.SetPinLength( GetDefaultPinLength() );		dlg.SetPinLength( GetDefaultPinLength() );
	dlg.SetTextSize( GetDefaultLabelSize() );		dlg.SetTextSize( GetDefaultTextSize() );
	dlg.SetRepeatHorizontal( g_RepeatStep.x );		dlg.SetRepeatHorizontal( g_RepeatStep.x );
	dlg.SetRepeatVertical( g_RepeatStep.y );		dlg.SetRepeatVertical( g_RepeatStep.y );
	dlg.SetRepeatLabel( g_RepeatDeltaLabel );		dlg.SetRepeatLabel( g_RepeatDeltaLabel );
	@@ -332,7 +345,7 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event )
	SetDefaultBusThickness( dlg.GetBusWidth() );		SetDefaultBusThickness( dlg.GetBusWidth() );
	SetDefaultLineThickness( dlg.GetLineWidth() );		SetDefaultLineThickness( dlg.GetLineWidth() );
	SetDefaultPinLength( dlg.GetPinLength() );		SetDefaultPinLength( dlg.GetPinLength() );
	SetDefaultLabelSize( dlg.GetTextSize() );		SetDefaultTextSize( dlg.GetTextSize() );
	g_RepeatStep.x = dlg.GetRepeatHorizontal();		g_RepeatStep.x = dlg.GetRepeatHorizontal();
	g_RepeatStep.y = dlg.GetRepeatVertical();		g_RepeatStep.y = dlg.GetRepeatVertical();
	g_RepeatDeltaLabel = dlg.GetRepeatLabel();		g_RepeatDeltaLabel = dlg.GetRepeatLabel();
	@@ -404,7 +417,7 @@ PARAM_CFG_ARRAY& SCH_EDIT_FRAME::GetProjectFileParametersList()
	&g_RepeatDeltaLabel,		&g_RepeatDeltaLabel,
	1, -10, +10 ) );		1, -10, +10 ) );
	m_projectFileParams.push_back( new PARAM_CFG_INT( wxT( "LabSize" ),		m_projectFileParams.push_back( new PARAM_CFG_INT( wxT( "LabSize" ),
	&m_defaultLabelSize,		&s_defaultTextSize,
	DEFAULT_SIZE_TEXT, 5,		DEFAULT_SIZE_TEXT, 5,
	1000 ) );		1000 ) );

eeschema/general.h

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,6 @@ class SCH_SHEET;
	#define SCHEMATIC_HEAD_STRING "Schematic File Version"		#define SCHEMATIC_HEAD_STRING "Schematic File Version"

	#define TXTMARGE 10 // Offset in mils for placement of labels and pin numbers		#define TXTMARGE 10 // Offset in mils for placement of labels and pin numbers
	#define DEFAULT_TEXT_SIZE 50 // Default size for field texts
	#define DANGLING_SYMBOL_SIZE 12		#define DANGLING_SYMBOL_SIZE 12

	#define GR_DEFAULT_DRAWMODE GR_COPY		#define GR_DEFAULT_DRAWMODE GR_COPY
	@@ -76,6 +75,12 @@ extern SCH_SHEET* g_RootSheet;
	int GetDefaultLineThickness();		int GetDefaultLineThickness();
	void SetDefaultLineThickness( int aThickness );		void SetDefaultLineThickness( int aThickness );

			/**
			* Default size for text in general
			*/
			int GetDefaultTextSize();
			void SetDefaultTextSize( int aSize );

	/**		/**
	* Default length for new pins in module editor		* Default length for new pins in module editor
	*/		*/

eeschema/lib_field.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,8 @@ LIB_FIELD::~LIB_FIELD()
	void LIB_FIELD::Init( int id )		void LIB_FIELD::Init( int id )
	{		{
	m_id = id;		m_id = id;
	m_Size.x = m_Size.y = DEFAULT_SIZE_TEXT;		m_Size.x = GetDefaultTextSize();
			m_Size.y = GetDefaultTextSize();
	m_typeName = _( "Field" );		m_typeName = _( "Field" );
	m_Orient = TEXT_ORIENT_HORIZ;		m_Orient = TEXT_ORIENT_HORIZ;
	m_rotate = false;		m_rotate = false;