Added more masking options

Calendar/DesignEntity.py

@@ -1,15 +1,18 @@
 from PIL import Image, ImageOps, ImageDraw
 
+masking_threshold = 100
+
 class DesignEntity (object):
     """General entity that can be drawn on to a panel design or
     other design entities."""
-    def __init__ (self, size, mask=False, invert_mask=False):
+    def __init__ (self, size, mask=False, invert_mask=False, color_key=False):
         self.size = size
         self.pos = (0, 0)
         self.mask = mask
         self.invert_mask = invert_mask
         self.__init_image__()
         self.__finished_image__ = False
+        self.color_key = color_key
 
     def __init_image__ (self, color = 'white'):
         self.__image__ = Image.new('RGB', self.size, color=color)
@@ -20,16 +23,14 @@ class DesignEntity (object):
             self.__finished_image__ = True
         return self.__image__
 
-    def draw (self, subimage, pos, mask=False, invert_mask=False):
+    def draw (self, subimage, pos, mask=False, invert_mask=False, color_key=False):
         img_mask = None
         if mask:
-            img_mask = self.__get_mask__(subimage)
-        if invert_mask:
-            img_mask = ImageOps.invert(img_mask)
+            img_mask = self.__get_mask__(subimage, invert_mask=invert_mask, color_key=color_key)
         self.__image__.paste(subimage, pos, mask=img_mask)
 
     def draw_design (self, entity):
-        self.draw(entity.get_image(), entity.pos, entity.mask, entity.invert_mask)
+        self.draw(entity.get_image(), entity.pos, entity.mask, entity.invert_mask, entity.color_key)
 
     def draw_image (self, path, pos):
         self.draw(Image.open(path), pos)
@@ -37,6 +38,10 @@ class DesignEntity (object):
     def __finish_image__ (self):
         pass
 
-    def __get_mask__ (self, image):
-        mask = image.convert('L').point(lambda p : 0 if p is 0 else 1 )
+    def __get_mask__ (self, image, invert_mask, color_key):
+        mask = image.convert('L')
+        if color_key:
+            mask = mask.point(lambda p : 255 if p >= masking_threshold else 0)
+        if invert_mask:
+            mask = ImageOps.invert(mask)
         return ImageOps.invert(mask)

Calendar/TextDesign.py

@@ -26,6 +26,8 @@ class TextDesign (DesignEntity):
     def __finish_image__ (self):
         if self.color is "white":
             self.invert_mask = True
+        if self.background_color not in ["white", "black"]:
+            self.color_key = True
         self.__init_image__(self.background_color)
 
         self.__font__ = self.__get_font__()