GitLab was upgraded during the server migration. If you cannot sign in, use "Forgot your password?" to reset it — passwords could not be carried over.

Commit 28b93176 authored Nov 01, 2013 by Orson Committed by jean-pierre charras Nov 01, 2013

Fix redraw issue in modedit a modview, with GAL

parent 53e04ce7

CMakeLists.txt

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,9 @@ endif()
	set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/.downloads-by-cmake		set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/.downloads-by-cmake
	CACHE PATH "Location of KiCad downloads, suggested is a dir common to all builds, i.e. global." )		CACHE PATH "Location of KiCad downloads, suggested is a dir common to all builds, i.e. global." )

			#Add option to add user directories for linker, if any
			LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} )

	if( UNIX )		if( UNIX )
	set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specifig KiCad config files" )		set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specifig KiCad config files" )
	elseif( MINGW )		elseif( MINGW )

cvpcb/class_DisplayFootprintsFrame.cpp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -122,8 +122,6 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* parent,
	EDA_PANEINFO mesg;		EDA_PANEINFO mesg;
	mesg.MessageToolbarPane();		mesg.MessageToolbarPane();

	m_galCanvas->Hide();

	m_auimgr.AddPane( m_mainToolBar,		m_auimgr.AddPane( m_mainToolBar,
	wxAuiPaneInfo( horiz ).Name( wxT( "m_mainToolBar" ) ).Top(). Row( 0 ) );		wxAuiPaneInfo( horiz ).Name( wxT( "m_mainToolBar" ) ).Top(). Row( 0 ) );

include/geometry/shape_line_chain.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -188,7 +188,7 @@ public:
	if( aIndex < 0 )		if( aIndex < 0 )
	aIndex += SegmentCount();		aIndex += SegmentCount();

	if( aIndex == ( m_points.size() - 1 ) && m_closed )		if( aIndex == (int)( m_points.size() - 1 ) && m_closed )
	return SEG( m_points[aIndex], m_points[0], aIndex );		return SEG( m_points[aIndex], m_points[0], aIndex );
	else		else
	return SEG( m_points[aIndex], m_points[aIndex + 1], aIndex );		return SEG( m_points[aIndex], m_points[aIndex + 1], aIndex );
	@@ -207,7 +207,7 @@ public:
	if( aIndex < 0 )		if( aIndex < 0 )
	aIndex += SegmentCount();		aIndex += SegmentCount();

	if( aIndex == ( m_points.size() - 1 ) && m_closed )		if( aIndex == (int)( m_points.size() - 1 ) && m_closed )
	return SEG( const_cast<VECTOR2I&>( m_points[aIndex] ),		return SEG( const_cast<VECTOR2I&>( m_points[aIndex] ),
	const_cast<VECTOR2I&>( m_points[0] ), aIndex );		const_cast<VECTOR2I&>( m_points[0] ), aIndex );
	else		else

pcbnew/basepcbframe.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -151,6 +151,8 @@ PCB_BASE_FRAME::PCB_BASE_FRAME( wxWindow* aParent, ID_DRAWFRAME_TYPE aFrameType,

	m_galCanvas = new EDA_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,		m_galCanvas = new EDA_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
	EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL );		EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL );
			// Hide by default, it has to be explicitly shown
			m_galCanvas->Hide();

	m_auxiliaryToolBar = NULL;		m_auxiliaryToolBar = NULL;
	}		}

pcbnew/moduleframe.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -224,11 +224,13 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( PCB_EDIT_FRAME* aParent, FP_LIB_TABL
	m_auimgr.AddPane( m_auxiliaryToolBar,		m_auimgr.AddPane( m_auxiliaryToolBar,
	wxAuiPaneInfo( horiz ).Name( wxT( "m_auxiliaryToolBar" ) ).Top().Row( 1 ) );		wxAuiPaneInfo( horiz ).Name( wxT( "m_auxiliaryToolBar" ) ).Top().Row( 1 ) );

			// The main right vertical toolbar
	m_auimgr.AddPane( m_drawToolBar,		m_auimgr.AddPane( m_drawToolBar,
	wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right() );		wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right().Layer(1) );

			// The left vertical toolbar (fast acces to display options)
	m_auimgr.AddPane( m_optionsToolBar,		m_auimgr.AddPane( m_optionsToolBar,
	wxAuiPaneInfo( vert ).Name( wxT( "m_optionsToolBar" ) ). Left() );		wxAuiPaneInfo( vert ).Name( wxT( "m_optionsToolBar" ) ). Left().Layer(1) );

	m_auimgr.AddPane( m_canvas,		m_auimgr.AddPane( m_canvas,
	wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );		wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );