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
a6bd3314
Commit
a6bd3314
authored
Mar 03, 2015
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed warnings.
parent
161b3602
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
seg.cpp
common/geometry/seg.cpp
+0
-1
pns_diff_pair.cpp
pcbnew/router/pns_diff_pair.cpp
+5
-4
pns_walkaround.cpp
pcbnew/router/pns_walkaround.cpp
+1
-1
No files found.
common/geometry/seg.cpp
View file @
a6bd3314
...
@@ -35,7 +35,6 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
...
@@ -35,7 +35,6 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
{
{
VECTOR2I
d
=
B
-
A
;
VECTOR2I
d
=
B
-
A
;
ecoord
dist_sq
=
(
ecoord
)
aDist
*
aDist
;
ecoord
dist_sq
=
(
ecoord
)
aDist
*
aDist
;
ecoord
dist_sq_thr
=
(
ecoord
)
(
aDist
+
1
)
*
(
aDist
+
1
);
SEG
::
ecoord
l_squared
=
d
.
Dot
(
d
);
SEG
::
ecoord
l_squared
=
d
.
Dot
(
d
);
SEG
::
ecoord
t
=
d
.
Dot
(
aP
-
A
);
SEG
::
ecoord
t
=
d
.
Dot
(
aP
-
A
);
...
...
pcbnew/router/pns_diff_pair.cpp
View file @
a6bd3314
...
@@ -235,7 +235,7 @@ bool PNS_DIFF_PAIR::BuildInitial( PNS_DP_GATEWAY& aEntry, PNS_DP_GATEWAY &aTarge
...
@@ -235,7 +235,7 @@ bool PNS_DIFF_PAIR::BuildInitial( PNS_DP_GATEWAY& aEntry, PNS_DP_GATEWAY &aTarge
if
(
p
.
Intersects
(
n
)
)
if
(
p
.
Intersects
(
n
)
)
return
false
;
return
false
;
return
true
;
return
true
;
}
}
...
@@ -625,19 +625,20 @@ void PNS_DP_GATEWAYS::BuildGeneric( const VECTOR2I& p0_p, const VECTOR2I& p0_n,
...
@@ -625,19 +625,20 @@ void PNS_DP_GATEWAYS::BuildGeneric( const VECTOR2I& p0_p, const VECTOR2I& p0_n,
{
{
OPT_VECTOR2I
ips
[
2
],
m
;
OPT_VECTOR2I
ips
[
2
],
m
;
m
=
OPT_VECTOR2I
();
ips
[
0
]
=
d_n
[
i
].
IntersectLines
(
d_p
[
j
]
);
ips
[
0
]
=
d_n
[
i
].
IntersectLines
(
d_p
[
j
]
);
ips
[
1
]
=
st_p
[
i
].
IntersectLines
(
st_n
[
j
]
);
ips
[
1
]
=
st_p
[
i
].
IntersectLines
(
st_n
[
j
]
);
if
(
d_n
[
i
].
Collinear
(
d_p
[
j
]
)
)
if
(
d_n
[
i
].
Collinear
(
d_p
[
j
]
)
)
ips
[
0
]
=
OPT_VECTOR2I
();
ips
[
0
]
=
OPT_VECTOR2I
();
if
(
st_p
[
i
].
Collinear
(
st_p
[
j
]
)
)
if
(
st_p
[
i
].
Collinear
(
st_p
[
j
]
)
)
ips
[
1
]
=
OPT_VECTOR2I
();
ips
[
1
]
=
OPT_VECTOR2I
();
// diagonal-diagonal and straight-straight cases - the most typical case if the pads
// diagonal-diagonal and straight-straight cases - the most typical case if the pads
// are on the same straight/diagonal line
// are on the same straight/diagonal line
for
(
int
k
=
0
;
k
<
2
;
k
++
)
for
(
int
k
=
0
;
k
<
2
;
k
++
)
{
{
m
=
ips
[
k
];
m
=
*
ips
[
k
];
if
(
m
&&
*
m
!=
p0_p
&&
*
m
!=
p0_n
)
if
(
m
&&
*
m
!=
p0_p
&&
*
m
!=
p0_n
)
{
{
int
prio
=
(
padDist
>
padToGapThreshold
*
m_gap
?
10
:
20
);
int
prio
=
(
padDist
>
padToGapThreshold
*
m_gap
?
10
:
20
);
...
...
pcbnew/router/pns_walkaround.cpp
View file @
a6bd3314
...
@@ -136,7 +136,7 @@ PNS_WALKAROUND::WALKAROUND_STATUS PNS_WALKAROUND::Route( const PNS_LINE& aInitia
...
@@ -136,7 +136,7 @@ PNS_WALKAROUND::WALKAROUND_STATUS PNS_WALKAROUND::Route( const PNS_LINE& aInitia
PNS_LINE
&
aWalkPath
,
bool
aOptimize
)
PNS_LINE
&
aWalkPath
,
bool
aOptimize
)
{
{
PNS_LINE
path_cw
(
aInitialPath
),
path_ccw
(
aInitialPath
);
PNS_LINE
path_cw
(
aInitialPath
),
path_ccw
(
aInitialPath
);
WALKAROUND_STATUS
s_cw
,
s_ccw
;
//
= IN_PROGRESS, s_ccw = IN_PROGRESS;
WALKAROUND_STATUS
s_cw
=
IN_PROGRESS
,
s_ccw
=
IN_PROGRESS
;
SHAPE_LINE_CHAIN
best_path
;
SHAPE_LINE_CHAIN
best_path
;
start
(
aInitialPath
);
start
(
aInitialPath
);
...
...
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