added support to merge two images

ojii · Sep 19, 2012 · fc0b93e · fc0b93e
1 parent 4d35cfb
commit fc0b93e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/pymaging/image.py b/pymaging/image.py
@@ -212,3 +212,12 @@ def crop(self, width, height, padding_top, padding_left):
     def draw(self, shape, color):
         for x, y, pixelcolor in shape.iter_pixels(color):
             self.set_color(x, y, pixelcolor)
+
+    def merge(self, padding_top, padding_left, image):
+        """
+        Merges the two images, putting the image given on top of this image with with the given padding
+        """
+        # there *must* be a better/faster way to do this:
+        for x in range(min([image.width, self.width - padding_left])):
+            for y in range(min([image.height, self.height- padding_top])):
+                self.set_color(padding_left + x, padding_top + y, image.get_color(x, y))
diff --git a/pymaging/tests/test_basic.py b/pymaging/tests/test_basic.py
@@ -198,3 +198,47 @@ def test_draw_line_steep(self):
             [Black, White, Black, Black, Black],
             [Black, White, Black, Black, Black],
         ])
+
+    def test_merge_simple(self):
+        main = image_factory([
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+        ])
+        other =image_factory([
+            [White, White, White],
+            [White, White, White],
+            [White, White, White],
+        ])
+        main.merge(1, 1, other)
+        self.assertImage(main, [
+            [Black, Black, Black, Black, Black],
+            [Black, White, White, White, Black],
+            [Black, White, White, White, Black],
+            [Black, White, White, White, Black],
+            [Black, Black, Black, Black, Black],
+        ])
+
+    def test_merge_partial(self):
+        main = image_factory([
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+        ])
+        other =image_factory([
+            [White, White, White],
+            [White, White, White],
+            [White, White, White],
+        ])
+        main.merge(3, 3, other)
+        self.assertImage(main, [
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, Black, Black],
+            [Black, Black, Black, White, White],
+            [Black, Black, Black, White, White],
+        ])