CreativePython 0.1.1__tar.gz → 0.1.3__tar.gz

{creativepython-0.1.1 → creativepython-0.1.3}/MANIFEST.in

@@ -1,4 +1,5 @@
 recursive-include src/CreativePython/resources *
 recursive-include src/CreativePython/examples *
+recursive-include src/CreativePython/scripts *
 recursive-exclude */.DS_Store
 recursive-exclude */__pycache__/*

{creativepython-0.1.1/src/CreativePython.egg-info → creativepython-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 0.1.1
+Version: 0.1.3
 Summary: A Python-based software environment for developing algorithmic art projects.
 Author-email: "Dr. Bill Manaris" <manaris@cofc.edu>, Taj Ballinger <ballingertj@g.cofc.edu>, Trevor Ritchie <ritchiets@g.cofc.edu>
 License: MIT License
@@ -53,19 +53,26 @@ CreativePython is a Python-based software environment for learning and developin
 
 CreativePython is distributed under the MIT License.
 
-[Homepage](https://jythonmusic.me/)
+- [Homepage](https://jythonmusic.me/)
+- [Download All Examples [ZIP]](https://www.dropbox.com/scl/fo/rvc8m8pt4m0281qn0t4oi/AO2Y0W2qOrOcurlQmLa7M54?rlkey=0sf80bmov135tc85dk9k7ats6&dl=1)
 
 This package is still under development.
 
 # Beginner Installation (IDLE)
 
-Download and install the latest version of [Python](https://www.python.org/downloads/).
+1. Download and install the latest version of [Python](https://www.python.org/downloads/).
 
-Download the [CreativePython IDLE Install Script](https://www.dropbox.com/scl/fi/utlo75xun8wuukv7b477i/idleInstaller.py?rlkey=1rumkr7y3263ifd4tflj1o9lo&dl=1).
+2. Download the [CreativePython Setup Script](https://www.dropbox.com/scl/fi/253bvfqsf0ij3rmza88q5/_creativepythonSetup.py?rlkey=iu4y4u8pujltgfx6kbjmodu9m&dl=1).
 
-Open the `.py` script with IDLE, Python's Integrated Development Learning Environment.  From the toolbar, select `Run`, then `Run Module`.
+3. Open `creativePythonSetup.py` with IDLE, Python's Integrated Development Learning Environment.
 
-CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  **IMPORTANT**: type `yes` in the IDLE Shell and hit enter.  Without a soundfont, CreativePython can't produce MIDI sounds.
+4. From the IDLE toolbar, select `Run`, then `Run Module`.
+
+5. CreativePython will check for its requirements on your system, download any missing requirements, and install its libraries.
+
+6. When you see `[CreativePython Setup]: CreativePython installed successfully.`, you're all done!  You're ready to start using CreativePython.
+
+**NOTE**: You can use the setup script in any Python3 environment - not just IDLE!
 
 # Custom Installation
 
@@ -97,7 +104,7 @@ pip install CreativePython
 
 # Using CreativePython
 
-## import
+## Importing Libraries
 
 CreativePython's core modules are the `music`, `gui`, `image`, `timer`, `osc`, and `midi` libraries.  You can import these libraries into your python code using:
 
@@ -109,9 +116,9 @@ from music import Note, Play, C4, HN
 
 Or a similar statement.  CreativePython includes a number of useful constants, so we recommend using wildcard imports like `from music import *`.
 
-**NOTE**: When you import `music`, CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  You should only have to do this once.
+**NOTE**: The first time you import `music`, CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  You should only have to do this once.
 
-## running CreativePython programs
+## Running CreativePython programs
 
 CreativePython is designed for use in Python's Interactive Mode.  To use Interactive Mode, enter a command like:
 
@@ -133,7 +140,7 @@ note = Note(C4, HN)        # create a middle C half note
 Play.midi(note)            # and play it!
 ```
 
-In a terminal, run the code using:
+In a terminal, run the code in interactive mode:
 
 ```
 python -i playNote.py
@@ -141,6 +148,4 @@ python -i playNote.py
 
 If this is the first time you've used CreativePython, it will ask to download a soundfont.
 
-After that, you should hear a single C4 note.
-
-[[Download All Examples](https://www.dropbox.com/scl/fo/rvc8m8pt4m0281qn0t4oi/AO2Y0W2qOrOcurlQmLa7M54?rlkey=0sf80bmov135tc85dk9k7ats6&dl=1)]
+After you do, you should hear a single C4 half-note.

{creativepython-0.1.1 → creativepython-0.1.3}/README.md

@@ -4,19 +4,26 @@ CreativePython is a Python-based software environment for learning and developin
 
 CreativePython is distributed under the MIT License.
 
-[Homepage](https://jythonmusic.me/)
+- [Homepage](https://jythonmusic.me/)
+- [Download All Examples [ZIP]](https://www.dropbox.com/scl/fo/rvc8m8pt4m0281qn0t4oi/AO2Y0W2qOrOcurlQmLa7M54?rlkey=0sf80bmov135tc85dk9k7ats6&dl=1)
 
 This package is still under development.
 
 # Beginner Installation (IDLE)
 
-Download and install the latest version of [Python](https://www.python.org/downloads/).
+1. Download and install the latest version of [Python](https://www.python.org/downloads/).
 
-Download the [CreativePython IDLE Install Script](https://www.dropbox.com/scl/fi/utlo75xun8wuukv7b477i/idleInstaller.py?rlkey=1rumkr7y3263ifd4tflj1o9lo&dl=1).
+2. Download the [CreativePython Setup Script](https://www.dropbox.com/scl/fi/253bvfqsf0ij3rmza88q5/_creativepythonSetup.py?rlkey=iu4y4u8pujltgfx6kbjmodu9m&dl=1).
 
-Open the `.py` script with IDLE, Python's Integrated Development Learning Environment.  From the toolbar, select `Run`, then `Run Module`.
+3. Open `creativePythonSetup.py` with IDLE, Python's Integrated Development Learning Environment.
 
-CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  **IMPORTANT**: type `yes` in the IDLE Shell and hit enter.  Without a soundfont, CreativePython can't produce MIDI sounds.
+4. From the IDLE toolbar, select `Run`, then `Run Module`.
+
+5. CreativePython will check for its requirements on your system, download any missing requirements, and install its libraries.
+
+6. When you see `[CreativePython Setup]: CreativePython installed successfully.`, you're all done!  You're ready to start using CreativePython.
+
+**NOTE**: You can use the setup script in any Python3 environment - not just IDLE!
 
 # Custom Installation
 
@@ -48,7 +55,7 @@ pip install CreativePython
 
 # Using CreativePython
 
-## import
+## Importing Libraries
 
 CreativePython's core modules are the `music`, `gui`, `image`, `timer`, `osc`, and `midi` libraries.  You can import these libraries into your python code using:
 
@@ -60,9 +67,9 @@ from music import Note, Play, C4, HN
 
 Or a similar statement.  CreativePython includes a number of useful constants, so we recommend using wildcard imports like `from music import *`.
 
-**NOTE**: When you import `music`, CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  You should only have to do this once.
+**NOTE**: The first time you import `music`, CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  You should only have to do this once.
 
-## running CreativePython programs
+## Running CreativePython programs
 
 CreativePython is designed for use in Python's Interactive Mode.  To use Interactive Mode, enter a command like:
 
@@ -84,7 +91,7 @@ note = Note(C4, HN)        # create a middle C half note
 Play.midi(note)            # and play it!
 ```
 
-In a terminal, run the code using:
+In a terminal, run the code in interactive mode:
 
 ```
 python -i playNote.py
@@ -92,6 +99,4 @@ python -i playNote.py
 
 If this is the first time you've used CreativePython, it will ask to download a soundfont.
 
-After that, you should hear a single C4 note.
-
-[[Download All Examples](https://www.dropbox.com/scl/fo/rvc8m8pt4m0281qn0t4oi/AO2Y0W2qOrOcurlQmLa7M54?rlkey=0sf80bmov135tc85dk9k7ats6&dl=1)]
+After you do, you should hear a single C4 half-note.

{creativepython-0.1.1 → creativepython-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "CreativePython"
-version = "0.1.1"
+version = "0.1.3"
 description = "A Python-based software environment for developing algorithmic art projects."
 readme = "README.md"
 license = { file = "LICENSE" }

creativepython-0.1.1/src/CreativePython/scripts/creativePythonSetup.py → creativepython-0.1.3/src/CreativePython/_creativepythonSetup.py

@@ -5,9 +5,10 @@
 # Linux: None
 
 import os, platform, shutil, subprocess
-import sys
+import sys, pathlib
 
 debug = True
+LOG_PATH = str(pathlib.Path.home() / "Desktop" / "creativepython-install.log")
 
 class SetupError(Exception):
    pass
@@ -15,16 +16,26 @@ class SetupError(Exception):
 def _print(text):
    print(f"[CreativePython Setup]: {text}")
 
-def _run(cmd, env=os.environ):
-   return subprocess.run(
+def _run(cmd, env=os.environ, log=None, check=True, quiet=True):
+   if debug: _print(f"Running: {' '.join(cmd)}")
+   result = subprocess.run(
       cmd,
-      check=True,
+      check=False,
       text=True,
-      stdout=subprocess.PIPE,
-      stderr=subprocess.PIPE,
+      stdout=subprocess.PIPE if quiet else None,
+      stderr=subprocess.PIPE if quiet else None,
       env=env
    )
 
+   if log:
+      log.write(f"\n$ {' '.join(cmd)}\n")
+      if result.stdout: log.write(result.stdout)
+      if result.stderr: log.write(f"\n[stderr]\n{result.stderr}")
+   if check and result.returncode != 0:
+      raise SetupError(f"Command failed: {' '.join(cmd)} (exit {result.returncode})")
+   
+   return result
+
 
 def _findHomebrew():
    if debug: _print("Looking for Homebrew...")
@@ -94,13 +105,21 @@ def _installBrewPackage(package, brew=None):
 
 
 def _installCreativePython():
-   if debug: _print("Installing CreativePython...")
-   _run([sys.executable, '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools', 'wheel'])
-   _run([sys.executable, '-m', 'pip', 'install', 'CreativePython'])
+   if debug: _print(f"Installing CreativePython... (log: {LOG_PATH})")
+
+   with open(LOG_PATH, "w", encoding="utf-8", errors="replace") as log:
+      # find the python interpreter location
+      py = sys.executable
+
+      _run([py, '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools', 'wheel'], log=log, check=False)
+      _run([py, '-m', 'pip', 'install', '--no-cache-dir', 'CreativePython'], log=log, quiet=True)
 
-   import music                                   # import music to install soundfont
    if debug: _print("CreativePython installed successfully.")
 
+   import music  # import music to trigger soundfont download
+
+
+
 if __name__ == "__main__":
    
    if platform.system() == "Darwin":                # check for MacOS...

{creativepython-0.1.1 → creativepython-0.1.3}/src/CreativePython/_soundfont.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from platformdirs import user_data_dir
 from pooch import retrieve
-import shutil, sys, os
+import os
 
 APP = "CreativePython"
 ORG = "CofC"
@@ -15,10 +15,6 @@ SF2_SHA256 = "2ae766ab5c5deb6f7fffacd6316ec9f3699998cce821df3163e7b10a78a64066"
 
 ##### SOUNDFONTS #####
 
-def _soundfontPath():
-   """Expose the intended soundfont path as a method."""
-   return SOUNDFONT_PATH
-
 def _findSoundfont(candidate=None):
    """
    Finds a soundfont 'default.sf2' and returns its location.
@@ -45,6 +41,7 @@ def _findSoundfont(candidate=None):
       c = candidates[i]
       if c and c.exists():
          soundfontPath = str(c)
+      i = i + 1
 
    return soundfontPath
 
@@ -59,8 +56,18 @@ def _downloadSoundfont(destination=SOUNDFONT_PATH):
    path = retrieve(
       url=SF2_URL,
       known_hash=f"sha256:{SF2_SHA256}",
-      progressbar=True,
+      progressbar=False,
       fname=destination.name,
       path=str(destination.parent)
    )
-   return path
+   return path
+
+
+def _installSoundfont():
+   soundfontPath = _findSoundfont()
+   if not soundfontPath:
+      print(f"[CREATIVEPYTHON SETUP]: Downloading MIDI Soundfont...")
+      _soundfontPath = _downloadSoundfont()
+      print(f"[CREATIVEPYTHON SETUP]: Soundfont downloaded to {_soundfontPath}")
+
+   return _soundfontPath

{creativepython-0.1.1 → creativepython-0.1.3/src/CreativePython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 0.1.1
+Version: 0.1.3
 Summary: A Python-based software environment for developing algorithmic art projects.
 Author-email: "Dr. Bill Manaris" <manaris@cofc.edu>, Taj Ballinger <ballingertj@g.cofc.edu>, Trevor Ritchie <ritchiets@g.cofc.edu>
 License: MIT License
@@ -53,19 +53,26 @@ CreativePython is a Python-based software environment for learning and developin
 
 CreativePython is distributed under the MIT License.
 
-[Homepage](https://jythonmusic.me/)
+- [Homepage](https://jythonmusic.me/)
+- [Download All Examples [ZIP]](https://www.dropbox.com/scl/fo/rvc8m8pt4m0281qn0t4oi/AO2Y0W2qOrOcurlQmLa7M54?rlkey=0sf80bmov135tc85dk9k7ats6&dl=1)
 
 This package is still under development.
 
 # Beginner Installation (IDLE)
 
-Download and install the latest version of [Python](https://www.python.org/downloads/).
+1. Download and install the latest version of [Python](https://www.python.org/downloads/).
 
-Download the [CreativePython IDLE Install Script](https://www.dropbox.com/scl/fi/utlo75xun8wuukv7b477i/idleInstaller.py?rlkey=1rumkr7y3263ifd4tflj1o9lo&dl=1).
+2. Download the [CreativePython Setup Script](https://www.dropbox.com/scl/fi/253bvfqsf0ij3rmza88q5/_creativepythonSetup.py?rlkey=iu4y4u8pujltgfx6kbjmodu9m&dl=1).
 
-Open the `.py` script with IDLE, Python's Integrated Development Learning Environment.  From the toolbar, select `Run`, then `Run Module`.
+3. Open `creativePythonSetup.py` with IDLE, Python's Integrated Development Learning Environment.
 
-CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  **IMPORTANT**: type `yes` in the IDLE Shell and hit enter.  Without a soundfont, CreativePython can't produce MIDI sounds.
+4. From the IDLE toolbar, select `Run`, then `Run Module`.
+
+5. CreativePython will check for its requirements on your system, download any missing requirements, and install its libraries.
+
+6. When you see `[CreativePython Setup]: CreativePython installed successfully.`, you're all done!  You're ready to start using CreativePython.
+
+**NOTE**: You can use the setup script in any Python3 environment - not just IDLE!
 
 # Custom Installation
 
@@ -97,7 +104,7 @@ pip install CreativePython
 
 # Using CreativePython
 
-## import
+## Importing Libraries
 
 CreativePython's core modules are the `music`, `gui`, `image`, `timer`, `osc`, and `midi` libraries.  You can import these libraries into your python code using:
 
@@ -109,9 +116,9 @@ from music import Note, Play, C4, HN
 
 Or a similar statement.  CreativePython includes a number of useful constants, so we recommend using wildcard imports like `from music import *`.
 
-**NOTE**: When you import `music`, CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  You should only have to do this once.
+**NOTE**: The first time you import `music`, CreativePython will ask permission to download a high-quality soundfont (FluidR3 G2-2.sf2) for you.  You should only have to do this once.
 
-## running CreativePython programs
+## Running CreativePython programs
 
 CreativePython is designed for use in Python's Interactive Mode.  To use Interactive Mode, enter a command like:
 
@@ -133,7 +140,7 @@ note = Note(C4, HN)        # create a middle C half note
 Play.midi(note)            # and play it!
 ```
 
-In a terminal, run the code using:
+In a terminal, run the code in interactive mode:
 
 ```
 python -i playNote.py
@@ -141,6 +148,4 @@ python -i playNote.py
 
 If this is the first time you've used CreativePython, it will ask to download a soundfont.
 
-After that, you should hear a single C4 note.
-
-[[Download All Examples](https://www.dropbox.com/scl/fo/rvc8m8pt4m0281qn0t4oi/AO2Y0W2qOrOcurlQmLa7M54?rlkey=0sf80bmov135tc85dk9k7ats6&dl=1)]
+After you do, you should hear a single C4 half-note.

{creativepython-0.1.1 → creativepython-0.1.3}/src/CreativePython.egg-info/SOURCES.txt

@@ -4,18 +4,23 @@ README.md
 pyproject.toml
 src/_RealtimeAudioPlayer.py
 src/gui.py
+src/iannix.py
 src/image.py
+src/markov.py
 src/midi.py
 src/music.py
 src/osc.py
 src/timer.py
+src/zipf.py
 src/CreativePython/__init__.py
+src/CreativePython/_creativepythonSetup.py
 src/CreativePython/_soundfont.py
 src/CreativePython.egg-info/PKG-INFO
 src/CreativePython.egg-info/SOURCES.txt
 src/CreativePython.egg-info/dependency_links.txt
 src/CreativePython.egg-info/requires.txt
 src/CreativePython.egg-info/top_level.txt
+src/CreativePython/examples/.DS_Store
 src/CreativePython/examples/ArvoPart.CantusInMemoriam.py
 src/CreativePython/examples/ConcretPH_Xenakis.py
 src/CreativePython/examples/DeepPurple.SmokeOnTheWater.py
@@ -100,5 +105,4 @@ src/CreativePython/examples/zipfMetrics.py
 src/CreativePython/resources/.DS_Store
 src/CreativePython/resources/550973__luizguilherme_a__clean-guitarr-riff.mp3
 src/CreativePython/resources/chopper.jpg
-src/CreativePython/resources/de-brazzas-monkey.jpg
-src/CreativePython/scripts/creativePythonSetup.py
+src/CreativePython/resources/de-brazzas-monkey.jpg

{creativepython-0.1.1 → creativepython-0.1.3}/src/CreativePython.egg-info/top_level.txt

@@ -1,8 +1,11 @@
 CreativePython
 _RealtimeAudioPlayer
 gui
+iannix
 image
+markov
 midi
 music
 osc
 timer
+zipf

{creativepython-0.1.1 → creativepython-0.1.3}/src/gui.py

@@ -1480,108 +1480,122 @@ class Display(Interactable):
       self._callbackFunctions['onClose'] = function
 
 
-   ### CONVENIENCE METHODS
-
-   def drawLine(self, x1, y1, x2, y2):
-      """
-      Draws a basic line from (x1, y1) to (x2, y2).
+   # drawing functions (for convenience)
+   def drawLine(self, x1, y1, x2, y2, color=Color.BLACK, thickness=1):
       """
-      line = Line(x1, y1, x2, y2)
-      self.add(line)
-      return line
+      Draw a line between the points (x1, y1) and (x2, y2) with given color and thickness.
 
-   def drawCircle(self, x, y, radius):
-      """
-      Draws a basic circle with the specified radius and center coordinates.
+      Returns the line object (in case we want to move it or delete it later).
       """
-      circle = Circle(x, y, radius)
-      self.add(circle)
-      return circle
+      line = Line(x1, y1, x2, y2, color, thickness)   # create line
+      self.add(line)                                  # add it
+      return line                                     # and return it
 
-
-   def drawPoint(self, x, y):
-      """
-      Draws a basic point at the specified coordinates.
+   def drawCircle(self, x, y, radius, color = Color.BLACK, fill = False, thickness=1):
       """
-      point = Point(x, y)
-      self.add(point)
-      return point
-
+      Draw a circle at (x, y) with the given radius, color, fill, and thickness.
 
-   def drawOval(self, x1, y1, x2, y2):
+      Returns the circle object (in case we want to move it or delete it later).
       """
-      Draws a basic oval with the specified bounding box.
-      The bounding box is defined by the top-left corner (x1, y1)
-      and the bottom-right corner (x2, y2).
-      """
-      oval = Oval(x1, y1, x2, y2)
-      self.add(oval)
-      return oval
-
+      circle = Circle(x, y, radius, color, fill, thickness)   # create circle
+      self.add(circle)   # add it
+      return circle      # and return it
 
-   def drawRectangle(self, x1, y1, x2, y2):
+   def drawPoint(self, x, y, color = Color.BLACK, thickness=1):
       """
-      Draws a basic rectangle with the specified bounding box.
-      The bounding box is defined by the top-left corner (x1, y1)
-      and the bottom-right corner (x2, y2).
+      Draw a point at (x, y) with the given color and thickness.
+
+      Returns the point object (in case we want to move it or delete it later).
       """
-      rectangle = Rectangle(x1, y1, x2, y2)
-      self.add(rectangle)
-      return rectangle
+      point = Point(x, y, color, thickness)   # create point
+      self.add(point)   # add it
+      return point      # and return it
 
+   def drawOval(self, x1, y1, x2, y2, color = Color.BLACK, fill = False, thickness = 1):
+      """
+      Draw an oval using the coordinates of its enclosing rectangle with the given color,
+      fill, and thickness.
 
-   def drawPolyLine(self, xPoints, yPoints):
+      Returns the oval object (in case we want to move it or delete it later).
       """
-      Draws a basic polyline with the specified points.
-      The points are defined by two lists of x and y coordinates.
+      oval = Oval(x1, y1, x2, y2, color, fill, thickness)   # create oval
+      self.add(oval)   # add it
+      return oval      # and return it
+
+   def drawArc(self, x1, y1, x2, y2, startAngle, endAngle, color = Color.BLACK, fill = False, thickness = 1):
       """
-      polyline = PolyLine(xPoints, yPoints)
-      self.add(polyline)
-      return polyline
+      Draw an arc using the provided coordinates, arc angles, color, fill, and thickness.
 
+      Returns the arc object (in case we want to move it or delete it later).
+      """
+      arc = Arc(x1, y1, x2, y2, startAngle, endAngle, color, fill, thickness)   # create arc
+      self.add(arc)   # add it
+      return arc      # and return it
 
-   def drawPolygon(self, xPoints, yPoints):
+   def drawRectangle(self, x1, y1, x2, y2, color = Color.BLACK, fill = False, thickness = 1):
       """
-      Draws a basic polygon with the specified points.
-      The points are defined by two lists of x and y coordinates.
+      Draw a rectangle using the provided coordinates, color, fill, and thickness.
+
+      Returns the rectangle object (in case we want to move it or delete it later).
       """
-      polygon = Polygon(xPoints, yPoints)
-      self.add(polygon)
-      return polygon
+      rec = Rectangle(x1, y1, x2, y2, color, fill, thickness)   # create rectangle
+      self.add(rec)   # add it
+      return rec      # and return it
 
+   def drawPolygon(self, xPoints, yPoints, color = Color.BLACK, fill = False, thickness = 1):
+      """
+      Draw a polygon using the provided coordinates, color, fill, and thickness.
 
-   def drawIcon(self, filename, x=0, y=0):
+      Returns the polygon object (in case we want to move it or delete it later).
       """
-      Draws an icon at the specified coordinates.
+      poly = Polygon(xPoints, yPoints, color, fill, thickness)   # create polygon
+      self.add(poly)   # add it
+      return poly      # and return it
+
+   def drawIcon(self, filename, x, y, width = None, height = None):
       """
-      icon = Icon(filename)
-      icon.setPosition(x, y)
-      self.add(icon)
-      return icon
+      Draw an icon (image) from the provided external file (.jpg or .png) at the given coordinates (top-left).
+      Also rescale according to provided width and height (if any).
 
+      Returns the icon object (in case we want to move it or delete it later).
+      """
+      icon = Icon(filename, width, height)   # load image (and rescale, if specified)
+      self.add(icon, x, y)   # add it at given coordinates
+      return icon            # and return it
 
-   def drawImage(self, filename, x=0, y=0):
+   def drawImage(self, filename, x, y, width = None, height = None):
       """
       Same as drawIcon().
-      """
-      return self.drawIcon(filename, x, y)
 
+      Returns the image object (in case we want to move it or delete it later).
+      """
+      return self.drawIcon(filename, x, y, width, height)
 
-   def drawLabel(self, text, x=0, y=0):
+   def drawLabel(self, text, x, y, color = Color.BLACK, font = None):
       """
-      Draws a basic label at the specified coordinates.
+      Draw the text label on the display at the given coordinates (top-left) and with the provided
+      color and font.
+
+      Returns the label object (in case we want to move it or delete it later).
       """
-      label = Label(text)
-      label.setPosition(x, y)
-      self.add(label)
-      return label
 
+      # Font example - Font("Serif", Font.ITALIC, 16)
+      #
+      # see http://docs.oracle.com/javase/tutorial/2d/text/fonts.html#logical-fonts
 
-   def drawText(self, text, x=0, y=0):
+      label = Label(text, LEFT, color)   # create label
+      if font:                     # did they provide a font?
+         label.setFont(font)          # yes, so set it
+      self.add(label, x, y)        # add it at given coordinates
+      return label                 # and return it
+
+   def drawText(self, text, x, y, color = Color.BLACK, font = None):
       """
       Same as drawLabel().
+
+      Returns the label object (in case we want to move it or delete it later).
       """
-      return self.drawLabel(text, x, y)
+      return self.drawLabel(text, x, y, color, font)
 
 
 #######################################################################################