Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d8f09b2a
Commit
d8f09b2a
authored
Jul 03, 2006
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reimplement turtle.circle using a polyline, to allow correct
filling of arcs. Also fixes #1514693.
parent
deaba867
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
48 deletions
+17
-48
Lib/lib-tk/turtle.py
Lib/lib-tk/turtle.py
+14
-48
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/lib-tk/turtle.py
View file @
d8f09b2a
...
...
@@ -344,7 +344,7 @@ class RawPen:
"""
self
.
fill
(
0
)
def
circle
(
self
,
radius
,
extent
=
None
):
def
circle
(
self
,
radius
,
extent
=
None
):
""" Draw a circle with given radius.
The center is radius units left of the turtle; extent
determines which part of the circle is drawn. If not given,
...
...
@@ -360,53 +360,19 @@ class RawPen:
>>> turtle.circle(120, 180) # half a circle
"""
if
extent
is
None
:
extent
=
self
.
_fullcircle
x0
,
y0
=
self
.
_position
xc
=
x0
-
radius
*
sin
(
self
.
_angle
*
self
.
_invradian
)
yc
=
y0
-
radius
*
cos
(
self
.
_angle
*
self
.
_invradian
)
if
radius
>=
0.0
:
start
=
self
.
_angle
-
(
self
.
_fullcircle
/
4.0
)
else
:
start
=
self
.
_angle
+
(
self
.
_fullcircle
/
4.0
)
extent
=
-
extent
if
self
.
_filling
:
if
abs
(
extent
)
>=
self
.
_fullcircle
:
item
=
self
.
_canvas
.
create_oval
(
xc
-
radius
,
yc
-
radius
,
xc
+
radius
,
yc
+
radius
,
width
=
self
.
_width
,
outline
=
""
)
self
.
_tofill
.
append
(
item
)
item
=
self
.
_canvas
.
create_arc
(
xc
-
radius
,
yc
-
radius
,
xc
+
radius
,
yc
+
radius
,
style
=
"chord"
,
start
=
start
,
extent
=
extent
,
width
=
self
.
_width
,
outline
=
""
)
self
.
_tofill
.
append
(
item
)
if
self
.
_drawing
:
if
abs
(
extent
)
>=
self
.
_fullcircle
:
item
=
self
.
_canvas
.
create_oval
(
xc
-
radius
,
yc
-
radius
,
xc
+
radius
,
yc
+
radius
,
width
=
self
.
_width
,
outline
=
self
.
_color
)
self
.
_items
.
append
(
item
)
item
=
self
.
_canvas
.
create_arc
(
xc
-
radius
,
yc
-
radius
,
xc
+
radius
,
yc
+
radius
,
style
=
"arc"
,
start
=
start
,
extent
=
extent
,
width
=
self
.
_width
,
outline
=
self
.
_color
)
self
.
_items
.
append
(
item
)
angle
=
start
+
extent
x1
=
xc
+
abs
(
radius
)
*
cos
(
angle
*
self
.
_invradian
)
y1
=
yc
-
abs
(
radius
)
*
sin
(
angle
*
self
.
_invradian
)
self
.
_angle
=
(
self
.
_angle
+
extent
)
%
self
.
_fullcircle
self
.
_position
=
x1
,
y1
if
self
.
_filling
:
self
.
_path
.
append
(
self
.
_position
)
self
.
_draw_turtle
()
extent
=
self
.
_fullcircle
frac
=
abs
(
extent
)
/
self
.
_fullcircle
steps
=
1
+
int
(
min
(
11
+
abs
(
radius
)
/
6.0
,
59.0
)
*
frac
)
w
=
1.0
*
extent
/
steps
w2
=
0.5
*
w
l
=
2.0
*
radius
*
sin
(
w2
*
self
.
_invradian
)
if
radius
<
0
:
l
,
w
,
w2
=
-
l
,
-
w
,
-
w2
self
.
left
(
w2
)
for
i
in
range
(
steps
):
self
.
forward
(
l
)
self
.
left
(
w
)
self
.
right
(
w2
)
def
heading
(
self
):
""" Return the turtle's current heading.
...
...
Misc/NEWS
View file @
d8f09b2a
...
...
@@ -19,6 +19,9 @@ Core and builtins
Library
-------
- Reimplement turtle.circle using a polyline, to allow correct
filling of arcs. Also fixes #1514693.
- Bug #1514703: Only setup canvas window in turtle when the canvas
is created.
...
...
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