Eeschema, libedit: fixed add/remove alias functions, broken (25720516) · Commits · Elphel / kicad-source-mirror

common/base_screen.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ BASE_SCREEN::BASE_SCREEN( KICAD_T aType ) : EDA_BaseStruct( aType )
		m_Center = true;
		m_CurrentSheetDesc = &g_Sheet_A4;
		m_IsPrinting = false;
		m_ScrollPixelsPerUnitX = 1;
		m_ScrollPixelsPerUnitY = 1;

		InitDatas();
		}

common/drawframe.cpp

+7 −5

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ WinEDA_DrawFrame::WinEDA_DrawFrame( wxWindow* father, int idtype,
		m_AuxiliaryToolBar = NULL;
		m_SelGridBox = NULL;
		m_SelZoomBox = NULL;
		m_HotkeysZoomAndGridList = NULL;

		DrawPanel = NULL;
		MsgPanel = NULL;
		@@ -442,7 +443,7 @@ int WinEDA_DrawFrame::HandleBlockEnd( wxDC* DC )

		void WinEDA_DrawFrame::AdjustScrollBars()
		{
		int pixelsPerUnitX, pixelsPerUnitY, unitsX, unitsY, posX, posY;
		int unitsX, unitsY, posX, posY;
		wxSize drawingSize, clientSize;
		BASE_SCREEN* screen = GetBaseScreen();

		@@ -488,7 +489,7 @@ void WinEDA_DrawFrame::AdjustScrollBars()
		* pixels per unit to 10, you have potential for the zoom point to
		* jump around +/-5 pixels from the nearest grid point.
		*/
		pixelsPerUnitX = pixelsPerUnitY = 1;
		screen->m_ScrollPixelsPerUnitX = screen->m_ScrollPixelsPerUnitY = 1;

		// Calculate the number of scroll bar units for the given zoom level. */
		#ifdef USE_WX_ZOOM
		@@ -524,11 +525,12 @@ void WinEDA_DrawFrame::AdjustScrollBars()

		#if 0
		wxLogDebug( wxT( "SetScrollbars(%d, %d, %d, %d, %d, %d)" ),
		pixelsPerUnitX, pixelsPerUnitY, unitsX, unitsY, posX, posY );
		m_ScrollPixelsPerUnitX, m_ScrollPixelsPerUnitY,
		unitsX, unitsY, posX, posY );
		#endif

		DrawPanel->SetScrollbars( pixelsPerUnitX,
		pixelsPerUnitY,
		DrawPanel->SetScrollbars( screen->m_ScrollPixelsPerUnitX,
		screen->m_ScrollPixelsPerUnitY,
		screen->m_ScrollbarNumber.x,
		screen->m_ScrollbarNumber.y,
		screen->m_ScrollbarPos.x,

common/drawpanel.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -958,7 +958,7 @@ bool WinEDA_DrawPanel::OnRightClick( wxMouseEvent& event )
		if( !m_Parent->OnRightClick( pos, &MasterMenu ) )
		return false;

		AddMenuZoom( &MasterMenu );
		m_Parent->AddMenuZoomAndGrid( &MasterMenu );

		m_IgnoreMouseEvents = TRUE;
		PopupMenu( &MasterMenu, pos );

common/hotkeys_basic.cpp

+19 −14

Original line number	Diff line number	Diff line
		@@ -240,11 +240,13 @@ wxString ReturnKeyNameFromKeyCode( int keycode )
		* @param CommandId = Command Id value
		* @return text (key name) in a wxString if found or text without modification
		*/
		wxString AddHotkeyName( const wxString& text, Ki_HotkeyInfo** List,
		int CommandId )
		wxString AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
		int aCommandId )
		{
		wxString msg = text;
		wxString keyname = ReturnKeyNameFromCommandId( List, CommandId );
		wxString msg = aText;
		wxString keyname;
		if( aList )
		keyname = ReturnKeyNameFromCommandId( aList, aCommandId );

		if( !keyname.IsEmpty() )
		msg << wxT( "\t" ) << keyname;
		@@ -259,24 +261,27 @@ wxString AddHotkeyName( const wxString& text, Ki_HotkeyInfo** List,
		* @param CommandId = Command Id value
		* @return text (key name) in a wxString if found or text without modification
		*/
		wxString AddHotkeyName( const wxString& text,
		struct Ki_HotkeyInfoSectionDescriptor* DescList,
		int CommandId )
		wxString AddHotkeyName( const wxString& aText,
		struct Ki_HotkeyInfoSectionDescriptor* aDescList,
		int aCommandId )
		{
		wxString msg = text;
		wxString msg = aText;
		wxString keyname;
		Ki_HotkeyInfo** List;

		for( ; DescList->m_HK_InfoList != NULL; DescList++ )
		if( aDescList )
		{
		List = DescList->m_HK_InfoList;
		keyname = ReturnKeyNameFromCommandId( List, CommandId );
		for( ; aDescList->m_HK_InfoList != NULL; aDescList++ )
		{
		List = aDescList->m_HK_InfoList;
		keyname = ReturnKeyNameFromCommandId( List, aCommandId );
		if( !keyname.IsEmpty() )
		{
		msg << wxT( "\t" ) << keyname;
		break;
		}
		}
		}

		return msg;
		}

common/zoom.cpp

+27 −22

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include "class_base_screen.h"
		#include "wxstruct.h"
		#include "kicad_device_context.h"
		#include "hotkeys_basic.h"

		/** Compute draw offset (scroll bars and draw parameters)
		* in order to have the current graphic cursor position at the screen center
		@@ -174,7 +175,7 @@ void WinEDA_DrawFrame::OnZoom( wxCommandEvent& event )
		/* add the zoom list menu the the MasterMenu.
		* used in OnRightClick(wxMouseEvent& event)
		*/
		void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu )
		void WinEDA_DrawFrame::AddMenuZoomAndGrid( wxMenu* MasterMenu )
		{
		size_t i;
		int maxZoomIds;
		@@ -184,58 +185,62 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu )
		GRID_TYPE tmp;
		wxMenu* gridMenu;
		double gridValue;
		BASE_SCREEN * screen = DrawPanel->GetScreen();

		msg = AddHotkeyName( _( "Center" ), m_HotkeysZoomAndGridList, HK_ZOOM_CENTER );
		ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, msg, zoom_center_xpm );
		msg = AddHotkeyName( _( "Zoom in" ), m_HotkeysZoomAndGridList, HK_ZOOM_IN );
		ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_IN, msg, zoom_in_xpm );
		msg = AddHotkeyName( _( "Zoom out" ), m_HotkeysZoomAndGridList, HK_ZOOM_OUT );
		ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_OUT, msg, zoom_out_xpm );
		msg = AddHotkeyName( _( "Redraw view" ), m_HotkeysZoomAndGridList, HK_ZOOM_REDRAW );
		ADD_MENUITEM( MasterMenu, ID_ZOOM_REDRAW, msg, zoom_redraw_xpm );
		msg = AddHotkeyName( _( "Zoom auto" ), m_HotkeysZoomAndGridList, HK_ZOOM_AUTO );
		ADD_MENUITEM( MasterMenu, ID_ZOOM_PAGE, msg, zoom_auto_xpm );

		ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, _( "Center" ),
		zoom_center_xpm );
		ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_IN, _( "Zoom in" ), zoom_in_xpm );
		ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_OUT, _( "Zoom out" ), zoom_out_xpm );
		ADD_MENUITEM( MasterMenu, ID_ZOOM_PAGE, _( "Zoom auto" ), zoom_auto_xpm );

		wxMenu* zoom_choice = new wxMenu;
		ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice,
		ID_POPUP_ZOOM_SELECT, _( "Zoom select" ),
		zoom_select_xpm );

		ADD_MENUITEM( MasterMenu, ID_ZOOM_REDRAW, _( "Redraw view" ),
		zoom_redraw_xpm );

		zoom = GetScreen()->GetZoom();
		zoom = screen->GetZoom();
		maxZoomIds = ID_POPUP_ZOOM_LEVEL_END - ID_POPUP_ZOOM_LEVEL_START;
		maxZoomIds = ( (size_t) maxZoomIds < GetScreen()->m_ZoomList.GetCount() ) ?
		maxZoomIds : GetScreen()->m_ZoomList.GetCount();
		maxZoomIds = ( (size_t) maxZoomIds < screen->m_ZoomList.GetCount() ) ?
		maxZoomIds : screen->m_ZoomList.GetCount();

		/* Populate zoom submenu. */
		for( i = 0; i < (size_t) maxZoomIds; i++ )
		{
		if( ( GetScreen()->m_ZoomList[i] % GetScreen()->m_ZoomScalar ) == 0 )
		if( ( screen->m_ZoomList[i] % screen->m_ZoomScalar ) == 0 )
		msg.Printf( wxT( "%u" ),
		GetScreen()->m_ZoomList[i] / GetScreen()->m_ZoomScalar );
		screen->m_ZoomList[i] / screen->m_ZoomScalar );
		else
		msg.Printf( wxT( "%.1f" ),
		(float) GetScreen()->m_ZoomList[i] /
		GetScreen()->m_ZoomScalar );
		(float) screen->m_ZoomList[i] /
		screen->m_ZoomScalar );

		zoom_choice->Append( ID_POPUP_ZOOM_LEVEL_START + i, _( "Zoom: " ) + msg,
		wxEmptyString, wxITEM_CHECK );
		if( zoom == GetScreen()->m_ZoomList[i] )
		if( zoom == screen->m_ZoomList[i] )
		zoom_choice->Check( ID_POPUP_ZOOM_LEVEL_START + i, true );
		}

		/* Create grid submenu as required. */
		if( !GetScreen()->m_GridList.IsEmpty() )
		if( !screen->m_GridList.IsEmpty() )
		{
		gridMenu = new wxMenu;
		ADD_MENUITEM_WITH_SUBMENU( MasterMenu, gridMenu,
		ID_POPUP_GRID_SELECT, _( "Grid Select" ),
		grid_select_xpm );

		grid = GetScreen()->GetGridSize();
		grid = screen->GetGridSize();

		for( i = 0; i < GetScreen()->m_GridList.GetCount(); i++ )
		for( i = 0; i < screen->m_GridList.GetCount(); i++ )
		{
		tmp = GetScreen()->m_GridList[i];
		tmp = screen->m_GridList[i];
		gridValue = To_User_Unit( g_UnitMetric, tmp.m_Size.x,
		m_Parent->m_InternalUnits );
		m_InternalUnits );

		if( tmp.m_Id == ID_POPUP_GRID_USER )
		{

Admin message