Commit 4c6f7bc1 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

FIX: insert key must repeat text labels

parent c0832a03

eeschema/bus-wire-junction.cpp

+0 −2
Original line number Diff line number Diff line
@@ -434,7 +434,6 @@ void SCH_EDIT_FRAME::RepeatDrawItem( wxDC* DC ) 
    SCH_ITEM* my_clone = (SCH_ITEM*) repeater->Clone();



    // If cloning a component then put into 'move' mode.

    /* please tell me where components are snapshotted via SetRepeatItem()

    if( my_clone->Type() == SCH_COMPONENT_T )

    {

        wxPoint pos = GetCrossHairPosition() -
@@ -447,7 +446,6 @@ void SCH_EDIT_FRAME::RepeatDrawItem( wxDC* DC ) 
        MoveItem( my_clone, DC );

    }

    else

    */

    {

        my_clone->Move( wxPoint( g_RepeatStep.GetWidth(), g_RepeatStep.GetHeight() ) );

eeschema/hotkeys.cpp

+5 −2
Original line number Diff line number Diff line
@@ -385,8 +385,11 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, 
        break;



    case HK_REPEAT_LAST:

        if( notBusy && GetRepeatItem() && ( GetRepeatItem()->GetFlags() == 0 ) )

        if( notBusy && GetRepeatItem() )

        {

            //if( GetRepeatItem()->GetFlags() == 0 )

                RepeatDrawItem( aDC );

        }

        break;



    case HK_END_CURR_LINEWIREBUS:

eeschema/onleftclick.cpp

+2 −11
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
            m_CurrentSheet->Pop();

            DisplayCurrentSheet();

        }



        break;



    case ID_NOCONN_BUTT:
@@ -210,7 +209,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_ADD_IMAGE_BUTT:
@@ -223,7 +221,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_LABEL_BUTT:
@@ -236,7 +233,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_GLABEL_BUTT:
@@ -255,7 +251,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_SHEET_SYMBOL_BUTT:
@@ -273,7 +268,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_IMPORT_HLABEL_BUTT:
@@ -295,7 +289,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_SCH_PLACE_COMPONENT:
@@ -308,7 +301,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    case ID_PLACE_POWER_BUTT:
@@ -322,7 +314,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) 
        {

            addCurrentItemToList( aDC );

        }



        break;



    default:

eeschema/schframe.cpp

+6 −1
Original line number Diff line number Diff line
@@ -294,8 +294,13 @@ void SCH_EDIT_FRAME::SetRepeatItem( SCH_ITEM* aItem ) 
    if( cur != old )

    {

        if( cur )

        {

            aItem = (SCH_ITEM*) cur->Clone();



            // Clone() preserves the flags, we want 'em cleared.

            aItem->ClearFlags();

        }



        m_item_to_repeat = aItem;



        delete old;