more amazing free software (14cd0109) · Commits · Elphel / kicad-source-mirror

pcbnew/class_board.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -944,11 +944,10 @@ void BOARD::Show( int nestLevel, std::ostream& os )
		p->Show( nestLevel+2, os );
		NestedSpace( nestLevel+1, os ) << "</zones>\n";

		NestedSpace( nestLevel+1, os ) << "<zoneedges>\n";
		p = m_CurrentLimitZone;
		for( ; p; p = p->Next() )
		p->Show( nestLevel+2, os );
		NestedSpace( nestLevel+1, os ) << "</zoneedges>\n";
		NestedSpace( nestLevel+1, os ) << "<zone_container>\n";
		for( ZONE_CONTAINERS::iterator i=m_ZoneDescriptorList.begin(); i!=m_ZoneDescriptorList.end(); ++i )
		(*i)->Show( nestLevel+2, os );
		NestedSpace( nestLevel+1, os ) << "</zone_container>\n";

		p = (BOARD_ITEM*) m_Son;
		for( ; p; p = p->Next() )

pcbnew/class_board.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,11 @@ class BOARD : public BOARD_ITEM
		friend class WinEDA_PcbFrame;

		private:
		std::vector<MARKER*> m_markers; ///< MARKERs for clearance problems, owned by pointer
		std::vector<ZONE_CONTAINER*> m_ZoneDescriptorList; ///< edge zone descriptors, owned by pointer
		typedef std::vector<MARKER*> MARKERS; // @todo: switch to boost:ptr_vector, and change ~BOARD()
		MARKERS m_markers; ///< MARKERs for clearance problems, owned by pointer

		typedef std::vector<ZONE_CONTAINER*> ZONE_CONTAINERS; // @todo: switch to boost::ptr_vector, and change ~BOARD()
		ZONE_CONTAINERS m_ZoneDescriptorList; ///< edge zone descriptors, owned by pointer

		public:
		WinEDA_BasePcbFrame* m_PcbFrame; // Window de visualisation

pcbnew/dsn.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,7 @@ const static KEYWORD tokens[] = {
		TOKDEF(plane),
		TOKDEF(pn),
		TOKDEF(point),
		TOKDEF(polyline_path), // used by freerouting.com
		TOKDEF(polygon),
		TOKDEF(position),
		TOKDEF(positive_diagonal),

pcbnew/dsn.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,7 @@ enum DSN_T {
		T_plane,
		T_pn,
		T_point,
		T_polyline_path,
		T_polygon,
		T_position,
		T_positive_diagonal,

pcbnew/specctra.cpp

+12 −4

Original line number	Diff line number	Diff line
		@@ -826,6 +826,8 @@ void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) throw( IOError )
		doCIRCLE( (CIRCLE*) growth->shape );
		break;

		case T_polyline_path:
		tok = T_path;
		case T_path:
		case T_polygon:
		if( growth->shape )
		@@ -883,6 +885,8 @@ void SPECCTRA_DB::doWINDOW( WINDOW* growth ) throw( IOError )
		doCIRCLE( (CIRCLE*) growth->shape );
		break;

		case T_polyline_path:
		tok = T_path;
		case T_path:
		case T_polygon:
		if( growth->shape )
		@@ -2002,6 +2006,8 @@ void SPECCTRA_DB::doSHAPE( SHAPE* growth ) throw( IOError )
		tok = nextTok();
		switch( tok )
		{
		case T_polyline_path:
		tok = T_path;
		case T_rect:
		case T_circle:
		case T_path:
		@@ -2715,6 +2721,8 @@ void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IOError )
		doCIRCLE( (CIRCLE*) growth->shape );
		break;

		case T_polyline_path:
		tok = T_path;
		case T_path:
		case T_polygon:
		if( growth->shape )
		@@ -2747,7 +2755,7 @@ void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IOError )
		tok = nextTok();
		if( tok!=T_fix && tok!=T_route && tok!=T_normal && tok!=T_protect )
		expecting( "fix\|route\|normal\|protect" );
		growth->type = tok;
		growth->wire_type = tok;
		needRIGHT();
		break;

		@@ -2854,7 +2862,7 @@ void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth ) throw( IOError )
		tok = nextTok();
		if( tok!=T_fix && tok!=T_route && tok!=T_normal && tok!=T_protect )
		expecting( "fix\|route\|normal\|protect" );
		growth->type = tok;
		growth->via_type = tok;
		needRIGHT();
		break;

		@@ -3468,7 +3476,7 @@ PCB* SPECCTRA_DB::MakePCB()
		pcb->structure->rules = new RULE( pcb->structure, T_rule );

		pcb->placement = new PLACEMENT( pcb );
		pcb->placement->flip_style = T_mirror_first;
		//pcb->placement->flip_style = T_mirror_first;

		pcb->library = new LIBRARY( pcb );

Admin message