updated readme and setup

Author: Dan Schellenberg

README.rst

@@ -5,7 +5,11 @@ cImage  -  A simple image processing library for Python
 Installation
 ============
 
-copy cImage.py to your site-packages directory.
+
+If using Thonny, go to Tools -> Manage Packages, then enter ``cs20-image``. This should install both the image module, and the Pillow module (so you can use any type of image you'd like).
+
+
+If you are not using Thonny, copy image.py to your site-packages directory, or just keep it in the same folder as the Python scripts that import it.
 
 
 Usage
@@ -16,7 +20,7 @@ This image library is not going to give you fancy high performance operations on
 Image Types Supported
 ---------------------
 
-If you have PIL installed on your system:
+If you have PIL installed on your system (if you are using Thonny, this was installed along with the image module):
 
 * jpeg
 * gif
@@ -26,37 +30,34 @@ If you have PIL installed on your system:
 
 If you do not have PIL installed then you are stuck with GIF images only.
 
-If you are using Python 2.6/2.7 I recommend you install Pillow its a simple fork
-of PIL that you can install with easy_install or pip.
-
-If you are using Python 3 You can get a working version of PIL
-Here:  https://pypi.python.org/pypi/Pillow/2.0.0
-
-Note that if you scroll down to the bottom you will find binary installations for Windows.  Linux and Mac users can follow the instructions on the page.
-
 
 Example
 -------
 
 ::
 
-    from cImage import *
-    myimagewindow = ImageWin("Image Processing",600,300)
-    oldimage = FileImage("lutherbell.jpg")
-    oldimage.setPosition(0,0)
-    oldimage.draw(myimagewindow)
+    import image
 
-    width = oldimage.getWidth()
-    height = oldimage.getHeight()
-    newim = EmptyImage(width,height)
+    win = image.ImageWin(480, 640, "Image Processing")
+    original_image = image.FileImage('lcastle.gif')
 
-    for row in range(height):
-    	for col in range(width):
-    		oldpixel = oldimage.getPixel(col,row)
-    		ave=(oldpixel.getRed()+oldpixel.getGreen()+oldpixel.getBlue())/3
-    		newim.setPixel(col,row,Pixel(ave,ave,ave))
+    width = original_image.get_width()
+    height = original_image.get_height()
+    print(width, height)
 
-    newim.setPosition(width+1,0)
-    newim.draw(myimagewindow)
+    original_image.draw(win)
+    my_image = original_image.copy()
 
-    myimagewindow.exitOnClick()
+    for row in range(height):
+        for col in range(width):
+             v = my_image.get_pixel(col,row)
+             v.red = 255 - v.red
+             v.green = 255 - v.green
+             v.blue = 255 - v.blue
+             my_image.set_pixel(col,row,v)
+
+    my_image.draw(win)
+    print(win.get_mouse())
+    my_image.save('lcastle-inverted.gif')
+    print(my_image.to_list())
+    win.exit_on_click()

cImage.py image.py

@@ -521,23 +521,27 @@ def __init__(self,thelist):
 
 # Example program  Read in an image and calulate the negative.
 if __name__ == '__main__':
-    win = ImageWin(480,640)
-    oImage = FileImage('lcastle.gif')
-    print(oImage.get_width(), oImage.get_height())
-    oImage.draw(win)
-    myImage = oImage.copy()
-
-    for row in range(myImage.get_height()):
-        for col in range(myImage.get_width()):
-             v = myImage.get_pixel(col,row)
+    win = ImageWin(480, 640, "Image Processing")
+    original_iamge = FileImage('lcastle.gif')
+
+    width = original_iamge.get_width()
+    height = original_iamge.get_height()
+    print(width, height)
+
+    original_iamge.draw(win)
+    my_image = original_iamge.copy()
+
+    for row in range(height):
+        for col in range(width):
+             v = my_image.get_pixel(col,row)
              v.red = 255 - v.red
              v.green = 255 - v.green
              v.blue = 255 - v.blue
 #             x = map(lambda x: 255-x, v)
-             myImage.set_pixel(col,row,v)
+             my_image.set_pixel(col,row,v)
 
-    myImage.draw(win)
+    my_image.draw(win)
     print(win.get_mouse())
-    myImage.save('lcastle-inverted.gif')
-    print(myImage.to_list())
+    my_image.save('lcastle-inverted.gif')
+    print(my_image.to_list())
     win.exit_on_click()

setup.py

@@ -4,12 +4,12 @@
 #    dependencies = [l.strip() for l in fh]
 
 setup(
-    name='cImage',
+    name='image',
     description='Image manipulation library for media computation education',
-    version='1.4.2',
-    py_modules = ['cImage'],
-    author = 'Brad Miller',
-    author_email = 'bonelake@mac.com',
+    version='1.5.1',
+    py_modules = ['image'],
+    author = 'Brad Miller and Dan Schellenberg',
+    author_email = 'schellenberg@gmail.com',
     install_requires= ['Pillow>=2.9.0'],
     include_package_data = False,
     license='GPL',