Merge selection tool branch. (f0251ebd) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -149,6 +149,13 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" )		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" )
	endif()		endif()

			find_package( OpenMP QUIET )
			if( OPENMP_FOUND )
			set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
			set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
			add_definitions( -DUSE_OPENMP )
			endif()

	if( MINGW )		if( MINGW )
	set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )		set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )

common/CMakeLists.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -219,6 +219,8 @@ set( PCB_COMMON_SRCS
	../pcbnew/class_zone.cpp		../pcbnew/class_zone.cpp
	../pcbnew/class_zone_settings.cpp		../pcbnew/class_zone_settings.cpp
	../pcbnew/classpcb.cpp		../pcbnew/classpcb.cpp
			../pcbnew/ratsnest_data.cpp
			../pcbnew/ratsnest_viewitem.cpp
	../pcbnew/collectors.cpp		../pcbnew/collectors.cpp
	../pcbnew/netlist_reader.cpp		../pcbnew/netlist_reader.cpp
	../pcbnew/legacy_netlist_reader.cpp		../pcbnew/legacy_netlist_reader.cpp

common/class_undoredo_container.cpp

+19 −7

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ PICKED_ITEMS_LIST::~PICKED_ITEMS_LIST()
	}		}


	void PICKED_ITEMS_LIST::PushItem( ITEM_PICKER& aItem )		void PICKED_ITEMS_LIST::PushItem( const ITEM_PICKER& aItem )
	{		{
	m_ItemsList.push_back( aItem );		m_ItemsList.push_back( aItem );
	}		}
	@@ -70,7 +70,7 @@ ITEM_PICKER PICKED_ITEMS_LIST::PopItem()
	}		}


	bool PICKED_ITEMS_LIST::ContainsItem( EDA_ITEM* aItem ) const		bool PICKED_ITEMS_LIST::ContainsItem( const EDA_ITEM* aItem ) const
	{		{
	for( size_t i = 0; i < m_ItemsList.size(); i++ )		for( size_t i = 0; i < m_ItemsList.size(); i++ )
	{		{
	@@ -82,6 +82,18 @@ bool PICKED_ITEMS_LIST::ContainsItem( EDA_ITEM* aItem ) const
	}		}


			int PICKED_ITEMS_LIST::FindItem( const EDA_ITEM* aItem ) const
			{
			for( size_t i = 0; i < m_ItemsList.size(); i++ )
			{
			if( m_ItemsList[i].GetItem() == aItem )
			return i;
			}

			return -1;
			}


	void PICKED_ITEMS_LIST::ClearItemsList()		void PICKED_ITEMS_LIST::ClearItemsList()
	{		{
	m_ItemsList.clear();		m_ItemsList.clear();
	@@ -157,7 +169,7 @@ void PICKED_ITEMS_LIST::ClearListAndDeleteItems()
	}		}


	ITEM_PICKER PICKED_ITEMS_LIST::GetItemWrapper( unsigned int aIdx )		ITEM_PICKER PICKED_ITEMS_LIST::GetItemWrapper( unsigned int aIdx ) const
	{		{
	ITEM_PICKER picker;		ITEM_PICKER picker;

	@@ -168,7 +180,7 @@ ITEM_PICKER PICKED_ITEMS_LIST::GetItemWrapper( unsigned int aIdx )
	}		}


	EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx )		EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx ) const
	{		{
	if( aIdx < m_ItemsList.size() )		if( aIdx < m_ItemsList.size() )
	return m_ItemsList[aIdx].GetItem();		return m_ItemsList[aIdx].GetItem();
	@@ -177,7 +189,7 @@ EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItem( unsigned int aIdx )
	}		}


	EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx )		EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx ) const
	{		{
	if( aIdx < m_ItemsList.size() )		if( aIdx < m_ItemsList.size() )
	return m_ItemsList[aIdx].GetLink();		return m_ItemsList[aIdx].GetLink();
	@@ -186,7 +198,7 @@ EDA_ITEM* PICKED_ITEMS_LIST::GetPickedItemLink( unsigned int aIdx )
	}		}


	UNDO_REDO_T PICKED_ITEMS_LIST::GetPickedItemStatus( unsigned int aIdx )		UNDO_REDO_T PICKED_ITEMS_LIST::GetPickedItemStatus( unsigned int aIdx ) const
	{		{
	if( aIdx < m_ItemsList.size() )		if( aIdx < m_ItemsList.size() )
	return m_ItemsList[aIdx].GetStatus();		return m_ItemsList[aIdx].GetStatus();
	@@ -195,7 +207,7 @@ UNDO_REDO_T PICKED_ITEMS_LIST::GetPickedItemStatus( unsigned int aIdx )
	}		}


	STATUS_FLAGS PICKED_ITEMS_LIST::GetPickerFlags( unsigned aIdx )		STATUS_FLAGS PICKED_ITEMS_LIST::GetPickerFlags( unsigned aIdx ) const
	{		{
	if( aIdx < m_ItemsList.size() )		if( aIdx < m_ItemsList.size() )
	return m_ItemsList[aIdx].GetFlags();		return m_ItemsList[aIdx].GetFlags();

common/drawpanel_gal.cpp

+15 −12

Original line number	Original line	Diff line number	Diff line
	@@ -81,10 +81,13 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
	Connect( wxEVT_MOTION, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MOTION, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_LEFT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_LEFT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_LEFT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_LEFT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
			Connect( wxEVT_LEFT_DCLICK, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_RIGHT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_RIGHT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_RIGHT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_RIGHT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
			Connect( wxEVT_RIGHT_DCLICK, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_MIDDLE_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MIDDLE_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_MIDDLE_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MIDDLE_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
			Connect( wxEVT_MIDDLE_DCLICK, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_MOUSEWHEEL, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MOUSEWHEEL, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_CHAR_HOOK, wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ) );		Connect( wxEVT_CHAR_HOOK, wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ) );
	Connect( wxEVT_KEY_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_KEY_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

common/gal/cairo/cairo_gal.cpp

+11 −8

Original line number	Original line	Diff line number	Diff line
	@@ -60,10 +60,13 @@ CAIRO_GAL::CAIRO_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
	Connect( wxEVT_MOTION, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_MOTION, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
			Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
			Connect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
			Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	#if defined _WIN32 \|\| defined _WIN64		#if defined _WIN32 \|\| defined _WIN64
	Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	#endif		#endif

Admin message