reorder GENERAL_COLLECTOR lists in collectors.cpp due to markers change (8d90da0a) · Commits · Elphel / kicad-source-mirror

pcbnew/class_mire.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -215,7 +215,6 @@ bool MIREPCB::HitTest( const wxPoint& refPos )
	int dX = refPos.x - m_Pos.x;		int dX = refPos.x - m_Pos.x;
	int dY = refPos.y - m_Pos.y;		int dY = refPos.y - m_Pos.y;
	int rayon = m_Size / 2;		int rayon = m_Size / 2;

	return abs(dX)<=rayon && abs(dY)<=rayon;		return abs(dX)<=rayon && abs(dY)<=rayon;
	}		}

pcbnew/collectors.cpp

+131 −112

Original line number	Original line	Diff line number	Diff line
	@@ -27,49 +27,48 @@


	/* This module contains out of line member functions for classes given in		/* This module contains out of line member functions for classes given in
	collectors.h. Those classes augment the functionality of class WinEDA_PcbFrame.		* collectors.h. Those classes augment the functionality of class WinEDA_PcbFrame.
	*/		*/


	// see collectors.h		// see collectors.h
	const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {		const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {

	// there are some restrictions on the order of items in the general case.		// there are some restrictions on the order of items in the general case.
	// all items in m_Drawings for instance should be contiguous.		// all items in m_Drawings for instance should be contiguous.
	TYPETEXTE,		// * all items in a same list (shown here) must be contigous **
	TYPEDRAWSEGMENT,		TYPEMARKER, // in m_markers
	TYPEMARKER,		TYPETEXTE, // in m_Drawings
	TYPECOTATION,		TYPEDRAWSEGMENT, // in m_Drawings
	TYPEMIRE,		TYPECOTATION, // in m_Drawings
	TYPEVIA,		TYPEMIRE, // in m_Drawings
	TYPETRACK,		TYPEVIA, // in m_Tracks
	TYPEPAD,		TYPETRACK, // in m_Tracks
	TYPETEXTEMODULE,		TYPEPAD, // in modules
	TYPEMODULE,		TYPETEXTEMODULE, // in modules
	TYPEZONE,		TYPEMODULE, // in m_Modules
	TYPEZONE_CONTAINER,		TYPEZONE, // in m_Zones
			TYPEZONE_CONTAINER, // in m_ZoneDescriptorList
	EOT		EOT
	};		};


	/*		/*
	const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {		* const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {
	TYPETEXTE,		* TYPETEXTE,
	TYPEDRAWSEGMENT,		* TYPEDRAWSEGMENT,
	TYPEMARKER,		* TYPECOTATION,
	TYPECOTATION,		* TYPEVIA,
	TYPEVIA,		* TYPETRACK,
	TYPETRACK,		* TYPEMODULE,
	TYPEMODULE,		* EOT
	EOT		* };
	};
	*/		*/


	const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {		const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
			TYPEMARKER,
	TYPETEXTE,		TYPETEXTE,
	TYPEDRAWSEGMENT,		TYPEDRAWSEGMENT,
	TYPEMARKER,
	TYPECOTATION,		TYPECOTATION,
	TYPEMIRE,		TYPEMIRE,
	TYPEVIA,		TYPEVIA,
	@@ -138,6 +137,7 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*

	#if 0 // debugging		#if 0 // debugging
	static int breakhere = 0;		static int breakhere = 0;

	switch( item->Type() )		switch( item->Type() )
	{		{
	case TYPEPAD:		case TYPEPAD:
	@@ -149,24 +149,31 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
	}		}
	}		}
	break;		break;

	case TYPEVIA:		case TYPEVIA:
	breakhere++;		breakhere++;
	break;		break;

	case TYPETRACK:		case TYPETRACK:
	breakhere++;		breakhere++;
	break;		break;

	case TYPEZONE:		case TYPEZONE:
	breakhere++;		breakhere++;
	break;		break;

	case TYPETEXTE:		case TYPETEXTE:
	breakhere++;		breakhere++;
	break;		break;

	case TYPEDRAWSEGMENT:		case TYPEDRAWSEGMENT:
	breakhere++;		breakhere++;
	break;		break;

	case TYPECOTATION:		case TYPECOTATION:
	breakhere++;		breakhere++;
	break;		break;

	case TYPETEXTEMODULE:		case TYPETEXTEMODULE:
	{		{
	TEXTE_MODULE* tm = (TEXTE_MODULE*) item;		TEXTE_MODULE* tm = (TEXTE_MODULE*) item;
	@@ -176,6 +183,7 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
	}		}
	}		}
	break;		break;

	case TYPEMODULE:		case TYPEMODULE:
	{		{
	MODULE* m = (MODULE*) item;		MODULE* m = (MODULE*) item;
	@@ -190,12 +198,14 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*
	breakhere++;		breakhere++;
	break;		break;
	}		}

	#endif		#endif


	switch( item->Type() )		switch( item->Type() )
	{		{
	case TYPEPAD:		case TYPEPAD:

	// if pad is a thru hole, then it can be visible when its parent module is not.		// if pad is a thru hole, then it can be visible when its parent module is not.
	if( ( (D_PAD*) item )->m_Attribut != PAD_SMD ) // a hole is present, so multiple layers		if( ( (D_PAD*) item )->m_Attribut != PAD_SMD ) // a hole is present, so multiple layers
	{		{
	@@ -209,19 +219,28 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_BaseStruct* testItem, const void*

	case TYPEVIA:		case TYPEVIA:
	break;		break;

	case TYPETRACK:		case TYPETRACK:
	break;		break;

	case TYPEZONE:		case TYPEZONE:
	break;		break;

	case TYPEZONE_CONTAINER:		case TYPEZONE_CONTAINER:
	break;		break;

	case TYPETEXTE:		case TYPETEXTE:
	break;		break;

	case TYPEDRAWSEGMENT:		case TYPEDRAWSEGMENT:
	break;		break;

	case TYPECOTATION:		case TYPECOTATION:
	break;		break;

			case TYPEMIRE:
			break;

	case TYPETEXTEMODULE:		case TYPETEXTEMODULE:
	module = (MODULE*) item->GetParent();		module = (MODULE*) item->GetParent();

pcbnew/zones_by_polygon.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -459,12 +459,15 @@ EDGE_ZONE* WinEDA_PcbFrame::Begin_Zone( wxDC* DC )

	if( diag == ZONE_ABORT )		if( diag == ZONE_ABORT )
	return NULL;		return NULL;

			GetScreen()->m_Active_Layer = s_Zone_Layer; // Set by the dialog frame
	}		}
	else /* Start a new contour: init zone params (net and layer) from an existing zone */		else /* Start a new contour: init zone params (net and layer) from an existing zone */
	{		{
	GetScreen()->m_Active_Layer = s_Zone_Layer = s_CurrentZone->GetLayer();		GetScreen()->m_Active_Layer = s_Zone_Layer = s_CurrentZone->GetLayer();
	s_Zone_Hatching = s_CurrentZone->m_Poly->GetHatchStyle();		s_Zone_Hatching = s_CurrentZone->m_Poly->GetHatchStyle();
	}		}

	/* Show the Net */		/* Show the Net */
	if( g_HightLigt_Status && (g_HightLigth_NetCode != s_NetcodeSelection) )		if( g_HightLigt_Status && (g_HightLigth_NetCode != s_NetcodeSelection) )
	{		{

Admin message