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

Eeschema: fix an old bug: sometimes E hotkey (and some other' hot keys) was... 

Eeschema: fix an old bug: sometimes E hotkey (and some other' hot keys)  was editing a previously selected item, not the item under the mouse cursor
Templates: remove useless backup files
parent dd519d68

eeschema/eeschema.cpp

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ bool EDA_APP::OnInit() 
    /* Load file specified in the command line. */

    if( filename.IsOk() )

    {

        wxLogDebug( wxT( "Loading schematic file " ) + filename.GetFullPath() );



        if( filename.GetExt() != SchematicFileExtension )

            filename.SetExt( SchematicFileExtension );

eeschema/general.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ class TRANSFORM; 
#define SCHEMATIC_HEAD_STRING "Schematic File Version"



#define TXTMARGE 10                 // Offset in mils for placement of labels and pin numbers.

#define DEFAULT_TEXT_SIZE   50  /* Default size for field texts */



#define GR_DEFAULT_DRAWMODE GR_COPY

eeschema/hotkeys.cpp

+5 −0
Original line number Diff line number Diff line
@@ -492,6 +492,11 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, 
    case HK_EDIT_COMPONENT_VALUE:           // Edit component value field.

    case HK_EDIT_COMPONENT_FOOTPRINT:       // Edit component footprint field.

        {

            // force a new item search on hot keys at current position,

            // if there is no currently edited item,

            // to avoid using a previously selected item

            if( ! itemInEdit )

                screen->SetCurItem( NULL );

            EDA_HOTKEY_CLIENT_DATA data( aPosition );

            cmd.SetInt( hotKey->m_Idcommand );

            cmd.SetClientObject( &data );

eeschema/lib_collectors.cpp

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ SEARCH_RESULT LIB_COLLECTOR::Inspect( EDA_ITEM* aItem, const void* aTestData ) 
{

    LIB_ITEM* item = (LIB_ITEM*) aItem;



    wxLogDebug( wxT( "Inspecting item %s, unit %d, convert %d" ),

                GetChars( item->GetSelectMenuText() ), item->GetUnit(), item->GetConvert() );

//    wxLogDebug( wxT( "Inspecting item %s, unit %d, convert %d" ),

//                GetChars( item->GetSelectMenuText() ), item->GetUnit(), item->GetConvert() );



    if( ( m_data.m_unit && item->GetUnit() && ( m_data.m_unit != item->GetUnit() ) )

        || ( m_data.m_convert && item->GetConvert() && ( m_data.m_convert != item->GetConvert() ) )

eeschema/lib_pin.h

+0 −6
Original line number Diff line number Diff line
@@ -31,13 +31,7 @@ 


#include <lib_draw_item.h>





#define TARGET_PIN_RADIUS   12  /* Circle diameter drawn at the active end of pins */



#define DEFAULT_TEXT_SIZE   50  /* Default size for field texts */

#define PART_NAME_LEN       15  /* Maximum length of part name. */

#define PREFIX_NAME_LEN     5   /* Maximum length of prefix (IC, R, SW etc.). */

#define PIN_WIDTH           100 /* Width between 2 pins in internal units. */

#define PIN_LENGTH          300 /* Default Length of each pin to be drawn. */



#if defined(KICAD_GOST)