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
6d1417ba
Commit
6d1417ba
authored
Jul 09, 2014
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SELECTION_TOOL in edit module mode does not try to select MODULEs.
parent
8e90a616
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
collectors.cpp
pcbnew/collectors.cpp
+10
-1
collectors.h
pcbnew/collectors.h
+7
-1
controle.cpp
pcbnew/controle.cpp
+2
-2
selection_tool.cpp
pcbnew/tools/selection_tool.cpp
+1
-1
No files found.
pcbnew/collectors.cpp
View file @
6d1417ba
...
@@ -86,7 +86,7 @@ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
...
@@ -86,7 +86,7 @@ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
};
};
const
KICAD_T
GENERAL_COLLECTOR
::
Module
Item
s
[]
=
{
const
KICAD_T
GENERAL_COLLECTOR
::
Modules
[]
=
{
PCB_MODULE_T
,
PCB_MODULE_T
,
EOT
EOT
};
};
...
@@ -118,12 +118,21 @@ const KICAD_T GENERAL_COLLECTOR::ModulesAndTheirItems[] = {
...
@@ -118,12 +118,21 @@ const KICAD_T GENERAL_COLLECTOR::ModulesAndTheirItems[] = {
};
};
const
KICAD_T
GENERAL_COLLECTOR
::
ModuleItems
[]
=
{
PCB_MODULE_TEXT_T
,
PCB_MODULE_EDGE_T
,
PCB_PAD_T
,
EOT
};
const
KICAD_T
GENERAL_COLLECTOR
::
Tracks
[]
=
{
const
KICAD_T
GENERAL_COLLECTOR
::
Tracks
[]
=
{
PCB_TRACE_T
,
PCB_TRACE_T
,
PCB_VIA_T
,
PCB_VIA_T
,
EOT
EOT
};
};
const
KICAD_T
GENERAL_COLLECTOR
::
Zones
[]
=
{
const
KICAD_T
GENERAL_COLLECTOR
::
Zones
[]
=
{
PCB_ZONE_AREA_T
,
PCB_ZONE_AREA_T
,
EOT
EOT
...
...
pcbnew/collectors.h
View file @
6d1417ba
...
@@ -262,7 +262,7 @@ public:
...
@@ -262,7 +262,7 @@ public:
/**
/**
* A scan list for only MODULEs
* A scan list for only MODULEs
*/
*/
static
const
KICAD_T
Module
Item
s
[];
static
const
KICAD_T
Modules
[];
/**
/**
...
@@ -282,6 +282,12 @@ public:
...
@@ -282,6 +282,12 @@ public:
static
const
KICAD_T
ModulesAndTheirItems
[];
static
const
KICAD_T
ModulesAndTheirItems
[];
/**
* A scan list for primary module items.
*/
static
const
KICAD_T
ModuleItems
[];
/**
/**
* A scan list for only TRACKS
* A scan list for only TRACKS
*/
*/
...
...
pcbnew/controle.cpp
View file @
6d1417ba
...
@@ -119,7 +119,7 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode )
...
@@ -119,7 +119,7 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode )
else
if
(
GetToolId
()
==
ID_NO_TOOL_SELECTED
)
else
if
(
GetToolId
()
==
ID_NO_TOOL_SELECTED
)
{
{
if
(
m_mainToolBar
->
GetToolToggled
(
ID_TOOLBARH_PCB_MODE_MODULE
)
)
if
(
m_mainToolBar
->
GetToolToggled
(
ID_TOOLBARH_PCB_MODE_MODULE
)
)
scanList
=
GENERAL_COLLECTOR
::
Module
Item
s
;
scanList
=
GENERAL_COLLECTOR
::
Modules
;
else
else
scanList
=
(
DisplayOpt
.
DisplayZonesMode
==
0
)
?
scanList
=
(
DisplayOpt
.
DisplayZonesMode
==
0
)
?
GENERAL_COLLECTOR
::
AllBoardItems
:
GENERAL_COLLECTOR
::
AllBoardItems
:
...
@@ -138,7 +138,7 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode )
...
@@ -138,7 +138,7 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode )
break
;
break
;
case
ID_PCB_MODULE_BUTT
:
case
ID_PCB_MODULE_BUTT
:
scanList
=
GENERAL_COLLECTOR
::
Module
Item
s
;
scanList
=
GENERAL_COLLECTOR
::
Modules
;
break
;
break
;
case
ID_PCB_ZONES_BUTT
:
case
ID_PCB_ZONES_BUTT
:
...
...
pcbnew/tools/selection_tool.cpp
View file @
6d1417ba
...
@@ -234,7 +234,7 @@ bool SELECTION_TOOL::selectSingle( const VECTOR2I& aWhere, bool aAllowDisambigua
...
@@ -234,7 +234,7 @@ bool SELECTION_TOOL::selectSingle( const VECTOR2I& aWhere, bool aAllowDisambigua
const
KICAD_T
types
[]
=
{
PCB_TRACE_T
,
PCB_VIA_T
,
PCB_LINE_T
,
EOT
};
// preferred types
const
KICAD_T
types
[]
=
{
PCB_TRACE_T
,
PCB_VIA_T
,
PCB_LINE_T
,
EOT
};
// preferred types
if
(
m_editModules
)
if
(
m_editModules
)
collector
.
Collect
(
getModel
<
BOARD
>
(),
GENERAL_COLLECTOR
::
Module
sAndTheir
Items
,
collector
.
Collect
(
getModel
<
BOARD
>
(),
GENERAL_COLLECTOR
::
ModuleItems
,
wxPoint
(
aWhere
.
x
,
aWhere
.
y
),
guide
);
wxPoint
(
aWhere
.
x
,
aWhere
.
y
),
guide
);
else
else
collector
.
Collect
(
getModel
<
BOARD
>
(),
GENERAL_COLLECTOR
::
AllBoardItems
,
collector
.
Collect
(
getModel
<
BOARD
>
(),
GENERAL_COLLECTOR
::
AllBoardItems
,
...
...
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