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
a455ab4a
Commit
a455ab4a
authored
Dec 29, 2013
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs 1264236, 1264238, 1264254
parent
46e82e4e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
9 deletions
+23
-9
drawframe.cpp
common/drawframe.cpp
+1
-1
class_am_param.cpp
gerbview/class_am_param.cpp
+13
-5
class_track.cpp
pcbnew/class_track.cpp
+9
-3
No files found.
common/drawframe.cpp
View file @
a455ab4a
...
@@ -636,7 +636,7 @@ void EDA_DRAW_FRAME::ClearMsgPanel( void )
...
@@ -636,7 +636,7 @@ void EDA_DRAW_FRAME::ClearMsgPanel( void )
void
EDA_DRAW_FRAME
::
SetMsgPanel
(
const
MSG_PANEL_ITEMS
&
aList
)
void
EDA_DRAW_FRAME
::
SetMsgPanel
(
const
MSG_PANEL_ITEMS
&
aList
)
{
{
if
(
m_messagePanel
==
NULL
&&
!
aList
.
empty
()
)
if
(
m_messagePanel
==
NULL
)
return
;
return
;
ClearMsgPanel
();
ClearMsgPanel
();
...
...
gerbview/class_am_param.cpp
View file @
a455ab4a
...
@@ -71,6 +71,7 @@ double AM_PARAM::GetValue( const D_CODE* aDcode ) const
...
@@ -71,6 +71,7 @@ double AM_PARAM::GetValue( const D_CODE* aDcode ) const
double
paramvalue
=
0.0
;
double
paramvalue
=
0.0
;
double
curr_value
=
0.0
;
double
curr_value
=
0.0
;
parm_item_type
state
=
POPVALUE
;
parm_item_type
state
=
POPVALUE
;
for
(
unsigned
ii
=
0
;
ii
<
m_paramStack
.
size
();
ii
++
)
for
(
unsigned
ii
=
0
;
ii
<
m_paramStack
.
size
();
ii
++
)
{
{
AM_PARAM_ITEM
item
=
m_paramStack
[
ii
];
AM_PARAM_ITEM
item
=
m_paramStack
[
ii
];
...
@@ -85,12 +86,19 @@ double AM_PARAM::GetValue( const D_CODE* aDcode ) const
...
@@ -85,12 +86,19 @@ double AM_PARAM::GetValue( const D_CODE* aDcode ) const
case
PUSHPARM
:
case
PUSHPARM
:
// get the parameter from the aDcode
// get the parameter from the aDcode
if
(
aDcode
&&
item
.
GetIndex
()
<=
aDcode
->
GetParamCount
()
)
if
(
aDcode
)
// should be always true here
curr_value
=
aDcode
->
GetParam
(
item
.
GetIndex
()
);
{
else
// Get parameter from local param definition
if
(
item
.
GetIndex
()
<=
aDcode
->
GetParamCount
()
)
curr_value
=
aDcode
->
GetParam
(
item
.
GetIndex
()
);
else
// Get parameter from local param definition
{
const
APERTURE_MACRO
*
am_parent
=
aDcode
->
GetMacro
();
curr_value
=
am_parent
->
GetLocalParam
(
aDcode
,
item
.
GetIndex
()
);
}
}
else
{
{
const
APERTURE_MACRO
*
am_parent
=
aDcode
->
GetMacro
();
wxLogDebug
(
wxT
(
"AM_PARAM::GetValue(): NULL param aDcode
\n
"
)
);
curr_value
=
am_parent
->
GetLocalParam
(
aDcode
,
item
.
GetIndex
()
);
}
}
// Fall through
// Fall through
case
PUSHVALUE
:
// a value is on the stack:
case
PUSHVALUE
:
// a value is on the stack:
...
...
pcbnew/class_track.cpp
View file @
a455ab4a
...
@@ -1154,12 +1154,18 @@ void TRACK::GetMsgPanelInfoBase( std::vector< MSG_PANEL_ITEM >& aList )
...
@@ -1154,12 +1154,18 @@ void TRACK::GetMsgPanelInfoBase( std::vector< MSG_PANEL_ITEM >& aList )
LAYER_NUM
top_layer
,
bottom_layer
;
LAYER_NUM
top_layer
,
bottom_layer
;
Via
->
ReturnLayerPair
(
&
top_layer
,
&
bottom_layer
);
Via
->
ReturnLayerPair
(
&
top_layer
,
&
bottom_layer
);
msg
=
board
->
GetLayerName
(
top_layer
)
+
wxT
(
"/"
)
if
(
board
)
+
board
->
GetLayerName
(
bottom_layer
);
msg
=
board
->
GetLayerName
(
top_layer
)
+
wxT
(
"/"
)
+
board
->
GetLayerName
(
bottom_layer
);
else
msg
.
Printf
(
wxT
(
"%d/%d"
),
top_layer
,
bottom_layer
);
}
}
else
else
{
{
msg
=
board
->
GetLayerName
(
m_Layer
);
if
(
board
)
msg
=
board
->
GetLayerName
(
m_Layer
);
else
msg
.
Printf
(
wxT
(
"%d"
),
m_Layer
);
}
}
aList
.
push_back
(
MSG_PANEL_ITEM
(
_
(
"Layer"
),
msg
,
BROWN
)
);
aList
.
push_back
(
MSG_PANEL_ITEM
(
_
(
"Layer"
),
msg
,
BROWN
)
);
...
...
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