Add files via upload

Author: srbrettle

imageManipulation.py

@@ -1,15 +1,19 @@
 from PIL import Image
 from tkinter import filedialog
-import imghdr
 
-def resizeImage(im, width, height, skipdialog=False):
-    imNN = im.resize((width, height), Image.NEAREST)        # use nearest neighbour
-    # imBL = im.resize((width, height), Image.BILINEAR)     # linear interpolation in a 2x2 environment
-    # imBC = im.resize((width, height), Image.BICUBIC)      # cubic spline interpolation in a 4x4 environment
-    # imAA = im.resize((width, height), Image.ANTIALIAS)    # best down-sizing filter
+
+def resizeImage(im, filtr, width, height, skipdialog=False):
+    if filtr == "Nearest Neighbour":
+        image = im.resize((width, height), Image.NEAREST)      # nearest neighbour
+    elif filtr == "Bilinear":
+        image = im.resize((width, height), Image.BILINEAR)     # bilinear interpolation
+    elif filtr == "Bicubic":
+        image = im.resize((width, height), Image.BICUBIC)      # bicubic interpolation
+    elif filtr == "Anti-Alias":
+        image = im.resize((width, height), Image.ANTIALIAS)    # antialiasing
 
     if skipdialog:
-        file = "Test.png"
+        file = (filtr + ".png")
     else:
         myFormats = [('Portable Network Graphics (.png)', '*.png'),
                      ('JPEG / JFIF (.jpg)', '*.jpg'),
@@ -18,5 +22,5 @@ def resizeImage(im, width, height, skipdialog=False):
         file = filedialog.asksaveasfilename(defaultextension=".png", filetypes=myFormats)
 
     if file:
-        imNN.save(file)
+        image.save(file)
         return file

main.py

@@ -1,4 +1,4 @@
-from tkinter import Tk, Label, Entry, Button, StringVar, W, E, filedialog, messagebox
+from tkinter import Tk, Label, Entry, Button, StringVar, W, E, filedialog, messagebox, ttk
 import imageManipulation
 from PIL import Image
 import imghdr
@@ -13,6 +13,7 @@ def __init__(self, master):
         self.filename = "..."
         self.xOrig = "X"
         self.yOrig = "Y"
+        self.filter = "Nearest Neighbour"
 
         self.filename_label_text = StringVar()
         self.filename_label_text.set(self.filename)
@@ -38,6 +39,11 @@ def __init__(self, master):
         self.contentY = StringVar()
         self.entryY = Entry(master, text="Height: ", validate='key', validatecommand=vc, textvariable=self.contentY)
 
+        self.combobox_value = StringVar()
+        self.combobox = ttk.Combobox(master, textvariable=self.combobox_value)
+        self.combobox['values'] = ('Nearest Neighbour', 'Bilinear', 'Bicubic', 'Anti-Alias')
+        self.combobox.current(0)
+
         self.browse_button = Button(master, text="Browse...", command=lambda: self.update("browse"))
         self.generate_button = Button(master, text="Generate", command=lambda: self.update("generate"))
         self.reset_button = Button(master, text="Reset", command=lambda: self.update("reset"))
@@ -54,8 +60,9 @@ def __init__(self, master):
         self.label_y_orig.grid(row=3, column=1, sticky=W+E)
         self.entryX.grid(row=2, column=4, sticky=W+E)
         self.entryY.grid(row=3, column=4, sticky=W+E)
-        self.generate_button.grid(row=4, column=0, columnspan=4, sticky=W+E)
-        self.reset_button.grid(row=4, column=4, sticky=W+E)
+        self.combobox.grid(row=4, column=0, columnspan=5, sticky=W+E)
+        self.generate_button.grid(row=5, column=0, columnspan=4, sticky=W+E)
+        self.reset_button.grid(row=5, column=4, sticky=W+E)
 
         self.im = Image
 
@@ -89,7 +96,8 @@ def update(self, method):
             root.withdraw()
         elif method == "generate":
             if not (self.contentX.get() == "") or (self.contentY.get() == ""):
-                imageManipulation.resizeImage(self.im, int(self.contentX.get()), int(self.contentY.get()))
+                self.filter = self.combobox.get()
+                imageManipulation.resizeImage(self.im, self.filter, int(self.contentX.get()), int(self.contentY.get()))
         else:  # reset
             self.clear()
 
@@ -102,6 +110,7 @@ def clear(self):
         self.label_y_orig_text.set(self.yOrig)
         self.contentX.set("")
         self.contentY.set("")
+        self.combobox.current(0)
 
     def validate(self, action, index, value_if_allowed,
                  prior_value, text, validation_type, trigger_type, widget_name):

test.py

@@ -5,17 +5,13 @@
 import imageManipulation
 
 
-class TestMethods(unittest.TestCase):
+class TestMethods(unittest.TestCase):                            
+        
+    def test_test_file_exists(self):
+        self.assertTrue(os.path.isfile("C:\\test.png"))
 
-    def setUp(self):
-        global filepath
-        filepath = "C:\\test.png"
-
-    def test_file_exists(self):
-        self.assertTrue(os.path.isfile(filepath))
-
-    def test_file_is_image(self):
-        self.assertNotEqual(imghdr.what(filepath), None)
+    def test_test_file_is_image(self):
+        self.assertNotEqual(imghdr.what("C:\\test.png"), None)
 
     def test_diallow_non_images(self):
         fpath = "C:\\test.txt"
@@ -26,15 +22,27 @@ def test_diallow_non_images(self):
             height = 500
             imageManipulation.resizeImage(im, width, height, True)
 
+    def test_create(self):        
+        im = Image.open("C:\\test.png")
+        filtr = "Nearest Neighbour"
+        self.width = 500
+        self.height = 500
+        self.im2path = imageManipulation.resizeImage(im, filtr, self.width, self.height, True)
+        self.assertIsNotNone(self.im2path)
+
+    def test_created_file_exists(self):
+        self.assertTrue(os.path.isfile("Nearest Neighbour.png"))
+
+    def test_created_file_is_image(self):
+        self.assertNotEqual(imghdr.what("Nearest Neighbour.png"), None)
+
     def test_resized_dimensions_correct(self):
-        im = Image.open(filepath)
-        width = 500
-        height = 500
-        im2path = imageManipulation.resizeImage(im, width, height, True)
-        im2 = Image.open(im2path)
+        im2 = Image.open("Nearest Neighbour.png")
+        self.width = 500
+        self.height = 500
         newWidth, newHeight = im2.size
-        self.assertEqual(height, newHeight)
-        self.assertEqual(width, newWidth)
+        self.assertEqual(self.height, newHeight)
+        self.assertEqual(self.width, newWidth)
 
 
 if __name__ == '__main__':