Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pyMKcam
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
pyMKcam
Commits
bafd5e1d
Commit
bafd5e1d
authored
Mar 10, 2012
by
Whitham D. Reeve II
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor tuple conversion change.
parent
22ea98a4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
DXFImporter.py
pycam/Importers/DXFImporter.py
+5
-6
No files found.
pycam/Importers/DXFImporter.py
View file @
bafd5e1d
...
@@ -757,9 +757,9 @@ class DXFParser(object):
...
@@ -757,9 +757,9 @@ class DXFParser(object):
+
"
%
d and
%
d"
%
(
start_line
,
end_line
))
+
"
%
d and
%
d"
%
(
start_line
,
end_line
))
else
:
else
:
# no color height adjustment for 3DFACE
# no color height adjustment for 3DFACE
point1
=
(
p1
[
0
],
p1
[
1
],
p1
[
2
]
)
point1
=
tuple
(
p1
)
point2
=
(
p2
[
0
],
p2
[
1
],
p2
[
2
]
)
point2
=
tuple
(
p2
)
point3
=
(
p3
[
0
],
p3
[
1
],
p3
[
2
]
)
point3
=
tuple
(
p3
)
triangles
=
[]
triangles
=
[]
triangles
.
append
((
point1
,
point2
,
point3
))
triangles
.
append
((
point1
,
point2
,
point3
))
# DXF specifies, that p3=p4 if triangles (instead of quads) are
# DXF specifies, that p3=p4 if triangles (instead of quads) are
...
@@ -864,9 +864,8 @@ class DXFParser(object):
...
@@ -864,9 +864,8 @@ class DXFParser(object):
if
self
.
_color_as_height
and
(
not
color
is
None
):
if
self
.
_color_as_height
and
(
not
color
is
None
):
# use the color code as the z coordinate
# use the color code as the z coordinate
center
[
2
]
=
float
(
color
)
/
255
center
[
2
]
=
float
(
color
)
/
255
center
=
(
center
[
0
],
center
[
1
],
center
[
2
])
center
=
tuple
(
center
)
xy_point_coords
=
pycam
.
Geometry
.
get_points_of_arc
(
center
,
radius
,
xy_point_coords
=
pycam
.
Geometry
.
get_points_of_arc
(
center
,
radius
,
angle_start
,
angle_end
)
angle_start
,
angle_end
)
# Somehow the order of points seems to be the opposite of what is
# Somehow the order of points seems to be the opposite of what is
# expected.
# expected.
xy_point_coords
.
reverse
()
xy_point_coords
.
reverse
()
...
...
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