haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alter selection mode based on drag direction 

LEFT > RIGHT = Enclosed selection
RIGHT > LEFT = Touching selection
This commit is contained in:
Oliver Walters 2017-04-21 00:20:56 +10:00 committed by Maciej Suminski
parent d4e41c4f97
commit ef25ffbab7
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/preview_items/selection_area.h
View File

@ -76,6 +76,10 @@ public:
return wxT( "SELECTION_AREA" );
}
VECTOR2I GetOrigin() const { return m_origin; }
VECTOR2I GetEnd() const { return m_end; }
private:
/**

35
pcbnew/tools/selection_tool.cpp
View File

@ -500,21 +500,50 @@ bool SELECTION_TOOL::selectMultiple()
// Mark items within the selection box as selected
std::vector<KIGFX::VIEW::LAYER_ITEM_PAIR> selectedItems;
// Filter the view items based on the selection box
BOX2I selectionBox = area.ViewBBox();
view->Query( selectionBox, selectedItems ); // Get the list of selected items
std::vector<KIGFX::VIEW::LAYER_ITEM_PAIR>::iterator it, it_end;
int width = area.GetEnd().x - area.GetOrigin().x;
int height = area.GetEnd().y - area.GetOrigin().y;
// Construct an EDA_RECT to determine BOARD_ITEM selection
EDA_RECT selectionRect( wxPoint( area.GetOrigin().x, area.GetOrigin().y ),
wxSize( width, height ) );
selectionRect.Normalize();
for( it = selectedItems.begin(), it_end = selectedItems.end(); it != it_end; ++it )
{
BOARD_ITEM* item = static_cast<BOARD_ITEM*>( it->first );
// Add only those items that are visible and fully within the selection box
if( !item->IsSelected() && selectable( item ) &&
selectionBox.Contains( item->ViewBBox() ) )
/* Selection mode depends on direction of drag-selection:
* Left > Right : Select objects that are fully enclosed by selection
* Right > Left : Select objects that are crossed by selection
*/
// Add only those items that are visible
if( !item->IsSelected() && selectable( item ) )
{
if( item->HitTest( selectionRect, width >= 0) )
{
select( item );
}
}
/*
// Selecting left->right requires full enclosure
if ( xDelta >= 0 && selectionBox.Contains( item->ViewBBox() ) )
{
select( item );
}
// Selecting right->left requires only
else if
*/
}
if( m_selection.Size() == 1 )