Commit 0c1a87ca authored by Maciej Suminski's avatar Maciej Suminski
Browse files

selection_tool: Added SelectItem and UnselectItem actions.

parent 823623ac

pcbnew/tools/common_actions.cpp

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ TOOL_ACTION COMMON_ACTIONS::selectionCursor( "pcbnew.InteractiveSelection.Cursor 
        AS_GLOBAL, 0,

        "", "" );    // No description, it is not supposed to be shown anywhere



TOOL_ACTION COMMON_ACTIONS::selectItem( "pcbnew.InteractiveSelection.SelectItem",

        AS_GLOBAL, 0,

        "", "" );    // No description, it is not supposed to be shown anywhere



TOOL_ACTION COMMON_ACTIONS::unselectItem( "pcbnew.InteractiveSelection.UnselectItem",

        AS_GLOBAL, 0,

        "", "" );    // No description, it is not supposed to be shown anywhere



TOOL_ACTION COMMON_ACTIONS::selectionClear( "pcbnew.InteractiveSelection.Clear",

        AS_GLOBAL, 0,

        "", "" );    // No description, it is not supposed to be shown anywhere

pcbnew/tools/common_actions.h

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ public: 
    /// Clears the current selection

    static TOOL_ACTION selectionClear;



    /// Selects an item (specified as the event parameter).

    static TOOL_ACTION selectItem;



    /// Unselects an item (specified as the event parameter).

    static TOOL_ACTION unselectItem;



    // Edit Tool

    /// Activation of the edit tool

    static TOOL_ACTION editActivate;

pcbnew/tools/selection_tool.cpp

+49 −2
Original line number Diff line number Diff line
@@ -187,6 +187,16 @@ int SELECTION_TOOL::Main( TOOL_EVENT& aEvent ) 
            findMove( *evt );

        }



        else if( evt->IsAction( &COMMON_ACTIONS::selectItem ) )

        {

            SelectItem( *evt );

        }



        else if( evt->IsAction( &COMMON_ACTIONS::unselectItem ) )

        {

            UnselectItem( *evt );

        }



        else if( evt->IsCancel() || evt->Action() == TA_UNDO_REDO ||

                 evt->IsAction( &COMMON_ACTIONS::selectionClear ) )

        {
@@ -397,6 +407,8 @@ void SELECTION_TOOL::setTransitions() 
    Go( &SELECTION_TOOL::Main, COMMON_ACTIONS::selectionActivate.MakeEvent() );

    Go( &SELECTION_TOOL::CursorSelection, COMMON_ACTIONS::selectionCursor.MakeEvent() );

    Go( &SELECTION_TOOL::ClearSelection, COMMON_ACTIONS::selectionClear.MakeEvent() );

    Go( &SELECTION_TOOL::SelectItem, COMMON_ACTIONS::selectItem.MakeEvent() );

    Go( &SELECTION_TOOL::UnselectItem, COMMON_ACTIONS::unselectItem.MakeEvent() );

    Go( &SELECTION_TOOL::find, COMMON_ACTIONS::find.MakeEvent() );

    Go( &SELECTION_TOOL::findMove, COMMON_ACTIONS::findMove.MakeEvent() );

}
@@ -461,6 +473,43 @@ int SELECTION_TOOL::ClearSelection( TOOL_EVENT& aEvent ) 
    return 0;

}



int SELECTION_TOOL::SelectItem( TOOL_EVENT& aEvent )

{

    // Check if there is an item to be selected

    BOARD_ITEM* item = static_cast<BOARD_ITEM*>( aEvent.Parameter() );



    if( item )

    {

        select( item );



        // Inform other potentially interested tools

        TOOL_EVENT select( SelectedEvent );

        m_toolMgr->ProcessEvent( select );

    }



    setTransitions();



    return 0;

}



int SELECTION_TOOL::UnselectItem( TOOL_EVENT& aEvent )

{

    // Check if there is an item to be selected

    BOARD_ITEM* item = static_cast<BOARD_ITEM*>( aEvent.Parameter() );



    if( item )

    {

        unselect( item );



        // Inform other potentially interested tools

        TOOL_EVENT unselect( UnselectedEvent );

        m_toolMgr->ProcessEvent( unselect );

    }



    setTransitions();



    return 0;

}



void SELECTION_TOOL::findCallback( BOARD_ITEM* aItem )

{
@@ -525,8 +574,6 @@ void SELECTION_TOOL::clearSelection() 
    // Inform other potentially interested tools

    TOOL_EVENT clearEvent( ClearedEvent );

    m_toolMgr->ProcessEvent( clearEvent );



    return;

}

pcbnew/tools/selection_tool.h

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ public: 
    ///> Clear current selection event handler.

    int ClearSelection( TOOL_EVENT& aEvent );



    ///> Item selection event handler.

    int SelectItem( TOOL_EVENT& aEvent );



    ///> Item unselection event handler.

    int UnselectItem( TOOL_EVENT& aEvent );



    ///> Event sent after an item is selected.

    const TOOL_EVENT SelectedEvent;