Eeschema: fix 2 issues. (f0afa230) · Commits · Elphel / kicad-source-mirror

eeschema/lib_pin.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -336,7 +336,9 @@ void LIB_PIN::SetShape( int aShape )

	for( size_t i = 0; i < pinList.size(); i++ )		for( size_t i = 0; i < pinList.size(); i++ )
	{		{
	if( ( pinList[i]->m_Flags & IS_LINKED ) == 0 \|\| pinList[i]->m_shape == aShape )		if( ( pinList[i]->m_Flags & IS_LINKED ) == 0
			\|\| pinList[i]->m_Convert != m_Convert
			\|\| pinList[i]->m_shape == aShape )
	continue;		continue;

	pinList[i]->m_shape = aShape;		pinList[i]->m_shape = aShape;

eeschema/libedit_onrightclick.cpp

+17 −23

Original line number	Original line	Diff line number	Diff line
	@@ -33,36 +33,30 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )
	LIB_DRAW_ITEM* DrawEntry = LocateItemUsingCursor();		LIB_DRAW_ITEM* DrawEntry = LocateItemUsingCursor();
	bool BlockActive = GetScreen()->IsBlockActive();		bool BlockActive = GetScreen()->IsBlockActive();

			if( BlockActive )
			{
			AddMenusForBlock( PopMenu, this );
			PopMenu->AppendSeparator();
			return true;
			}

	if( m_component == NULL )		if( m_component == NULL )
	return true;		return true;

	// If Command in progresss: put the menu "cancel" and "end tool"		// If Command in progress, put menu "cancel"
	if( m_ID_current_state )
	{
	if( DrawEntry && DrawEntry->m_Flags )		if( DrawEntry && DrawEntry->m_Flags )
	{		{
	ADD_MENUITEM( PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING,		ADD_MENUITEM( PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING,
	_( "Cancel" ), cancel_xpm );		_( "Cancel" ), cancel_xpm );
	}
	else
	{
	ADD_MENUITEM( PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING,
	_( "End Tool" ), cancel_tool_xpm );
	}
	PopMenu->AppendSeparator();		PopMenu->AppendSeparator();
	}		}
	else		else if( m_ID_current_state )
	{		{ // If a tool is active, put menu "end tool"
	if( (DrawEntry && DrawEntry->m_Flags) \|\| BlockActive )
	{
	if( BlockActive )
	AddMenusForBlock( PopMenu, this );
	else
	ADD_MENUITEM( PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING,		ADD_MENUITEM( PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING,
	_( "Cancel" ), cancel_xpm );		_( "End Tool" ), cancel_tool_xpm );
	PopMenu->AppendSeparator();		PopMenu->AppendSeparator();
	}		}
	}

	if( DrawEntry )		if( DrawEntry )
	DrawEntry->DisplayInfo( this );		DrawEntry->DisplayInfo( this );

pcbnew/dialogs/dialog_plot_base.cpp

+346 −347

pcbnew/dialogs/dialog_plot_base.fbp

+2735 −3912

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_plot_base.h

+112 −112

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Nov 18 2010)		// C++ code generated with wxFormBuilder (version Sep 8 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -104,7 +104,7 @@ class DIALOG_PLOT_BASE : public wxDialog

	public:		public:

	DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );		DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,723 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
	~DIALOG_PLOT_BASE();		~DIALOG_PLOT_BASE();

	};		};

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Nov 18 2010)		// C++ code generated with wxFormBuilder (version Sep 8 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -34,14 +34,14 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_plotFormatOpt->SetSelection( 0 );		m_plotFormatOpt->SetSelection( 0 );
	bSizer27->Add( m_plotFormatOpt, 0, 0, 5 );		bSizer27->Add( m_plotFormatOpt, 0, 0, 5 );

	bSizer26->Add( bSizer27, 0, wxEXPAND, 5 );		bSizer26->Add( bSizer27, 0, wxEXPAND\|wxRIGHT\|wxLEFT, 5 );

	wxBoxSizer* bSizer28;		wxBoxSizer* bSizer28;
	bSizer28 = new wxBoxSizer( wxVERTICAL );		bSizer28 = new wxBoxSizer( wxVERTICAL );

	m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticTextDir->Wrap( -1 );		m_staticTextDir->Wrap( -1 );
	bSizer28->Add( m_staticTextDir, 0, wxEXPAND\|wxLEFT\|wxTOP, 5 );		bSizer28->Add( m_staticTextDir, 0, wxEXPAND\|wxTOP\|wxLEFT, 5 );

	wxBoxSizer* bSizer29;		wxBoxSizer* bSizer29;
	bSizer29 = new wxBoxSizer( wxHORIZONTAL );		bSizer29 = new wxBoxSizer( wxHORIZONTAL );
	@@ -49,7 +49,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );		m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );

	bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 5 );		bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxRIGHT\|wxLEFT, 5 );

	m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );		m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
	bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL\|wxLEFT\|wxRIGHT, 5 );		bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL\|wxLEFT\|wxRIGHT, 5 );
	@@ -65,7 +65,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );		m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );

	bUpperSizer->Add( m_LayersSizer, 1, wxALL, 3 );		bUpperSizer->Add( m_LayersSizer, 1, wxALL\|wxEXPAND, 3 );

	m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL );		m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL );

	@@ -319,7 +319,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	this->SetSizer( m_MainSizer );		this->SetSizer( m_MainSizer );
	this->Layout();		this->Layout();

Admin message