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
63bc40b5
Commit
63bc40b5
authored
Feb 03, 2014
by
Maciej Suminski
Committed by
Dick Hollenbeck
Feb 03, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Takes into account hidden module text settings.
parents
15bfac3f
8e601974
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
17 deletions
+24
-17
class_text_mod.cpp
pcbnew/class_text_mod.cpp
+23
-16
ratsnest_data.cpp
pcbnew/ratsnest_data.cpp
+1
-1
No files found.
pcbnew/class_text_mod.cpp
View file @
63bc40b5
...
@@ -417,28 +417,35 @@ EDA_ITEM* TEXTE_MODULE::Clone() const
...
@@ -417,28 +417,35 @@ EDA_ITEM* TEXTE_MODULE::Clone() const
void
TEXTE_MODULE
::
ViewGetLayers
(
int
aLayers
[],
int
&
aCount
)
const
void
TEXTE_MODULE
::
ViewGetLayers
(
int
aLayers
[],
int
&
aCount
)
const
{
{
switch
(
m_Type
)
if
(
m_NoShow
)
// Hidden text
{
{
case
TEXT_is_REFERENCE
:
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_TEXT_INVISIBLE
);
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_REFERENCES_VISIBLE
);
}
break
;
else
{
case
TEXT_is_VALUE
:
switch
(
m_Type
)
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_VALUES_VISIBLE
);
break
;
default
:
switch
(
GetParent
()
->
GetLayer
()
)
{
{
case
LAYER_N_BACK
:
case
TEXT_is_REFERENCE
:
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_
TEXT_BK_VISIBLE
);
// how about SILKSCREEN_N_BACK?
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_
REFERENCES_VISIBLE
);
break
;
break
;
case
LAYER_N_FRONT
:
case
TEXT_is_VALUE
:
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_TEXT_FR_VISIBLE
);
// how about SILKSCREEN_N_FRONT?
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_VALUES_VISIBLE
);
break
;
default
:
switch
(
GetParent
()
->
GetLayer
()
)
{
case
LAYER_N_BACK
:
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_TEXT_BK_VISIBLE
);
// how about SILKSCREEN_N_BACK?
break
;
case
LAYER_N_FRONT
:
aLayers
[
0
]
=
ITEM_GAL_LAYER
(
MOD_TEXT_FR_VISIBLE
);
// how about SILKSCREEN_N_FRONT?
break
;
}
break
;
break
;
}
}
break
;
}
}
aCount
=
1
;
aCount
=
1
;
...
...
pcbnew/ratsnest_data.cpp
View file @
63bc40b5
...
@@ -240,7 +240,7 @@ void RN_NET::compute()
...
@@ -240,7 +240,7 @@ void RN_NET::compute()
return
;
return
;
}
}
else
if
(
boardNodes
.
size
()
=
=
1
)
// This case is even simpler
else
if
(
boardNodes
.
size
()
<
=
1
)
// This case is even simpler
{
{
m_rnEdges
.
reset
(
new
std
::
vector
<
RN_EDGE_PTR
>
(
0
)
);
m_rnEdges
.
reset
(
new
std
::
vector
<
RN_EDGE_PTR
>
(
0
)
);
...
...
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