Merge branch 'Riddlerat/pgm-work' into feature-tests

Author: Matt Land

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/Users/Lyra/Documents/GitHub/Adafruit_CircuitPython_ImageLoad/venv/bin/python3.7"
+}

adafruit_imageload/pnm/pgm/__init__.py

@@ -0,0 +1,93 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2018 Scott Shawcroft for Adafruit Industries LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+"""
+`adafruit_imageload.pnm`
+====================================================
+
+Load pixel values (indices or colors) into a bitmap and colors into a palette.
+
+* Author(s): Matt Land, Brooke Storm, Sam McGahan
+
+"""
+#import logging
+
+def load(file, magic_number, header, *, bitmap=None, palette=None):
+    # TODO: remove unused variables later
+    width = header[0]
+    height = header[1]
+    max_colors = header[2]
+    bitmap = bitmap(width, height, max_colors)
+    colors = set()
+    pixel = bytearray()
+
+
+    if max_colors > 256:
+        # raise exception
+        raise NotImplementedError("16 bit grayscale not supported")
+
+    if magic_number == b'P2': # To handle ascii PGM files.
+        # Handle ascii
+        for y in range(height):
+            for x in range(width):
+            # Takes int and converts to an 8 bit
+                while True:
+                    byte = file.read(1)  # type: byte
+                    if not byte.isdigit():
+                        break
+                    pixel += byte
+
+                int_pixel = int("".join(["%c" % char for char in pixel]))
+                bitmap[x, y] = int_pixel
+                colors.add(int_pixel)
+                # logging.info(f'{x}, {y}, {byte}, {int_pixel}')
+        if palette:
+            palette = palette(len(colors))
+            for counter, color in enumerate(colors):
+                color_bytearray = bytearray()
+                for i in range(3):
+                    color_bytearray += bytes([color])
+                palette[counter] = color_bytearray
+        return bitmap, palette
+
+
+    if magic_number == b'P5': # To handle binary PGM files.
+        for y in range(height):
+            for x in range(width):
+                byte = file.read(1)
+                if byte == b"":
+                    raise ValueError("ran out of file unexpectedly")
+                int_pixel = int.from_bytes(byte, "little")
+                bitmap[x, y] = int_pixel
+                colors.add(int_pixel)
+
+
+        if palette:
+            palette = palette(len(colors))
+            for counter, color in enumerate(colors):
+                color_bytearray = bytearray()
+                for i in range(3):
+                    color_bytearray += bytes([color])
+                palette[counter] = color_bytearray
+
+        return bitmap, palette
+
+    raise NotImplementedError("Was not able to send image")

adafruit_imageload/tests/test_pnm_load.py

@@ -57,11 +57,19 @@ def __str__(self):
         for y in range(self.height):
             for x in range(self.width):
                 data = self[x, y]
-                out += f"{data}"
+                out += f"{data} "
             out += "\n"
         return out
 
 
+class Palette_C_Interface(object):
+    def __init__(self, num_colors):
+        self.num_colors = num_colors
+        self.colors = {}
+
+    def __setitem__(self, key, value):
+        self.colors[key] = value
+
 logging.getLogger().setLevel(logging.INFO)
 
 
@@ -137,6 +145,46 @@ def test_decode(self):
         self.assertEqual((3, 3), b._decode(encoded))
 
 
+class TestPgmLoad(TestCase):
+    def test_load_works_p2_ascii(self):
+        test_file = os.path.join(
+            os.path.dirname(__file__),
+            "..",
+            "..",
+            "examples",
+            "images",
+            "netpbm_p2_ascii.pgm",
+        )
+        with open(test_file, "rb") as f:
+            bitmap, palette = pnm.load(f, b"P2", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface)
+        self.assertTrue(isinstance(bitmap, Bitmap_C_Interface), bitmap)
+        self.assertEqual(255, bitmap.colors)
+        self.assertEqual(8, bitmap.width)
+        self.assertEqual(8, bitmap.height)
+        bitmap.validate()
+        self.assertEqual(6, palette.num_colors)
+
+    def test_load_works_p5_binary(self):
+        test_file = os.path.join(
+            os.path.dirname(__file__),
+            "..",
+            "..",
+            "examples",
+            "images",
+            "netpbm_p5_binary.pgm",
+        )
+        with open(test_file, "rb") as f:
+            bitmap, palette = pnm.load(f, b"P5", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface)
+        self.assertTrue(isinstance(bitmap, Bitmap_C_Interface), bitmap)
+        self.assertEqual(255, bitmap.colors)
+        self.assertEqual(8, bitmap.width)
+        self.assertEqual(8, bitmap.height)
+        bitmap.validate()
+        self.assertEqual(8, palette.num_colors)
+        
+
+
+
 class TestPnmLoad(TestCase):
     def test_load_fails_with_no_header_data(self):
         f = BytesIO(b"some initial binary data: \x00\x01")

examples/images/netpbm_p2_ascii.pgm

@@ -0,0 +1,10 @@
+P2
+8 8 255
+0 255 0 203 128 0 128 0
+128 0 84 0 0 84 0 255
+0 84 0 255 62 0 84 0
+128 0 62 0 0 255 0 203
+203 0 255 0 0 62 0 128
+0 84 0 62 255 0 84 0
+255 0 84 0 0 84 0 128
+0 128 0 128 203 0 255 0