adafruit-mirror/Adafruit_CircuitPython_turtle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #44 from FoamyGuy/circle_and_dot_fix

Browse source 
make circle and dot always use degrees internally
This commit is contained in:
foamyguy 2024-12-12 13:22:09 -06:00 committed by GitHub
commit b94d548cd1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
adafruit_turtle.py
View file

@ -640,6 +640,12 @@ class turtle:
# --or: circle(radius, extent) # arc # --or: circle(radius, extent) # arc
# --or: circle(radius, extent, steps) # --or: circle(radius, extent, steps)
# --or: circle(radius, steps=6) # 6-sided polygon # --or: circle(radius, steps=6) # 6-sided polygon
change_back = False
if not self._in_degrees():
change_back = True
original_mode = "standard" if not self._logomode else "logo"
self.degrees()
self.mode("standard")
pos = self.pos() pos = self.pos()
h = self._heading h = self._heading
if extent is None: if extent is None:
@ -661,6 +667,9 @@ class turtle:
# get back to exact same position and heading # get back to exact same position and heading
self.goto(pos) self.goto(pos)
self.setheading(h) self.setheading(h)
if change_back:
self.radians()
self.mode(original_mode)
# pylint:disable=inconsistent-return-statements # pylint:disable=inconsistent-return-statements
def speed(self, speed: Optional[int] = None) -> Optional[int]: def speed(self, speed: Optional[int] = None) -> Optional[int]:
@ -704,6 +713,13 @@ class turtle:
:param color: the color of the dot :param color: the color of the dot
""" """
change_back = False
if not self._in_degrees():
change_back = True
original_mode = "standard" if not self._logomode else "logo"
print(f"old mode: {original_mode}")
self.degrees()
self.mode("standard")
if size is None: if size is None:
size = max(self._pensize + 4, self._pensize * 2) size = max(self._pensize + 4, self._pensize * 2)
if color is None: if color is None:
@ -727,6 +743,9 @@ class turtle:
self._pensize = 1 self._pensize = 1
self._plot(self._x, self._y, color) self._plot(self._x, self._y, color)
self._pensize = pensize self._pensize = pensize
if change_back:
self.radians()
self.mode(original_mode)
def stamp( def stamp(
self, self,
@ -896,6 +915,10 @@ class turtle:
""" """
self._setDegreesPerAU(fullcircle) self._setDegreesPerAU(fullcircle)
def _in_degrees(self) -> bool:
print(self._degreesPerAU)
return self._degreesPerAU == 1.0
def radians(self) -> None: def radians(self) -> None:
"""Set the angle measurement units to radians. """Set the angle measurement units to radians.
Equivalent to degrees(2*math.pi).""" Equivalent to degrees(2*math.pi)."""