merge (d5f2f586) · Commits · Elphel / kicad-source-mirror

CHANGELOG.txt

+7 −0

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

			2010-Dec-19 UPDATE Dick Hollenbeck <dick@softplc.com>
			================================================================================
			++new:
			Completed a good portion of /new class DIR_LIB_SOURCE.
			Added an autonomous CMakeLists.txt file to /new, with new-docs target and
			test program target.

	2010-dec-15, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>		2010-dec-15, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
	================================================================================		================================================================================
	Gerbview:		Gerbview:

common/basicframe.cpp

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -93,11 +93,9 @@ void WinEDA_BasicFrame::SetLanguage( wxCommandEvent& event )
	int id = event.GetId();		int id = event.GetId();

	wxGetApp().SetLanguageIdentifier( id );		wxGetApp().SetLanguageIdentifier( id );
	if ( wxGetApp().SetLanguage() )		wxGetApp().SetLanguage();
	{
	ReCreateMenuBar();		ReCreateMenuBar();
	Refresh();		GetMenuBar()->Refresh();
	}
	}		}

common/build_version.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	#endif		#endif

	#ifndef KICAD_BUILD_VERSION		#ifndef KICAD_BUILD_VERSION
	#define KICAD_BUILD_VERSION "(2010-12-10 BZR 26xx)"		#define KICAD_BUILD_VERSION "(2010-12-18 BZR 26xx)"
	#endif		#endif

	//#define VERSION_STABILITY "stable"		//#define VERSION_STABILITY "stable"

common/common_plot_functions.cpp

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
	{		{
	#define WSTEXTSIZE 50 // Text size in mils		#define WSTEXTSIZE 50 // Text size in mils
	Ki_PageDescr* Sheet = screen->m_CurrentSheetDesc;		Ki_PageDescr* Sheet = screen->m_CurrentSheetDesc;
	int xg, yg, ipas, gxpas, gypas;		int xg, yg;
	wxSize PageSize;		wxSize PageSize;
	wxPoint pos, ref;		wxPoint pos, ref;
	EDA_Colors color;		EDA_Colors color;
	@@ -36,10 +36,11 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
	wxSize text_size2;		wxSize text_size2;
	wxSize text_size3;		wxSize text_size3;
	wxSize text_size1_5;		wxSize text_size1_5;
	#endif		#else
	int UpperLimit = VARIABLE_BLOCK_START_POSITION;		int UpperLimit = VARIABLE_BLOCK_START_POSITION;
	bool italic = false;
	bool bold = false;		bool bold = false;
			#endif
			bool italic = false;
	bool thickness = 0; //@todo : use current pen		bool thickness = 0; //@todo : use current pen

	color = BLACK;		color = BLACK;
	@@ -150,8 +151,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
	#else		#else

	/* Plot legend along the X axis. */		/* Plot legend along the X axis. */
	ipas = ( xg - ref.x ) / PAS_REF;		int ipas = ( xg - ref.x ) / PAS_REF;
	gxpas = ( xg - ref.x ) / ipas;		int gxpas = ( xg - ref.x ) / ipas;
	for( int ii = ref.x + gxpas, jj = 1; ipas > 0; ii += gxpas, jj++, ipas-- )		for( int ii = ref.x + gxpas, jj = 1; ipas > 0; ii += gxpas, jj++, ipas-- )
	{		{
	msg.Empty();		msg.Empty();
	@@ -193,7 +194,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )

	/* Plot legend along the Y axis. */		/* Plot legend along the Y axis. */
	ipas = ( yg - ref.y ) / PAS_REF;		ipas = ( yg - ref.y ) / PAS_REF;
	gypas = ( yg - ref.y ) / ipas;		int gypas = ( yg - ref.y ) / ipas;
	for( int ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- )		for( int ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- )
	{		{
	if( jj < 26 )		if( jj < 26 )

common/drawpanel.cpp

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,7 @@ WinEDA_DrawPanel::WinEDA_DrawPanel( WinEDA_DrawFrame* parent, int id,
	m_AbortEnable = m_AbortRequest = false;		m_AbortEnable = m_AbortRequest = false;
	m_AutoPAN_Enable = TRUE;		m_AutoPAN_Enable = TRUE;
	m_IgnoreMouseEvents = 0;		m_IgnoreMouseEvents = 0;
			m_DisableEraseBG = false;

	ManageCurseur = NULL;		ManageCurseur = NULL;
	ForceCloseManageCurseur = NULL;		ForceCloseManageCurseur = NULL;
	@@ -673,7 +674,7 @@ void WinEDA_DrawPanel::OnPaint( wxPaintEvent& event )
	// call ~wxDCClipper() before ~wxPaintDC()		// call ~wxDCClipper() before ~wxPaintDC()
	{		{
	wxDCClipper dcclip( paintDC, PaintClipBox );		wxDCClipper dcclip( paintDC, PaintClipBox );
	ReDraw( &paintDC, true );		ReDraw( &paintDC, m_DisableEraseBG ? false : true );
	}		}

	m_ClipBox = tmp;		m_ClipBox = tmp;
	@@ -914,6 +915,13 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
	tmpDC.DrawPoint( 0, ypos );		tmpDC.DrawPoint( 0, ypos );
	}		}

			// Use the layer bitmap itself as a mask when blitting.
			// The bitmap cannot be referenced by a device context
			// when setting the mask.
			tmpDC.SelectObject( wxNullBitmap );
			tmpBM.SetMask( new wxMask( tmpBM, MakeColour( g_DrawBgColor ) ) );
			tmpDC.SelectObject( tmpBM );

	ypos = GRMapY( org.y );		ypos = GRMapY( org.y );
	for( ii = 0; ; ii += increment )		for( ii = 0; ; ii += increment )
	{		{
	@@ -925,7 +933,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
	continue;		continue;
	if( xpos > m_ClipBox.GetEnd().x) // end of active area reached.		if( xpos > m_ClipBox.GetEnd().x) // end of active area reached.
	break;		break;
	DC->Blit( xpos, ypos, 1, screenSize.y, &tmpDC, 0, 0 );		DC->Blit( xpos, ypos, 1, screenSize.y, &tmpDC, 0, 0, wxCOPY, true );
	}		}

	#endif		#endif

Admin message