Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
3ce3d22b
Commit
3ce3d22b
authored
Nov 29, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved the SELECTION_TOOL out of the KIGFX namespace.
parent
af976b2d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
selection_tool.cpp
pcbnew/tools/selection_tool.cpp
+7
-8
No files found.
pcbnew/tools/selection_tool.cpp
View file @
3ce3d22b
...
@@ -47,7 +47,6 @@
...
@@ -47,7 +47,6 @@
#include "bright_box.h"
#include "bright_box.h"
#include "common_actions.h"
#include "common_actions.h"
using
namespace
KIGFX
;
using
boost
::
optional
;
using
boost
::
optional
;
SELECTION_TOOL
::
SELECTION_TOOL
()
:
SELECTION_TOOL
::
SELECTION_TOOL
()
:
...
@@ -81,7 +80,7 @@ void SELECTION_TOOL::Reset()
...
@@ -81,7 +80,7 @@ void SELECTION_TOOL::Reset()
int
SELECTION_TOOL
::
Main
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
Main
(
TOOL_EVENT
&
aEvent
)
{
{
VIEW
*
view
=
getView
();
KIGFX
::
VIEW
*
view
=
getView
();
assert
(
getModel
<
BOARD
>
(
PCB_T
)
!=
NULL
);
assert
(
getModel
<
BOARD
>
(
PCB_T
)
!=
NULL
);
...
@@ -176,7 +175,7 @@ void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
...
@@ -176,7 +175,7 @@ void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
void
SELECTION_TOOL
::
clearSelection
()
void
SELECTION_TOOL
::
clearSelection
()
{
{
VIEW_GROUP
::
const_iter
it
,
it_end
;
KIGFX
::
VIEW_GROUP
::
const_iter
it
,
it_end
;
for
(
it
=
m_selection
.
group
->
Begin
(),
it_end
=
m_selection
.
group
->
End
();
it
!=
it_end
;
++
it
)
for
(
it
=
m_selection
.
group
->
Begin
(),
it_end
=
m_selection
.
group
->
End
();
it
!=
it_end
;
++
it
)
{
{
...
@@ -286,7 +285,7 @@ bool SELECTION_TOOL::selectMultiple()
...
@@ -286,7 +285,7 @@ bool SELECTION_TOOL::selectMultiple()
{
{
bool
cancelled
=
false
;
// Was the tool cancelled while it was running?
bool
cancelled
=
false
;
// Was the tool cancelled while it was running?
m_multiple
=
true
;
// Multiple selection mode is active
m_multiple
=
true
;
// Multiple selection mode is active
VIEW
*
view
=
getView
();
KIGFX
::
VIEW
*
view
=
getView
();
getViewControls
()
->
SetAutoPan
(
true
);
getViewControls
()
->
SetAutoPan
(
true
);
view
->
Add
(
m_selArea
);
view
->
Add
(
m_selArea
);
...
@@ -308,7 +307,7 @@ bool SELECTION_TOOL::selectMultiple()
...
@@ -308,7 +307,7 @@ bool SELECTION_TOOL::selectMultiple()
m_selArea
->
SetOrigin
(
evt
->
DragOrigin
()
);
m_selArea
->
SetOrigin
(
evt
->
DragOrigin
()
);
m_selArea
->
SetEnd
(
evt
->
Position
()
);
m_selArea
->
SetEnd
(
evt
->
Position
()
);
m_selArea
->
ViewSetVisible
(
true
);
m_selArea
->
ViewSetVisible
(
true
);
m_selArea
->
ViewUpdate
(
VIEW_ITEM
::
GEOMETRY
);
m_selArea
->
ViewUpdate
(
KIGFX
::
VIEW_ITEM
::
GEOMETRY
);
}
}
if
(
evt
->
IsMouseUp
(
BUT_LEFT
)
)
if
(
evt
->
IsMouseUp
(
BUT_LEFT
)
)
...
@@ -317,11 +316,11 @@ bool SELECTION_TOOL::selectMultiple()
...
@@ -317,11 +316,11 @@ bool SELECTION_TOOL::selectMultiple()
m_selArea
->
ViewSetVisible
(
false
);
m_selArea
->
ViewSetVisible
(
false
);
// Mark items within the selection box as selected
// Mark items within the selection box as selected
std
::
vector
<
VIEW
::
LAYER_ITEM_PAIR
>
selectedItems
;
std
::
vector
<
KIGFX
::
VIEW
::
LAYER_ITEM_PAIR
>
selectedItems
;
BOX2I
selectionBox
=
m_selArea
->
ViewBBox
();
BOX2I
selectionBox
=
m_selArea
->
ViewBBox
();
view
->
Query
(
selectionBox
,
selectedItems
);
// Get the list of selected items
view
->
Query
(
selectionBox
,
selectedItems
);
// Get the list of selected items
std
::
vector
<
VIEW
::
LAYER_ITEM_PAIR
>::
iterator
it
,
it_end
;
std
::
vector
<
KIGFX
::
VIEW
::
LAYER_ITEM_PAIR
>::
iterator
it
,
it_end
;
for
(
it
=
selectedItems
.
begin
(),
it_end
=
selectedItems
.
end
();
it
!=
it_end
;
++
it
)
for
(
it
=
selectedItems
.
begin
(),
it_end
=
selectedItems
.
end
();
it
!=
it_end
;
++
it
)
{
{
...
@@ -405,7 +404,7 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR* aCollector )
...
@@ -405,7 +404,7 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR* aCollector )
}
}
// Removes possible brighten mark
// Removes possible brighten mark
getView
()
->
MarkTargetDirty
(
TARGET_OVERLAY
);
getView
()
->
MarkTargetDirty
(
KIGFX
::
TARGET_OVERLAY
);
// Restore the original menu
// Restore the original menu
SetContextMenu
(
&
m_menu
,
CMENU_BUTTON
);
SetContextMenu
(
&
m_menu
,
CMENU_BUTTON
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment