Commit fb8a6bf1 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Libedit: actual line thickness taken in account by collector. Thick lines are... 

Libedit: actual line thickness  taken in account by collector. Thick lines are now more easy to locate. Fix incorrect boundary box calculations for LIB_PIN items. Very minor other fixes.
parent 0b91eb30

common/build_version.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-05-12)"

#define KICAD_BUILD_VERSION "(2011-05-25)"

#endif

eeschema/dialogs/dialog_eeschema_options_base.cpp

+3 −3
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Nov 17 2010)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -151,7 +151,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	m_panel1->SetSizer( p1mainSizer );

	m_panel1->Layout();

	p1mainSizer->Fit( m_panel1 );

	m_notebook1->AddPage( m_panel1, _("General Options"), false );

	m_notebook1->AddPage( m_panel1, _("General Options"), true );

	m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );

	m_panel2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );

	m_panel2->SetToolTip( _("User defined field names for schematic components. ") );
@@ -240,7 +240,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	m_panel2->SetSizer( bSizer6 );

	m_panel2->Layout();

	bSizer6->Fit( m_panel2 );

	m_notebook1->AddPage( m_panel2, _("Template Field Names"), true );

	m_notebook1->AddPage( m_panel2, _("Template Field Names"), false );

	

	bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 );

eeschema/dialogs/dialog_eeschema_options_base.fbp

+1263 −2

File changed.

Preview size limit exceeded, changes collapsed.

eeschema/dialogs/dialog_eeschema_options_base.h

+2 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Nov 17 2010)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

eeschema/lib_arc.cpp

+4 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ bool LIB_ARC::Load( char* aLine, wxString& aErrorMsg ) 


bool LIB_ARC::HitTest( const wxPoint& aRefPoint )

{

    int mindist = m_Width ? m_Width / 2 : g_DrawDefaultLineThickness / 2;

    int mindist = GetPenSize() / 2;



    // Have a minimal tolerance for hit test

    if( mindist < MINIMUM_SELECTION_DISTANCE )
@@ -172,6 +172,9 @@ bool LIB_ARC::HitTest( const wxPoint& aRefPoint ) 
bool LIB_ARC::HitTest( wxPoint aPosition, int aThreshold, const TRANSFORM& aTransform )

{



    if( aThreshold < 0 )

        aThreshold = GetPenSize() / 2;



    // TODO: use aTransMat to calculates parameters

    wxPoint relativePosition = aPosition;