turtleshell 1.2.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

turtleshell/__init__.py

@@ -1,3 +1,3 @@
 from .core import Screen, Turtle
 
-__version__ = "1.2.0"
+__version__ = "1.3.0"

turtleshell/core.py

@@ -2,10 +2,12 @@
   See https://github.com/python/cpython/blob/main/Lib/turtle.py
   """
 #TODO handle floats, randcoords, default screensize, default shape
+#TODO # def _polytrafo(self, poly):
 
-import colorsys
+import colorsys, math, turtle
 from dataclasses import dataclass
-import turtle
+
+sign = lambda x: round(math.copysign(1, x))
 
 @dataclass
 class HSV:
@@ -28,9 +30,63 @@ class _Screen(turtle._Screen):
     if turtle.Turtle._screen is None:
       turtle.Turtle._screen = self
     self.colormode(255)
+    self.timers = {}
+
+  @property
+  def width(self):
+    return self.window_width()
   
+  @property
+  def height(self):
+    return self.window_height()
+  
+  def setup(self, width=turtle._CFG["width"], height=turtle._CFG["height"],
+            startx=turtle._CFG["leftright"], starty=turtle._CFG["topbottom"]):
+    super().setup(width, height, startx, starty)
+    self.screensize(self.width-20, self.height-20)
+
+  def _onkeypress(self, fun, key=None):
+    if fun is None:
+      if key is None:
+        for key in self._keys:
+          self._keys.remove(key)
+          self.cv.unbind("<KeyPress-%s>" % key, None)
+      else:
+        self.cv.unbind("<KeyPress-%s>" % key, None)
+    else:
+      def eventfun(event):
+        fun()
+      if key is None:
+        self.cv.bind("<KeyPress>", eventfun)
+      else:
+        self.cv.bind("<KeyPress-%s>" % key, eventfun)
+
+  def onmove(self, fun):
+    def eventfun(event):
+      x, y = (self.cv.canvasx(event.x)/self.xscale,
+              -self.cv.canvasy(event.y)/self.yscale)
+      fun(x, y)
+    self.cv.bind("<Motion>", eventfun)
+
+  def cancel_timer(self, func):
+    if not func in self.timers:
+      return
+    for id in self.timers.pop(func):
+      self.getcanvas().after_cancel(id)
+
+  def set_timer(self, func, ms, add=False):
+    if not add and func in self.timers:
+      self.cancel_timer(func)
+    id = self.getcanvas().after(ms, func)
+    if func in self.timers:
+      self.timers[func].append(id)
+    else:
+      self.timers[func] = [id]
+
   def _colorstr(self, color):
     isnumber = lambda x: isinstance(x, (int, float))
+    if isinstance(color, tuple) and len(color) == 1:
+      color = color[0]
     if len(color) == 3 and all([isnumber(c) for c in color]):
       lower, upper = 0, Turtle._screen.colormode()
       color = [max(min(upper, round(c)), lower) for c in color]
@@ -60,6 +116,52 @@ class Turtle(turtle.RawTurtle):
     self._pen_hsv = HSV(0, 1, 1)
     self._fill_hsv = HSV(0, 1, 1)
 
+  def __lt__(self, other):
+    if isinstance(other, Turtle):
+      return self.y < other.y
+    return NotImplemented
+  
+  def __eq__(self, other):
+    if isinstance(other, Turtle):
+      return self.y == other.y
+    return NotImplemented
+
+  def onenter(self, fun):
+    titem = self.turtle._item
+    if fun is None:
+      self.screen.cv.tag_unbind(titem, "<Enter>")
+    else:
+      def eventfun(event):
+        x, y = (self.screen.cv.canvasx(event.x)/self.screen.xscale,
+                -self.screen.cv.canvasy(event.y)/self.screen.yscale)
+        fun(x, y)
+      self.screen.cv.tag_bind(titem, "<Enter>", eventfun)
+
+  def onexit(self, fun):
+    titem = self.turtle._item
+    if fun is None:
+      self.screen.cv.tag_unbind(titem, "<Leave>")
+    else:
+      def eventfun(event):
+        x, y = (self.screen.cv.canvasx(event.x)/self.screen.xscale,
+                -self.screen.cv.canvasy(event.y)/self.screen.yscale)
+        fun(x, y)
+      self.screen.cv.tag_bind(titem, "<Leave>", eventfun)
+
+  def bring_forward(self):
+      titem = self.turtle._item
+      for item in self.items:
+        self.screen.cv.tag_raise(item)
+      titem = self.turtle._item
+      self.screen.cv.tag_raise(titem)
+
+  def send_backward(self):
+      titem = self.turtle._item
+      self.screen.cv.tag_lower(titem)
+
+  def face(self, x, y):
+    self.setheading(self.towards(x, y))
+
   @property
   def x(self):
     return self.xcor()
@@ -94,75 +196,96 @@ class Turtle(turtle.RawTurtle):
     self.penup()
     self._position = turtle.Vec2D(x, y)
     self.pen(pendown=pendown)
-
-  def write(self, arg, move=False, align="center", font=("Arial", 18, "bold")):
+  
+  def _write(self, txt, align, font):
+        """Performs the writing for write()
+        """
+        item, end = self.screen._write(self._position, txt, align, font,
+                                                          self._pencolor)
+        
+        self._update()
+        self.items.append(item)
+        if self.undobuffer:
+            self.undobuffer.push(("wri", item))
+        return end
+  
+  def write(self, arg, move=False, align="center", font=("Courier New", 20, "bold")):
     super().write(arg, move, align, font)
+    self.bring_forward() # TODO this will be undone if Screen.update() is called
 
   def to_front(self):
     self.goto(self.position())
 
   ## HSV colour methods
-  def hue(self, degrees):
-    self.penhue(degrees)
-    self.fillhue(degrees)
+  def hsv(self, hue, sat, val):
+    return
 
-  def penhue(self, degrees):
+  def penhsv(self, *args):
+    print(args)
+
+  def fillhsv(self, *args):
+    print(args)
+    
+  def hue(self, degrees=None):
+    return (self.penhue(degrees), self.fillhue(degrees))
+
+  def penhue(self, degrees=None):
+    if degrees is None:
+      return self._pen_hsv.hue * 360
     self._pen_hsv.hue = degrees/360
     self.pencolor(_hsv_to_rgb(self._pen_hsv))
+    return degrees
 
-  def fillhue(self, degrees):
+  def fillhue(self, degrees=None):
+    if degrees is None:
+      return self._fill_hsv.hue * 360
     self._fill_hsv.hue = degrees/360
     self.fillcolor(_hsv_to_rgb(self._fill_hsv))
 
-  def sat(self, value):
-    self.pensat(value)
-    self.fillsat(value)
+  def sat(self, value=None):
+    return(self.pensat(value), self.fillsat(value))
 
-  def pensat(self, value):
+  def pensat(self, value=None):
+    if value is None:
+      return self._pen_hsv.sat * 100
     self._pen_hsv.sat = value/100
     self.pencolor(_hsv_to_rgb(self._pen_hsv))
 
-  def fillsat(self, value):
+  def fillsat(self, value=None):
+    if value is None:
+      return self._fill_hsv.sat * 100
     self._fill_hsv.sat = value/100
     self.fillcolor(_hsv_to_rgb(self._fill_hsv))
 
-  def val(self, value):
-    self.penval(value)
-    self.fillval(value)
+  def val(self, value=None):
+    return (self.penval(value), self.fillval(value))
 
-  def penval(self, value):
+  def penval(self, value=None):
+    if value is None:
+      return self._pen_hsv.val * 100
     self._pen_hsv.val = value/100
     self.pencolor(_hsv_to_rgb(self._pen_hsv))
 
-  def fillval(self, value):
+  def fillval(self, value=None):
+    if value is None:
+      return self._fill_hsv.val * 100
     self._fill_hsv.val = value/100
     self.fillcolor(_hsv_to_rgb(self._fill_hsv))
 
-
 Pen = Turtle
 
-if __name__ == "__main__":
-  canvas = Screen()
-  canvas.bgcolor("gold")
+def turtle_test(screen):
   pen = Turtle()
-  print(f"\n\n***\nTURTLE TYPE: {type(pen)}\nSCREEN TYPE: {type(canvas)}\n***\n")
-
+  print(f"\n\n***\nTURTLE TYPE: {type(pen)}\nSCREEN TYPE: {type(screen)}\n***\n")
   pen.shape("square")
   pen.shapesize(30, 25)
-
-  pen.hue(0)
-  pen.stamp()
-  pen.forward(50)
-  pen.hue(60)
-  pen.stamp()
-  pen.forward(50)
-  pen.hue(120)
-  pen.stamp()
-  pen.forward(50)
-  pen.hue(180)
-  pen.stamp()
-  pen.forward(50)
-  pen.hue(240)
+  pen.hsv(100, 50, 50)
   pen.stamp()
 
-  canvas.exitonclick()
+if __name__ == "__main__":
+  import os;os.system("clear")
+  screen = Screen()
+  screen.setup(400,400,0,0)
+  screen.bgcolor("gold")
+  turtle_test(screen)
+  screen.exitonclick()

{turtleshell-1.2.0.dist-info → turtleshell-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: turtleshell
-Version: 1.2.0
+Version: 1.3.0
 Summary: Convenience wrapper around turtle.Turtle and turtle.Screen
 Author-email: Sam Mangan <sam.mangan2@gmail.com>
 License-Expression: MIT

turtleshell-1.3.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+turtleshell/__init__.py,sha256=nfmP05Yjc-GIAHSUHj5DygwbICrHuGnvve6YY8vMbSo,55
+turtleshell/core.py,sha256=_zMqr3Y2LWZA6mQ4o-EdtIkzB1Any8IPwsKT019pnns,8526
+turtleshell-1.3.0.dist-info/METADATA,sha256=UDmbh5_jZlNDeii-ZK5WKhwcgaigdQlVhvPzTv_W3oc,1124
+turtleshell-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+turtleshell-1.3.0.dist-info/top_level.txt,sha256=nIp6ZtgikYbeYxpXq6zs04zeIaXIMs3ZzAx5QREfkYM,12
+turtleshell-1.3.0.dist-info/RECORD,,

{turtleshell-1.2.0.dist-info → turtleshell-1.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

turtleshell-1.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-turtleshell/__init__.py,sha256=85lJZi_-C3nKgx2AqgwkiuvLjk3pBtACIQynLTj7nSc,55
-turtleshell/core.py,sha256=WYMtNv225fTi55bfxDqJhem25E18TNqJl116j77Rl5A,4410
-turtleshell-1.2.0.dist-info/METADATA,sha256=C6XQ5TfWKndLSBhkKHOqyVUc44zH8nKi3wuaaXUaSl0,1124
-turtleshell-1.2.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-turtleshell-1.2.0.dist-info/top_level.txt,sha256=nIp6ZtgikYbeYxpXq6zs04zeIaXIMs3ZzAx5QREfkYM,12
-turtleshell-1.2.0.dist-info/RECORD,,