fix bad class_pcb.cpp file (d44521fe) · Commits · Elphel / kicad-source-mirror

pcbnew/class_pad.cpp

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -212,13 +212,7 @@ void D_PAD::Copy( D_PAD* source )
	/** Virtual function GetClearance		/** Virtual function GetClearance
	* returns the clearance in internal units. If \a aItem is not NULL then the		* returns the clearance in internal units. If \a aItem is not NULL then the
	* returned clearance is the greater of this object's clearance and		* returned clearance is the greater of this object's clearance and
	* aItem's clearance. If \a aItem is NULL, then this objects		* aItem's clearance. If \a aItem is NULL, then this object clearance is returned.
	<<<<<<< TREE
	* clearance is returned.
	=======
	* clearance
	* is returned.
	>>>>>>> MERGE-SOURCE
	* @param aItem is another BOARD_CONNECTED_ITEM or NULL		* @param aItem is another BOARD_CONNECTED_ITEM or NULL
	* @return int - the clearance in internal units.		* @return int - the clearance in internal units.
	*/		*/
	@@ -234,17 +228,10 @@ int D_PAD::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const
	clearance = ( (MODULE*) GetParent() )->m_LocalClearance;		clearance = ( (MODULE*) GetParent() )->m_LocalClearance;
	}		}

	<<<<<<< TREE
	if( clearance == 0 ) // If the parent footprint clearance value = 0, use NETCLASS value
	return BOARD_CONNECTED_ITEM::GetClearance( aItem );

	// We have a specific clearance
	=======
	if( clearance == 0 ) // If the parent footprint clearance value = 0, use NETCLASS value		if( clearance == 0 ) // If the parent footprint clearance value = 0, use NETCLASS value
	return BOARD_CONNECTED_ITEM::GetClearance( aItem );		return BOARD_CONNECTED_ITEM::GetClearance( aItem );

	// We have a specific clearance.		// We have a specific clearance.
	>>>>>>> MERGE-SOURCE
	// if aItem, return the biggest clearance		// if aItem, return the biggest clearance
	if( aItem )		if( aItem )
	{		{

pcbnew/menubar_pcbframe.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -336,7 +336,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
	*/		*/
	/* Zoom In */		/* Zoom In */
	text = AddHotkeyName( _( "Zoom In" ), s_Pcbnew_Editor_Hokeys_Descr,		text = AddHotkeyName( _( "Zoom In" ), s_Pcbnew_Editor_Hokeys_Descr,
	HK_ZOOM_IN );		HK_ZOOM_IN, false );
	item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text,		item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text,
	HELP_ZOOM_IN, wxITEM_NORMAL );		HELP_ZOOM_IN, wxITEM_NORMAL );
	item->SetBitmap( zoom_in_xpm );		item->SetBitmap( zoom_in_xpm );
	@@ -344,7 +344,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()

	/* Zoom Out */		/* Zoom Out */
	text = AddHotkeyName( _( "Zoom Out" ), s_Pcbnew_Editor_Hokeys_Descr,		text = AddHotkeyName( _( "Zoom Out" ), s_Pcbnew_Editor_Hokeys_Descr,
	HK_ZOOM_OUT );		HK_ZOOM_OUT, false );
	item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text,		item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text,
	HELP_ZOOM_OUT, wxITEM_NORMAL );		HELP_ZOOM_OUT, wxITEM_NORMAL );

	@@ -376,7 +376,6 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
	viewMenu->AppendSeparator();		viewMenu->AppendSeparator();

	/* 3D Display */		/* 3D Display */
	wxMenu* Display3DMenu = new wxMenu;
	item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,		item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
	_( "3D Display" ),		_( "3D Display" ),
	_( "Show board in 3D viewer" ) );		_( "Show board in 3D viewer" ) );
	@@ -477,6 +476,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
	item = new wxMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT,		item = new wxMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT,
	_( "Drill and Place Offset" ),		_( "Drill and Place Offset" ),
	_( "Place the offset adjust for drill and place files" ));		_( "Place the offset adjust for drill and place files" ));
			item->SetBitmap( pcb_offset_xpm );
	placeMenu->Append( item );		placeMenu->Append( item );

	/* Grid Origin */		/* Grid Origin */

Admin message