🤖👽

Author: Errolyn

.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

@@ -29,32 +29,49 @@
 
 """
 
-def load(f, magic_number, header, *, bitmap=None, palette=None):
+
+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] + 1
+    max_colors = header[2]
     min_color = 1 # probably don't need this
     columns = height
-    line_length = width //(8 // max_colors)
     bitmap = bitmap(width, height, max_colors)
 
 
-    if max_color > 256:
+    if max_colors > 256:
         # raise exception
         raise NotImplementedError("16 bit grayscale not supported")
 
-    if magic_number == "P2":
+    if magic_number == b'P2':
         # Handle ascii
-        for x in height:
-            for y in line_length:
+        colors = set()
+        for y in range(height):
+            for x in range(width):
             # Takes int and converts to an 8 bit
-                
-                bitmap[x,y] = format(inttoformat,'08b')
+                pixel = bytearray()
+
+                while True:
+                    bit = file.read(1)  # type: byte
+                    if not bit.isdigit():
+                        break
+                    pixel += bit
+
+                bitmap[x, y] = int(pixel)
+                colors.add(int(pixel))
+        if palette:
+            palette = palette(len(colors))
+            for counter, color in enumerate(colors):
+                color_int = int(f'{hex(color)}{hex(color)[2:]}{hex(color)[2:]}', 16) # HACK: is there a better way?
+                palette[counter] = color_int
+        return bitmap, palette
 
 
+    if magic_number == b'P5':
+        raise NotImplementedError("Nope")
 
-    if magic_number == "P5":
+    raise NotImplementedError("no")
 
     # Assign bits to bitmap
 

adafruit_imageload/tests/test_pnm_load.py

@@ -57,10 +57,17 @@ 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)
 
@@ -136,6 +143,26 @@ def test_decode(self):
         encoded = b._abs_pos(3, 3)
         self.assertEqual((3, 3), b._decode(encoded))
 
+class testPgmLoad(TestCase):
+    def test_load_works_p1_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.fail(str(bitmap))
+
+
 
 class TestPnmLoad(TestCase):
     def test_load_fails_with_no_header_data(self):

testImages-Temp/pgmTestascii.pgm examples/images/netpbm_p2_ascii.pgmtestImages-Temp/pgmTestascii.pgm renamed to examples/images/netpbm_p2_ascii.pgm

@@ -7,4 +7,4 @@ P2
 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 
+0 128 0 128 203 0 255 0