ColabTurtlePlus 2.0__tar.gz → 2.0.2__tar.gz

{ColabTurtlePlus-2.0 → colabturtleplus-2.0.2}/ColabTurtlePlus/Turtle.py

@@ -23,6 +23,10 @@ v1.4-v1.5 uploaded to PyPI
 v2.0.0 Sept. 2021, Switched to using classes to allow for multiple turtles
 Uploaded to PyPI
 
+v2.0.1 Oct. 2021
+Lines drawn with drawlines() method now included in saved SVG file.
+Fixes so that graphic window is still displayed when cell executed more than once in Jupyter notebook.
+
 """
 
 DEFAULT_WINDOW_SIZE = (800, 600)
@@ -260,12 +264,13 @@ class _Screen:
         header += ("""<rect width="100%" height="100%" style="fill:{fillcolor};stroke:{kolor};stroke-width:1" />\n""").format(
             fillcolor=self.background_color,
             kolor=self.border_color)
+        lines = self._svg_drawlines_string.replace("/>","/>\n")
         image = self._generateSvgLines().replace("/>","/>\n")
         stampsB = self._generateSvgStampsB().replace("</g>","</g>\n")
         stampsT = self._generateSvgStampsT().replace("</g>","</g>\n")    
         dots = self._generateSvgDots().replace(">",">\n")
         turtle_svg = (self._generateTurtlesSvgDrawing() + " \n") if turtle else ""
-        output = header + stampsB + image + dots + stampsT + turtle_svg + "</svg>"
+        output = header + stampsB + lines + image + dots + stampsT + turtle_svg + "</svg>"
         print(output) 
 
     # Save the image as an SVG file using given filename. Set turtle=True to include turtle in svg output
@@ -297,12 +302,13 @@ class _Screen:
         header += ("""<rect width="100%" height="100%" style="fill:{fillcolor};stroke:{kolor};stroke-width:1" />\n""").format(
             fillcolor=self.background_color,
             kolor=self.border_color)
+        lines = self._svg_drawlines_string.replace("/>","/>\n")
         image = self._generateSvgLines().replace("/>","/>\n")
         stampsB = self._generateSvgStampsB().replace("</g>","</g>\n")
         stampsT = self._generateSvgStampsT().replace("</g>","</g>\n")    
         dots = self._generateSvgDots().replace(">",">\n")
         turtle_svg = (self._generateTurtlesSvgDrawing() + " \n") if turtle else ""
-        output = header + stampsB + image + dots + stampsT + turtle_svg + "</svg>"
+        output = header + stampsB + lines + image + dots + stampsT + turtle_svg + "</svg>"
         text_file.write(output)
         text_file.close()   
 
@@ -587,12 +593,16 @@ class _Screen:
 
     # Clear all text and all turtles on the screen
     def clear(self):
-        """Clears any text or drawing on the screen. Deletes all turtles.
+        """Clears any text or drawing in the graphics window. Deletes all turtles.
         
         No argument.
+        
+        Note: clear() can only be used as a method, not a function.
            
-        Note: This method is not available as a function. Use clearscreen.    
+        In order to re-run turtle commands in a cell, put clearscreen() as the first
+        command in the cell (after the import command).
         """
+        if self._turtles == []: return
         for turtle in self._turtles:
             turtle.svg_lines_string = ""
             turtle.svg_fill_string = ""
@@ -607,7 +617,7 @@ class _Screen:
             self._svg_drawlines_string = ""
         self._turtles = []
         Turtle._pen = None
-        self._updateDrawing()        
+        Turtle._screen = None       
 
     # Reset all Turtles on the Screen to their initial state.
     def reset(self):
@@ -731,7 +741,7 @@ class _Screen:
             return True
         if re.search("^#(?:[0-9a-fA-F]{3}){1,2}$", color): # 3 or 6 digit hex color code
             return True
-        if re.search("rgb\(\s*(?:(?:\d{1,2}|1\d\d|2(?:[0-4]\d|5[0-5]))\s*,?){3}\)$", color): # rgb color code
+        if re.search(r"rgb\(\s*(?:(?:\d{1,2}|1\d\d|2(?:[0-4]\d|5[0-5]))\s*,?){3}\)$", color): # rgb color code
             return True
         return False
 

colabturtleplus-2.0.2/ColabTurtlePlus/__init__.py

@@ -0,0 +1 @@
+print("Put clearscreen() as the first line in a cell (after the import command) to re-run turtle commands in the cell")

{ColabTurtlePlus-2.0 → colabturtleplus-2.0.2}/ColabTurtlePlus.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ColabTurtlePlus
-Version: 2.0
-Summary: An HTML based Turtle implementation for Google Colab and Jupyter Labs
+Version: 2.0.2
+Summary: An HTML based Turtle implementation with classes for Google Colab and Jupyter Labs
 Home-page: https://github.com/mathriddle/ColabTurtlePlus
 Author: Larry Riddle
 Author-email: lriddle@agnesscott.edu
@@ -9,15 +9,23 @@ License: MIT
 Project-URL: Bug Tracker, https://github.com/mathriddle/ColabTurtlePlus/issues
 Project-URL: Examples, https://github.com/mathriddle/ColabTurtlePlus/tree/main/examples_version2
 Project-URL: Documentation, https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 # ColabTurtlePlus
 
-An extension of the original ColabTurtle by Tolga Atam (tolgaatam) using classes (so multiple turtle are possible). Also includes some code from jaronma ColabTurtle_2 repo.
+An extension of the original ColabTurtle by Tolga Atam (tolgaatam) using classes (so multiple turtle are possible). 
 
 This is a module for drawing classic Turtle figures on Google Colab notebooks. It can also be used in Jupyter Lab notebooks. The graphics are drawn using SVG tags. The SVG commands can be printed on screen (after the drawing is completed) or saved to a file for use in a program like inkscape or Adobe Illustrator, or displaying the image in a webpage.
 
@@ -37,7 +45,7 @@ Run the code cell to install the library.
 
 Usage
 ----
-In any code cell, import the module using
+In a code cell, import the module using
 
     from ColabTurtlePlus.Turtle import *
 
@@ -46,7 +54,7 @@ Example 1
 This example uses the procedure-oriented interface.
 ```
 from ColabTurtlePlus.Turtle import *
-reset()
+clearscreen()
 setup(300,300)
 showborder()
 color("red", "yellow")
@@ -134,7 +142,7 @@ Main differences with classic turtle.py
 ----
 
 * The circle method draws smooth arcs using SVG. The step argument is available but primarily for backward compatability with classic turtle.py circle. To get a true circular arc, do NOT use steps since the circle will be drawn using SVG commands. If steps > 20, it will be assumed that an arc of a circle was intended. While this function can still be used to draw a regular polygon with 20 or fewer sides, it is better to use the regularPolygon() turtle method to take advantage of svg commands.
-* A screen method to draw lines has been included.
+* A screen method to draw lines independent of a turtle has been included.
 * Added getcolor function to return a color string from the list of 140 valid HTML colors that are allowed as valid colors. 
 * Setting speed = 0 draws only the final image with no intermediate animations. This is usually very quick. To turn off the animation but still show the turtle motion (equivalent to speed=0 in classic turtle.py), call animationOff(). This will use the current speed, but forward/back/circle makes the turtle jump and likewise left/right makes the turtle turn instantly. Keeping consistent with the original ColabTurtle, the non-zero speed values can be from 1 to 13 (slowest to fastest).
 * There is a fillrule turtle method to set nonzero or evenodd as the options used by SVG to fill an object. The global default fill-rule is evenodd to match the behavior of classic turtle.py. The begin_fill() function can take an argument of 'nonzero' or 'evenodd' to set the fill-rule just for that fill. See details in the documentation.
@@ -143,5 +151,7 @@ Main differences with classic turtle.py
 * Not all the methods from classic turtle.py are included. Most of the missing ones are for user events, special turtle methods, and screen methods.
 
 Documentation for the methods and functions in ColabTurtlePlus can be found at <a href="https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html">https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html.
-
-
+    
+Acknowledgements
+----
+Inspiration for this work came from Tolga Atam's original ColabTurtle as well as the repositories at jaronma/ColabTurtle_2, diego2500garza/ColabTurtle, and Abstrqt/ColabTurtleClass.

{ColabTurtlePlus-2.0 → colabturtleplus-2.0.2}/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ColabTurtlePlus
-Version: 2.0
-Summary: An HTML based Turtle implementation for Google Colab and Jupyter Labs
+Version: 2.0.2
+Summary: An HTML based Turtle implementation with classes for Google Colab and Jupyter Labs
 Home-page: https://github.com/mathriddle/ColabTurtlePlus
 Author: Larry Riddle
 Author-email: lriddle@agnesscott.edu
@@ -9,15 +9,23 @@ License: MIT
 Project-URL: Bug Tracker, https://github.com/mathriddle/ColabTurtlePlus/issues
 Project-URL: Examples, https://github.com/mathriddle/ColabTurtlePlus/tree/main/examples_version2
 Project-URL: Documentation, https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 # ColabTurtlePlus
 
-An extension of the original ColabTurtle by Tolga Atam (tolgaatam) using classes (so multiple turtle are possible). Also includes some code from jaronma ColabTurtle_2 repo.
+An extension of the original ColabTurtle by Tolga Atam (tolgaatam) using classes (so multiple turtle are possible). 
 
 This is a module for drawing classic Turtle figures on Google Colab notebooks. It can also be used in Jupyter Lab notebooks. The graphics are drawn using SVG tags. The SVG commands can be printed on screen (after the drawing is completed) or saved to a file for use in a program like inkscape or Adobe Illustrator, or displaying the image in a webpage.
 
@@ -37,7 +45,7 @@ Run the code cell to install the library.
 
 Usage
 ----
-In any code cell, import the module using
+In a code cell, import the module using
 
     from ColabTurtlePlus.Turtle import *
 
@@ -46,7 +54,7 @@ Example 1
 This example uses the procedure-oriented interface.
 ```
 from ColabTurtlePlus.Turtle import *
-reset()
+clearscreen()
 setup(300,300)
 showborder()
 color("red", "yellow")
@@ -134,7 +142,7 @@ Main differences with classic turtle.py
 ----
 
 * The circle method draws smooth arcs using SVG. The step argument is available but primarily for backward compatability with classic turtle.py circle. To get a true circular arc, do NOT use steps since the circle will be drawn using SVG commands. If steps > 20, it will be assumed that an arc of a circle was intended. While this function can still be used to draw a regular polygon with 20 or fewer sides, it is better to use the regularPolygon() turtle method to take advantage of svg commands.
-* A screen method to draw lines has been included.
+* A screen method to draw lines independent of a turtle has been included.
 * Added getcolor function to return a color string from the list of 140 valid HTML colors that are allowed as valid colors. 
 * Setting speed = 0 draws only the final image with no intermediate animations. This is usually very quick. To turn off the animation but still show the turtle motion (equivalent to speed=0 in classic turtle.py), call animationOff(). This will use the current speed, but forward/back/circle makes the turtle jump and likewise left/right makes the turtle turn instantly. Keeping consistent with the original ColabTurtle, the non-zero speed values can be from 1 to 13 (slowest to fastest).
 * There is a fillrule turtle method to set nonzero or evenodd as the options used by SVG to fill an object. The global default fill-rule is evenodd to match the behavior of classic turtle.py. The begin_fill() function can take an argument of 'nonzero' or 'evenodd' to set the fill-rule just for that fill. See details in the documentation.
@@ -143,5 +151,7 @@ Main differences with classic turtle.py
 * Not all the methods from classic turtle.py are included. Most of the missing ones are for user events, special turtle methods, and screen methods.
 
 Documentation for the methods and functions in ColabTurtlePlus can be found at <a href="https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html">https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html.
-
-
+    
+Acknowledgements
+----
+Inspiration for this work came from Tolga Atam's original ColabTurtle as well as the repositories at jaronma/ColabTurtle_2, diego2500garza/ColabTurtle, and Abstrqt/ColabTurtleClass.

{ColabTurtlePlus-2.0 → colabturtleplus-2.0.2}/README.md

@@ -1,6 +1,6 @@
 # ColabTurtlePlus
 
-An extension of the original ColabTurtle by Tolga Atam (tolgaatam) using classes (so multiple turtle are possible). Also includes some code from jaronma ColabTurtle_2 repo.
+An extension of the original ColabTurtle by Tolga Atam (tolgaatam) using classes (so multiple turtle are possible). 
 
 This is a module for drawing classic Turtle figures on Google Colab notebooks. It can also be used in Jupyter Lab notebooks. The graphics are drawn using SVG tags. The SVG commands can be printed on screen (after the drawing is completed) or saved to a file for use in a program like inkscape or Adobe Illustrator, or displaying the image in a webpage.
 
@@ -20,7 +20,7 @@ Run the code cell to install the library.
 
 Usage
 ----
-In any code cell, import the module using
+In a code cell, import the module using
 
     from ColabTurtlePlus.Turtle import *
 
@@ -29,7 +29,7 @@ Example 1
 This example uses the procedure-oriented interface.
 ```
 from ColabTurtlePlus.Turtle import *
-reset()
+clearscreen()
 setup(300,300)
 showborder()
 color("red", "yellow")
@@ -117,7 +117,7 @@ Main differences with classic turtle.py
 ----
 
 * The circle method draws smooth arcs using SVG. The step argument is available but primarily for backward compatability with classic turtle.py circle. To get a true circular arc, do NOT use steps since the circle will be drawn using SVG commands. If steps > 20, it will be assumed that an arc of a circle was intended. While this function can still be used to draw a regular polygon with 20 or fewer sides, it is better to use the regularPolygon() turtle method to take advantage of svg commands.
-* A screen method to draw lines has been included.
+* A screen method to draw lines independent of a turtle has been included.
 * Added getcolor function to return a color string from the list of 140 valid HTML colors that are allowed as valid colors. 
 * Setting speed = 0 draws only the final image with no intermediate animations. This is usually very quick. To turn off the animation but still show the turtle motion (equivalent to speed=0 in classic turtle.py), call animationOff(). This will use the current speed, but forward/back/circle makes the turtle jump and likewise left/right makes the turtle turn instantly. Keeping consistent with the original ColabTurtle, the non-zero speed values can be from 1 to 13 (slowest to fastest).
 * There is a fillrule turtle method to set nonzero or evenodd as the options used by SVG to fill an object. The global default fill-rule is evenodd to match the behavior of classic turtle.py. The begin_fill() function can take an argument of 'nonzero' or 'evenodd' to set the fill-rule just for that fill. See details in the documentation.
@@ -126,3 +126,7 @@ Main differences with classic turtle.py
 * Not all the methods from classic turtle.py are included. Most of the missing ones are for user events, special turtle methods, and screen methods.
 
 Documentation for the methods and functions in ColabTurtlePlus can be found at <a href="https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html">https://larryriddle.agnesscott.org/ColabTurtlePlus/documentation2.html.
+    
+Acknowledgements
+----
+Inspiration for this work came from Tolga Atam's original ColabTurtle as well as the repositories at jaronma/ColabTurtle_2, diego2500garza/ColabTurtle, and Abstrqt/ColabTurtleClass.

{ColabTurtlePlus-2.0 → colabturtleplus-2.0.2}/setup.cfg

@@ -1,9 +1,9 @@
 [metadata]
 name = ColabTurtlePlus
-version = 2.0
+version = 2.0.2
 author = Larry Riddle
 author_email = lriddle@agnesscott.edu
-description = 'An HTML based Turtle implementation for Google Colab and Jupyter Labs'
+description = 'An HTML based Turtle implementation with classes for Google Colab and Jupyter Labs'
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/mathriddle/ColabTurtlePlus

{ColabTurtlePlus-2.0 → colabturtleplus-2.0.2}/setup.py

@@ -9,13 +9,13 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name='ColabTurtlePlus',
-    version='2.0',
+    version='2.0.2',
     packages=['ColabTurtlePlus'],
     url='https://github.com/mathriddle/ColabTurtlePlus',
     license='MIT',
     author='Larry Riddle',
     author_email='lriddle@agnesscott.edu',
-    description='An HTML based Turtle implementation for Google Colab and Jupyter Labs',
+    description='An HTML based Turtle implementation with classes for Google Colab and Jupyter Labs',
     long_description=README,
     long_description_content_type="text/markdown",
     classifiers=[

ColabTurtlePlus-2.0/ColabTurtlePlus/__init__.py

@@ -1 +0,0 @@
-