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
000f1122
Commit
000f1122
authored
Sep 04, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved selection marking boxes to a different layer.
parent
44bafd1c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
8 deletions
+10
-8
layers_id_colors_and_visibility.h
include/layers_id_colors_and_visibility.h
+2
-1
basepcbframe.cpp
pcbnew/basepcbframe.cpp
+1
-0
class_dimension.cpp
pcbnew/class_dimension.cpp
+1
-1
class_module.cpp
pcbnew/class_module.cpp
+1
-1
class_pcb_text.cpp
pcbnew/class_pcb_text.cpp
+1
-1
class_text_mod.cpp
pcbnew/class_text_mod.cpp
+1
-1
pcb_painter.cpp
pcbnew/pcb_painter.cpp
+3
-3
No files found.
include/layers_id_colors_and_visibility.h
View file @
000f1122
...
@@ -240,6 +240,7 @@ enum PCB_VISIBLE
...
@@ -240,6 +240,7 @@ enum PCB_VISIBLE
PAD_BK_NETNAMES_VISIBLE
,
PAD_BK_NETNAMES_VISIBLE
,
PADS_NETNAMES_VISIBLE
,
PADS_NETNAMES_VISIBLE
,
SELECTION
,
GP_OVERLAY
,
// General purpose overlay
GP_OVERLAY
,
// General purpose overlay
END_PCB_VISIBLE_LIST
// sentinel
END_PCB_VISIBLE_LIST
// sentinel
...
@@ -258,7 +259,7 @@ enum PCB_VISIBLE
...
@@ -258,7 +259,7 @@ enum PCB_VISIBLE
/// means that layer is displayed closer to the user, ie. on the top).
/// means that layer is displayed closer to the user, ie. on the top).
const
LAYER_NUM
GalLayerOrder
[]
=
const
LAYER_NUM
GalLayerOrder
[]
=
{
{
ITEM_GAL_LAYER
(
GP_OVERLAY
),
ITEM_GAL_LAYER
(
GP_OVERLAY
),
ITEM_GAL_LAYER
(
SELECTION
),
ITEM_GAL_LAYER
(
PADS_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PADS_NETNAMES_VISIBLE
),
DRAW_N
,
COMMENT_N
,
ECO1_N
,
ECO2_N
,
EDGE_N
,
DRAW_N
,
COMMENT_N
,
ECO1_N
,
ECO2_N
,
EDGE_N
,
UNUSED_LAYER_29
,
UNUSED_LAYER_30
,
UNUSED_LAYER_31
,
UNUSED_LAYER_29
,
UNUSED_LAYER_30
,
UNUSED_LAYER_31
,
...
...
pcbnew/basepcbframe.cpp
View file @
000f1122
...
@@ -831,6 +831,7 @@ void PCB_BASE_FRAME::LoadSettings()
...
@@ -831,6 +831,7 @@ void PCB_BASE_FRAME::LoadSettings()
view
->
SetRequired
(
ITEM_GAL_LAYER
(
PADS_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PADS_VISIBLE
)
);
view
->
SetRequired
(
ITEM_GAL_LAYER
(
PADS_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PADS_VISIBLE
)
);
view
->
SetRequired
(
ITEM_GAL_LAYER
(
PAD_FR_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PAD_FR_VISIBLE
)
);
view
->
SetRequired
(
ITEM_GAL_LAYER
(
PAD_FR_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PAD_FR_VISIBLE
)
);
view
->
SetRequired
(
ITEM_GAL_LAYER
(
PAD_BK_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PAD_BK_VISIBLE
)
);
view
->
SetRequired
(
ITEM_GAL_LAYER
(
PAD_BK_NETNAMES_VISIBLE
),
ITEM_GAL_LAYER
(
PAD_BK_VISIBLE
)
);
view
->
SetLayerTarget
(
ITEM_GAL_LAYER
(
SELECTION
),
KiGfx
::
TARGET_OVERLAY
);
view
->
SetLayerTarget
(
ITEM_GAL_LAYER
(
GP_OVERLAY
),
KiGfx
::
TARGET_OVERLAY
);
view
->
SetLayerTarget
(
ITEM_GAL_LAYER
(
GP_OVERLAY
),
KiGfx
::
TARGET_OVERLAY
);
// Apply layer coloring scheme & display options
// Apply layer coloring scheme & display options
...
...
pcbnew/class_dimension.cpp
View file @
000f1122
...
@@ -495,7 +495,7 @@ void DIMENSION::ViewGetLayers( int aLayers[], int& aCount ) const
...
@@ -495,7 +495,7 @@ void DIMENSION::ViewGetLayers( int aLayers[], int& aCount ) const
aLayers
[
0
]
=
m_Layer
;
aLayers
[
0
]
=
m_Layer
;
// On the general purpose overlay there is a selection box displayed
// On the general purpose overlay there is a selection box displayed
aLayers
[
1
]
=
ITEM_GAL_LAYER
(
GP_OVERLAY
);
aLayers
[
1
]
=
ITEM_GAL_LAYER
(
SELECTION
);
aCount
=
2
;
aCount
=
2
;
}
}
...
...
pcbnew/class_module.cpp
View file @
000f1122
...
@@ -1028,5 +1028,5 @@ void MODULE::SetOrientation( double newangle )
...
@@ -1028,5 +1028,5 @@ void MODULE::SetOrientation( double newangle )
void
MODULE
::
ViewGetLayers
(
int
aLayers
[],
int
&
aCount
)
const
void
MODULE
::
ViewGetLayers
(
int
aLayers
[],
int
&
aCount
)
const
{
{
aCount
=
1
;
aCount
=
1
;
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
GP_OVERLAY
);
// Selection box
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
SELECTION
);
// Selection box
}
}
pcbnew/class_pcb_text.cpp
View file @
000f1122
...
@@ -231,7 +231,7 @@ void TEXTE_PCB::ViewGetLayers( int aLayers[], int& aCount ) const
...
@@ -231,7 +231,7 @@ void TEXTE_PCB::ViewGetLayers( int aLayers[], int& aCount ) const
aLayers
[
0
]
=
m_Layer
;
aLayers
[
0
]
=
m_Layer
;
// On the general purpose overlay there is a selection box displayed
// On the general purpose overlay there is a selection box displayed
aLayers
[
1
]
=
ITEM_GAL_LAYER
(
GP_OVERLAY
);
aLayers
[
1
]
=
ITEM_GAL_LAYER
(
SELECTION
);
aCount
=
2
;
aCount
=
2
;
}
}
pcbnew/class_text_mod.cpp
View file @
000f1122
...
@@ -473,7 +473,7 @@ void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
...
@@ -473,7 +473,7 @@ void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
}
}
// On the general purpose overlay there is a selection box displayed
// On the general purpose overlay there is a selection box displayed
aLayers
[
1
]
=
ITEM_GAL_LAYER
(
GP_OVERLAY
);
aLayers
[
1
]
=
ITEM_GAL_LAYER
(
SELECTION
);
aCount
=
2
;
aCount
=
2
;
}
}
pcbnew/pcb_painter.cpp
View file @
000f1122
...
@@ -698,7 +698,7 @@ void PCB_PAINTER::draw( const MODULE* aModule )
...
@@ -698,7 +698,7 @@ void PCB_PAINTER::draw( const MODULE* aModule )
void
PCB_PAINTER
::
draw
(
const
TEXTE_PCB
*
aText
,
int
aLayer
)
void
PCB_PAINTER
::
draw
(
const
TEXTE_PCB
*
aText
,
int
aLayer
)
{
{
if
(
aLayer
==
ITEM_GAL_LAYER
(
GP_OVERLAY
)
)
if
(
aLayer
==
ITEM_GAL_LAYER
(
SELECTION
)
)
{
{
if
(
aText
->
IsSelected
()
)
if
(
aText
->
IsSelected
()
)
drawSelectionBox
(
aText
);
drawSelectionBox
(
aText
);
...
@@ -722,7 +722,7 @@ void PCB_PAINTER::draw( const TEXTE_PCB* aText, int aLayer )
...
@@ -722,7 +722,7 @@ void PCB_PAINTER::draw( const TEXTE_PCB* aText, int aLayer )
void
PCB_PAINTER
::
draw
(
const
TEXTE_MODULE
*
aText
,
int
aLayer
)
void
PCB_PAINTER
::
draw
(
const
TEXTE_MODULE
*
aText
,
int
aLayer
)
{
{
if
(
aLayer
==
ITEM_GAL_LAYER
(
GP_OVERLAY
)
)
if
(
aLayer
==
ITEM_GAL_LAYER
(
SELECTION
)
)
{
{
if
(
aText
->
IsSelected
()
)
if
(
aText
->
IsSelected
()
)
drawSelectionBox
(
aText
);
drawSelectionBox
(
aText
);
...
@@ -816,7 +816,7 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aZone )
...
@@ -816,7 +816,7 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aZone )
void
PCB_PAINTER
::
draw
(
const
DIMENSION
*
aDimension
,
int
aLayer
)
void
PCB_PAINTER
::
draw
(
const
DIMENSION
*
aDimension
,
int
aLayer
)
{
{
if
(
aLayer
==
ITEM_GAL_LAYER
(
GP_OVERLAY
)
)
if
(
aLayer
==
ITEM_GAL_LAYER
(
SELECTION
)
)
{
{
if
(
aDimension
->
IsSelected
()
)
if
(
aDimension
->
IsSelected
()
)
drawSelectionBox
(
aDimension
);
drawSelectionBox
(
aDimension
);
...
...
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