drawlib 0.1.7__tar.gz → 0.1.8__tar.gz

{drawlib-0.1.7 → drawlib-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drawlib
-Version: 0.1.7
+Version: 0.1.8
 Summary: Python drawing library. Illustration as Code.
 Home-page: https://www.drawlib.com
 Author: Yuichi Ito

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/__init__.py

@@ -24,7 +24,7 @@ subpackages contains latest and old implementations.
 from typing import Final
 
 # please update here when you release new version
-VERSION = "0.1.7"
+VERSION = "0.1.8"
 
 # might not be changed
 LIB_NAME: Final[str] = "drawlib"

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/apis.py

@@ -29,6 +29,7 @@ If you requires latest API, import root module instead.
 from drawlib.v0_1.private.core.colors import (
     Colors,
     Colors140,
+    ColorsBase,
 )
 
 from drawlib.v0_1.private.core.model import (
@@ -52,7 +53,7 @@ from drawlib.v0_1.private.core.fonts import (
     FontKorean,
     FontMonoSpace,
     FontRoboto,
-    FontSanSerif,
+    FontSansSerif,
     FontSerif,
     FontSourceCode,
     FontThai,

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core/colors.py

@@ -32,7 +32,7 @@ Please don't use Enum for colors. Just RGB with tuple(int, int int) is good.
 from typing import Final, Tuple, Optional
 
 
-class BaseColors:
+class ColorsBase:
     """Base class of Colors class
 
     Posses color ``Transparent`` and utility functions.
@@ -108,7 +108,7 @@ class BaseColors:
         return (rgb, rgb, rgb, alpha)
 
 
-class Colors(BaseColors):
+class Colors(ColorsBase):
     """Web basic color class.
 
     Supports 16 of basic web colors.
@@ -134,7 +134,7 @@ class Colors(BaseColors):
     Yellow: Final[Tuple[int, int, int]] = (255, 255, 0)
 
 
-class Colors140(BaseColors):
+class Colors140(ColorsBase):
     """Web colors class. CSS Color Module Level3.
 
     Supports 140 of "CSS Color Module Level3" web colors.

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core/dimage.py

@@ -12,7 +12,7 @@
 drawlib depends on ``PIL.Image.Image`` for drawing image.
 It is very useful and easy to use.
 However, drawlib want to let user handle image **very very** easy.
-This module and its class ``Pimage`` achieves it.
+This module and its class ``Dimage`` achieves it.
 
 """
 
@@ -41,7 +41,7 @@ class DimageCache:
         self._cache: Dict[str, Dimage] = {}
 
     def has(self, name: str) -> bool:
-        """check whether having Pimage cache or not.
+        """check whether having Dimage cache or not.
 
         Args:
             name: cache name
@@ -53,8 +53,8 @@ class DimageCache:
 
         return name in self._cache
 
-    def set(self, name: str, image: Dimage) -> None:
-        """Set **copied** Pimage cache with provided name key.
+    def set(self, name: str, image: Union[str, Dimage, Image.Image]) -> None:
+        """Set **copied** Dimage cache with provided name key.
 
         This method copies original object and set copied one.
         It means you can modify original object after caching.
@@ -62,31 +62,31 @@ class DimageCache:
 
         Args:
             name: cache key.
-            style: Pimage object which you want to cache.
+            image: file path or Dimage or PIL image.
 
         Returns:
             None
 
         """
 
-        self._cache[name] = image.copy()
+        self._cache[name] = Dimage(image=image, copy=True)
 
     def list(self) -> List[str]:
         return list_(self._cache.keys())
 
     def get(self, name: str) -> Dimage:
-        """Get **copied** Pimage cache via name(key).
+        """Get **copied** Dimage cache via name(key).
 
         This method doesn't return original object.
         But **copied** object.
-        So, you can modify returned Pimage object.
-        It doesn't harm original cached Pimage object.
+        So, you can modify returned Dimage object.
+        It doesn't harm original cached Dimage object.
 
         Args:
             name: cache key.
 
         Returns:
-            Pimage: copy of original cached object.
+            Dimage: copy of original cached object.
 
         """
 
@@ -95,9 +95,9 @@ class DimageCache:
         return self._cache[name].copy()
 
     def delete(self, name: str) -> None:
-        """Delete Pimage cache
+        """Delete Dimage cache
 
-        Delete Pimage cache if exist.
+        Delete Dimage cache if exist.
         If not exist, just ignore deletion request.
 
         Args:
@@ -127,15 +127,15 @@ class Dimage:
     @error_handler
     def __init__(
         self,
-        image: Union[str, Image.Image, Dimage],
+        image: Union[str, Dimage, Image.Image],
         copy: bool = False,
     ):
-        """Initialize Pimage from file, PIL Image, Pimage.
+        """Initialize Dimage from file, PIL Image, Dimage.
 
-        Initialize Pimage from file path, PIL Image, Pimage.
+        Initialize Dimage from file path, PIL Image, Dimage.
 
         Note:
-            File path is relative to user code which calls ``Pimage()``.
+            File path is relative to user code which calls ``Dimage()``.
             Not from where you call python (default path behavior).
             If you want to have normal path behavior,
             convert relative path to absolute path.
@@ -164,14 +164,14 @@ class Dimage:
                 self._pilimg = image._pilimg
 
         else:
-            raise ValueError(f'Pimage does not support type "{type(image)}".')
+            raise ValueError(f'Dimage does not support type "{type(image)}".')
 
     @error_handler
     def get_pil_image(self) -> Image.Image:
         """Get **copied** PIL Image.
 
-        Get **copied** PIL Image which Pimage instance holds.
-        Modification to the PIL Image has no effects to Pimage.
+        Get **copied** PIL Image which Dimage instance holds.
+        Modification to the PIL Image has no effects to Dimage.
 
         Returns:
             PIL.Image.Image: copy of PIL Image.
@@ -187,12 +187,12 @@ class Dimage:
 
     @error_handler
     def copy(self) -> Dimage:
-        """Get copied Pimage
+        """Get copied Dimage
 
-        Create another Pimage instance which has same content.
+        Create another Dimage instance which has same content.
 
         Returns:
-            Pimage: deep copied image
+            Dimage: deep copied image
 
         """
 
@@ -200,7 +200,7 @@ class Dimage:
 
     @error_handler
     def save(self, file: str) -> None:
-        """Save Pimage data to file
+        """Save Dimage data to file
 
         Save to specified file path.
         Path is relative to script file which calls this method.
@@ -221,6 +221,7 @@ class Dimage:
         os.makedirs(directory, exist_ok=True)
         self._pilimg.save(abspath, quality=95)
 
+    '''
     @error_handler
     def border(
         self,
@@ -239,15 +240,15 @@ class Dimage:
 
     @error_handler
     def rotate(self, angle: float) -> Dimage:
-        """Get rotated new Pimage. Original Pimage is keeped.
+        """Get rotated new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has rotated.
+        Get new Dimage which has rotated.
 
         Args:
             angle: between 0.0 ~ 360. pixel size can be changed. New area becomes transparent.
 
         Returns:
-            Pimage: new rotated image.
+            Dimage: new rotated image.
 
         """
 
@@ -257,19 +258,20 @@ class Dimage:
             expand=True,
         )
         return Dimage(newimg)
+    '''
 
     @error_handler
     def resize(self, width: int, height: int) -> Dimage:
-        """Get resized new Pimage. Original Pimage is keeped.
+        """Get resized new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has resized.
+        Get new Dimage which has resized.
 
         Args:
             width: new image width
             height: new image height
 
         Returns:
-            Pimage: new rotated image.
+            Dimage: new rotated image.
 
         """
 
@@ -281,12 +283,12 @@ class Dimage:
 
     @error_handler
     def flip(self) -> Dimage:
-        """Get flipped new Pimage. Original Pimage is keeped.
+        """Get flipped new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has flip effect.
+        Get new Dimage which has flip effect.
 
         Returns:
-            Pimage: new flipped image.
+            Dimage: new flipped image.
 
         """
 
@@ -295,12 +297,12 @@ class Dimage:
 
     @error_handler
     def mirror(self) -> Dimage:
-        """Get mirrored new Pimage. Original Pimage is keeped.
+        """Get mirrored new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has mirror effect.
+        Get new Dimage which has mirror effect.
 
         Returns:
-            Pimage: new mirror image.
+            Dimage: new mirror image.
 
         """
 
@@ -309,12 +311,12 @@ class Dimage:
 
     @error_handler
     def invert(self) -> Dimage:
-        """Get inverted new Pimage. Original Pimage is keeped.
+        """Get inverted new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has invert effect.
+        Get new Dimage which has invert effect.
 
         Returns:
-            Pimage: new inverted image.
+            Dimage: new inverted image.
 
         """
 
@@ -335,12 +337,12 @@ class Dimage:
 
     @error_handler
     def grayscale(self) -> Dimage:
-        """Get grayscaled new Pimage. Original Pimage is keeped.
+        """Get grayscaled new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has grayscale effect.
+        Get new Dimage which has grayscale effect.
 
         Returns:
-            Pimage: new grayscaled image.
+            Dimage: new grayscaled image.
 
         """
 
@@ -349,12 +351,12 @@ class Dimage:
 
     @error_handler
     def brightness(self, brightness_: float = 0.5) -> Dimage:
-        """Get brightness changed new Pimage. Original Pimage is keeped.
+        """Get brightness changed new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has change brightness effect.
+        Get new Dimage which has change brightness effect.
 
         Returns:
-            Pimage: new brightness changed image.
+            Dimage: new brightness changed image.
 
         """
 
@@ -364,12 +366,12 @@ class Dimage:
 
     @error_handler
     def sepia(self) -> Dimage:
-        """Get sepia color new Pimage. Original Pimage is keeped.
+        """Get sepia color new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has sepia effect.
+        Get new Dimage which has sepia effect.
 
         Returns:
-            Pimage: new sepia color image.
+            Dimage: new sepia color image.
 
         """
 
@@ -398,12 +400,12 @@ class Dimage:
         # black: Union[str, Tuple[int, int, int]],
         # white: Union[str, Tuple[int, int, int]],
     ) -> Dimage:
-        """Get colorized new Pimage. Original Pimage is keeped.
+        """Get colorized new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has colorize effect.
+        Get new Dimage which has colorize effect.
 
         Returns:
-            Pimage: new colorized image.
+            Dimage: new colorized image.
 
         """
 
@@ -419,12 +421,12 @@ class Dimage:
 
     @error_handler
     def posterize(self, num_colors: int = 4) -> Dimage:
-        """Get posterized new Pimage. Original Pimage is keeped.
+        """Get posterized new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has posterized effect.
+        Get new Dimage which has posterized effect.
 
         Returns:
-            Pimage: new posterized image.
+            Dimage: new posterized image.
 
         """
 
@@ -441,12 +443,12 @@ class Dimage:
 
     @error_handler
     def mosaic(self) -> Dimage:
-        """Get mosiac new Pimage. Original Pimage is keeped.
+        """Get mosiac new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has mosaic effect.
+        Get new Dimage which has mosaic effect.
 
         Returns:
-            Pimage: new mosaic image.
+            Dimage: new mosaic image.
 
         """
 
@@ -459,12 +461,12 @@ class Dimage:
 
     @error_handler
     def blur(self) -> Dimage:
-        """Get blur new Pimage. Original Pimage is keeped.
+        """Get blur new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has blur effect.
+        Get new Dimage which has blur effect.
 
         Returns:
-            Pimage: new blur image.
+            Dimage: new blur image.
 
         """
 
@@ -473,12 +475,12 @@ class Dimage:
 
     @error_handler
     def line_extraction(self) -> Dimage:
-        """Get line extracted new Pimage. Original Pimage is keeped.
+        """Get line extracted new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has line extraction effect.
+        Get new Dimage which has line extraction effect.
 
         Returns:
-            Pimage: new line extracted image.
+            Dimage: new line extracted image.
 
         """
 
@@ -493,12 +495,12 @@ class Dimage:
         self,
         margin_color: Union[None, str, Tuple[int, int, int]],
     ) -> Dimage:
-        """Get margin removed new Pimage. Original Pimage is keeped.
+        """Get margin removed new Dimage. Original Dimage is keeped.
 
-        Get new Pimage which has margin removed.
+        Get new Dimage which has margin removed.
 
         Returns:
-            Pimage: new margin removed image.
+            Dimage: new margin removed image.
 
         """
 

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core/fonts.py

@@ -70,7 +70,7 @@ class FontFile:
 # - Font: English + CJK
 #
 # Alphabet
-# - FontSanSerif
+# - FontSansSerif
 # - FontSans
 # - FontMonoSpace
 # - FontRoboto
@@ -129,7 +129,7 @@ class Font(FontBase):
     )
 
 
-class FontSanSerif(FontBase):
+class FontSansSerif(FontBase):
     """Drawlib Fonts.
 
     Drawlib avoid using system font since it depends on host OS.

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core/model.py

@@ -36,7 +36,7 @@ from drawlib.v0_1.private.core.fonts import (
     FontArabic,
     FontBase,
     FontSerif,
-    FontSanSerif,
+    FontSansSerif,
     FontChinese,
     FontJapanese,
     FontKorean,
@@ -661,7 +661,7 @@ class ShapeTextStyle:
         FontArabic,
         FontBase,
         FontSerif,
-        FontSanSerif,
+        FontSansSerif,
         FontChinese,
         FontJapanese,
         FontKorean,
@@ -759,7 +759,7 @@ class ShapeTextStyle:
         FontArabic,
         FontBase,
         FontSerif,
-        FontSanSerif,
+        FontSansSerif,
         FontChinese,
         FontJapanese,
         FontKorean,
@@ -780,7 +780,7 @@ class ShapeTextStyle:
             FontArabic,
             FontBase,
             FontSerif,
-            FontSanSerif,
+            FontSansSerif,
             FontChinese,
             FontJapanese,
             FontKorean,
@@ -886,7 +886,7 @@ class TextStyle:
         FontArabic,
         FontBase,
         FontSerif,
-        FontSanSerif,
+        FontSansSerif,
         FontChinese,
         FontJapanese,
         FontKorean,
@@ -988,7 +988,7 @@ class TextStyle:
         FontArabic,
         FontBase,
         FontSerif,
-        FontSanSerif,
+        FontSansSerif,
         FontChinese,
         FontJapanese,
         FontKorean,
@@ -1009,7 +1009,7 @@ class TextStyle:
             FontArabic,
             FontBase,
             FontSerif,
-            FontSanSerif,
+            FontSansSerif,
             FontChinese,
             FontJapanese,
             FontKorean,

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core/theme_officials.py

@@ -104,6 +104,30 @@ def get_default() -> _ThemeReturnValue:
     )
 
 
+def get_flat_ui_palette_v1() -> _ThemeReturnValue:
+    # https://flatuicolors.com/palette/defo
+    turquoise = (26, 188, 156)
+    green_sea = (22, 160, 133)
+    emerald = (46, 204, 113)
+    nephritis = (39, 174, 96)
+    peter_river = (52, 152, 219)
+    belize_hole = (41, 128, 185)
+    amethyst = (155, 89, 182)
+    wisteria = (142, 68, 173)
+    wet_asphalt = (52, 73, 94)
+    midnight_blue = (44, 62, 80)
+    sun_flower = (241, 196, 15)
+    orange = (243, 156, 18)
+    carrot = (230, 126, 34)
+    pumpkin = (211, 84, 0)
+    alizarin = (231, 76, 60)
+    pomegranate = (192, 57, 43)
+    clouds = (236, 240, 241)
+    silver = (189, 195, 199)
+    concrete = (149, 165, 166)
+    asbestos = (127, 140, 141)
+
+
 def get_gray() -> _ThemeReturnValue:
     """Change theme to gray.
 

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core_canvas/base.py

@@ -66,7 +66,6 @@ class CanvasBase:
     DEFAULT_GRID_ONLY: Final[bool] = False
     DEFAULT_GRID_STYLE: Final[LineStyle] = LineStyle(width=1, color=Colors.Gray, style="dashed")
     DEFAULT_GRID_CENTERSTYLE: Final[LineStyle] = LineStyle(width=2, color=Colors.Gray, style="dashed")
-    SYSTEM_FONTS = ["serif", "sanserif"]
 
     @error_handler
     def __init__(self) -> None:

{drawlib-0.1.7 → drawlib-0.1.8}/drawlib/v0_1/private/core_canvas/image.py

@@ -127,6 +127,15 @@ class CanvasImageFeature(CanvasPatchesFeature):
         # create image drawing object
         pil_image = pimg.get_pil_image()
         im = numpy.array(pil_image)
+
+        # grayscale doesn't work fine on matplotlib. convert to RGBA.
+        if im.ndim == 3:
+            if im.shape[2] == 2:
+                gray = im[:, :, 0]
+                alpha = im[:, :, 1]
+                rgb_array = numpy.stack((gray, gray, gray), axis=-1)
+                im = numpy.concatenate((rgb_array, alpha[:, :, numpy.newaxis]), axis=-1)
+
         imagebox = offsetbox.OffsetImage(im, zoom=zoom)
         ab = offsetbox.AnnotationBbox(imagebox, (x, y), frameon=False)
 

{drawlib-0.1.7 → drawlib-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "drawlib"
-version = "0.1.7"
+version = "0.1.8"
 description = "Python drawing library. Illustration as Code."
 homepage = "https://www.drawlib.com"
 repository = "https://github.com/yuichi110/drawlib"