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
fb590c72
Commit
fb590c72
authored
Sep 09, 2014
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix PCB Module Editor Help Error.
Remove a minor compil warning in shape_collisions.cpp
parent
032b7cb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
shape_collisions.cpp
common/geometry/shape_collisions.cpp
+8
-7
moduleframe.cpp
pcbnew/moduleframe.cpp
+5
-0
No files found.
common/geometry/shape_collisions.cpp
View file @
fb590c72
...
...
@@ -61,7 +61,7 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_CIRCLE& aB, int aC
const
VECTOR2I
size
=
aA
.
GetSize
();
const
int
r
=
aB
.
GetRadius
();
const
int
min_dist
=
aClearance
+
r
;
const
VECTOR2I
vts
[]
=
{
VECTOR2I
(
p0
.
x
,
p0
.
y
),
...
...
@@ -107,7 +107,7 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_CIRCLE& aB, int aC
if
(
!
aNeedMTV
)
return
true
;
if
(
inside
)
aMTV
=
-
delta
.
Resize
(
abs
(
min_dist
+
1
+
nearest_seg_dist
)
+
1
);
else
...
...
@@ -152,7 +152,7 @@ static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_LINE_CHAIN& aB,
if
(
!
aNeedMTV
||
!
found
)
return
found
;
SHAPE_CIRCLE
cmoved
(
aA
);
VECTOR2I
f_total
(
0
,
0
);
...
...
@@ -162,7 +162,7 @@ static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_LINE_CHAIN& aB,
cmoved
.
SetCenter
(
cmoved
.
GetCenter
()
+
f
);
f_total
+=
f
;
}
aMTV
=
f_total
;
return
found
;
}
...
...
@@ -246,13 +246,13 @@ bool CollideShapes( const SHAPE* aA, const SHAPE* aB, int aClearance, bool aNeed
case
SH_RECT
:
switch
(
aB
->
Type
()
)
{
case
SH_CIRCLE
:
case
SH_CIRCLE
:
return
CollCase
<
SHAPE_RECT
,
SHAPE_CIRCLE
>
(
aA
,
aB
,
aClearance
,
aNeedMTV
,
aMTV
);
case
SH_LINE_CHAIN
:
case
SH_LINE_CHAIN
:
return
CollCase
<
SHAPE_RECT
,
SHAPE_LINE_CHAIN
>
(
aA
,
aB
,
aClearance
,
aNeedMTV
,
aMTV
);
case
SH_SEGMENT
:
case
SH_SEGMENT
:
return
CollCase
<
SHAPE_RECT
,
SHAPE_SEGMENT
>
(
aA
,
aB
,
aClearance
,
aNeedMTV
,
aMTV
);
default
:
...
...
@@ -320,6 +320,7 @@ bool CollideShapes( const SHAPE* aA, const SHAPE* aB, int aClearance, bool aNeed
}
bool
unsupported_collision
=
true
;
(
void
)
unsupported_collision
;
// make gcc quiet
assert
(
unsupported_collision
==
false
);
...
...
pcbnew/moduleframe.cpp
View file @
fb590c72
...
...
@@ -138,6 +138,11 @@ BEGIN_EVENT_TABLE( FOOTPRINT_EDIT_FRAME, PCB_BASE_FRAME )
EVT_MENU
(
ID_PCB_PAD_SETUP
,
FOOTPRINT_EDIT_FRAME
::
Process_Special_Functions
)
EVT_MENU
(
ID_PCB_USER_GRID_SETUP
,
FOOTPRINT_EDIT_FRAME
::
Process_Special_Functions
)
// Menu Help
EVT_MENU
(
wxID_HELP
,
EDA_DRAW_FRAME
::
GetKicadHelp
)
EVT_MENU
(
wxID_INDEX
,
EDA_DRAW_FRAME
::
GetKicadHelp
)
EVT_MENU
(
wxID_ABOUT
,
EDA_BASE_FRAME
::
GetKicadAbout
)
// Menu 3D Frame
EVT_MENU
(
ID_MENU_PCB_SHOW_3D_FRAME
,
FOOTPRINT_EDIT_FRAME
::
Show3D_Frame
)
...
...
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