drawzero 0.5.1__tar.gz → 0.5.4__tar.gz

{drawzero-0.5.1/src/drawzero.egg-info → drawzero-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drawzero
-Version: 0.5.1
+Version: 0.5.4
 Summary: A zero-boilerplate canvas drawing framework for Python 3, based on Pygame.
 Author-email: Sergey Shashkov <sh57@yandex.ru>
 License: MIT

{drawzero-0.5.1 → drawzero-0.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "drawzero"
-version = "0.5.1"
+version = "0.5.4"
 authors = [
   { name="Sergey Shashkov", email="sh57@yandex.ru" },
 ]

{drawzero-0.5.1 → drawzero-0.5.4}/src/drawzero/__about__.py

@@ -5,7 +5,7 @@ __all__ = [
     "__copyright__",
 ]
 
-__version__ = '0.5.1'
+__version__ = '0.5.4'
 __author__ = "Sergey Shashkov"
 __license__ = "MIT"
 __copyright__ = "Copyright 2020- Sergey Shashkov"

{drawzero-0.5.1 → drawzero-0.5.4}/src/drawzero/examples/06_turtle_style.py

@@ -6,7 +6,7 @@ colors = [C.darkslategrey, C.dimgrey, C.slateblue, C.darkblue, C.yellowgreen, C.
 # Drawing regular polygons for n from 3 to 10
 # Рисуем правильные треугольник (n=3), четырёхугольник и т.д. до десятиугольник
 for n in range(3, 11):
-    cur = Pt(600, 200)
+    cur = Pt(600, 800)
     # Drawing n lines for regular polygon
     # Каждую сторону рисуем отдельно
     for i in range(n):

{drawzero-0.5.1 → drawzero-0.5.4}/src/drawzero/examples/19_game_colors.py

@@ -2,8 +2,8 @@ from drawzero import *
 import random
 from time import time
 
-COLORS = [('жёлтый', 'yellow'), ('зелёный', 'green'), ('голубой', '#42aaff'), ('синий', '#0000ff'), ('фиолетовый', 'purple'), ('красный', 'red'),
-          ('оранжевый', 'orange'), ('коричневый', 'brown'), ('серый', 'gray'), ('белый', 'white'), ]
+COLORS = [('yellow', 'yellow'), ('green', 'green'), ('cyan', '#42aaff'), ('blue', '#0000ff'), ('purple', 'purple'),
+          ('red', 'red'), ('orange', 'orange'), ('brown', 'brown'), ('gray', 'gray'), ('white', 'white'), ]
 
 
 def gen_new():
@@ -33,20 +33,20 @@ while True:
         cur_status = None
         time_left = cur_timelimit
     clear()
-    text('white', f'Ваши очки: {score}', (500, 50), 48)
-    text('white', f'Дважды кликните левой кнопкой мыши,', (500, 100), 32)
-    text('white', f'если совпадает слово и цвет, иначе — правой', (500, 142), 32)
-    text('white', f'{time_left:0.2f}с...', (500, 600), 48)
+    text('white', f'Scores: {score}', (500, 50), 48)
+    text('white', f'Double-click the left mouse button,', (500, 100), 32)
+    text('white', f'if the word and color match, otherwise right-click', (500, 142), 32)
+    text('white', f'{time_left:0.2f}s...', (500, 600), 48)
     text(color, cur_word, (500, 500), 120)
     if cur_status == 1:
-        text('green', 'Совпадают?', (500, 700), 48)
+        text('green', 'Match?', (500, 700), 48)
     elif cur_status == 3:
-        text('red', 'Различаются?', (500, 800), 48)
-    # Половина секунды после смены цвета игнорируем нажатия
+        text('red', 'Mismatch?', (500, 800), 48)
+    # Ignore clicks for half a second after color change
     for ev in mousebuttonsdown:
         if cur_ts - last_status_ts > 0.3:
             if ev.button == cur_status:
-                # Пользователь подтвердил
+                # User confirmed
                 if (corr and cur_status == 1) or (not corr and cur_status == 3):
                     score += 1
                     cur_timelimit *= 0.95

{drawzero-0.5.1 → drawzero-0.5.4}/src/drawzero/utils/draw.py

@@ -1,4 +1,6 @@
 import os
+from typing import Type, Literal
+
 from math import sin, cos, pi
 from time import time
 
@@ -260,10 +262,11 @@ def filled_polygon(color='red', *points, alpha=255):
 
 
 
-_VALID_ALIGN = {x + y for x in '<.>' for y in '^.v'}
+_VALID_ALIGN = {'<.', '.<', '>.', '^>', 'v>', '.^', 'v.', '>^', 'v<', '<v', '..', '.v', '>v', '.>', '^<', '^.', '<^'}
+TAlign: Type = Literal['<.', '.<', '>.', '^>', 'v>', '.^', 'v.', '>^', 'v<', '<v', '..', '.v', '>v', '.>', '^<', '^.', '<^']
 
 
-def text(color='red', text='Hello!', pos=(100, 100), fontsize=24, align='..'):
+def text(color='red', text='Hello!', pos=(100, 100), fontsize=24, align: TAlign = '..'):
     """Draw text to the screen."""
     error = BadDrawParmsError()
     use_color = _to_color(color, error)
@@ -272,6 +275,9 @@ def text(color='red', text='Hello!', pos=(100, 100), fontsize=24, align='..'):
     if align not in _VALID_ALIGN:
         error.errors.append(I18N.bad_text_align.format(align))
         error.errors.append(I18N.use_text_align)
+    if isinstance(align, str) and len(align) == 2:
+        if align[0] in '^v':
+            align = align[::-1]
     if error.errors:
         error.call_string = f'text({color!r}, {text!r}, {pos!r}, {fontsize!r}, {align!r})'
         error.example = f"text({color if use_color else 'red'!r}, {text!r}, {use_pos or (100, 100)!r}, {use_fontsize or 24!r}, {align if align in _VALID_ALIGN else '..'!r})"

{drawzero-0.5.1 → drawzero-0.5.4}/src/drawzero/utils/renderer.py

@@ -5,6 +5,7 @@ import os
 from typing import Tuple, List, Union, Optional
 
 import warnings
+
 warnings.filterwarnings(
     "ignore",
     message=r"pkg_resources is deprecated.*",
@@ -13,6 +14,7 @@ warnings.filterwarnings(
 )
 
 os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = '1'
+from drawzero.utils.key_flags import KEY
 import pygame
 import pygame.locals
 
@@ -240,12 +242,7 @@ def draw_image(path: str, pos: Pt, width: int = None, alpha: int = 255):
         height = int(h * width / w + 0.5)
         image = pygame.transform.smoothscale(image, (width, height))
     if alpha != 255:
-        temp = pygame.Surface((image.get_width(), image.get_height())).convert()  # Create a temporary image OPAQUE the size of the image
-        temp.blit(_surface, (-pos[0], -pos[1]))  # Blit the OPAQUE BACKGROUND onto this temporary image.
-        temp.blit(image, (0, 0))  # Blit the per-pixel transparency image onto the temporary image.
-        # The temporary image is completely opaque and has the transparent image on it above the background.
-        temp.set_alpha(alpha)
-        image = temp
+        image.set_alpha(alpha)
     _surface.blit(image, pos)
     _display_update_if_no_animation()
 
@@ -365,8 +362,32 @@ def get_mouse_pressed():
     return pygame.mouse.get_pressed(3)
 
 
+class KeysPressed:
+    def __init__(self, raw_pressed):
+        self._raw = raw_pressed
+        self._pressed_names = None
+
+    def __getitem__(self, key):
+        if isinstance(key, int):
+            return self._raw[key]
+
+        if isinstance(key, str):
+            return self._raw[KEY.__getattribute__(key)]
+
+        return False
+
+    def __contains__(self, key):
+        if isinstance(key, int):
+            return self._raw[key]
+
+        if isinstance(key, str):
+            return self._raw[KEY.__getattribute__(key)]
+
+        return False
+
+
 def get_keys_pressed():
-    return pygame.key.get_pressed()
+    return KeysPressed(pygame.key.get_pressed())
 
 
 def keys_mods_pressed():

drawzero-0.5.4/src/drawzero/utils/renderer_ejudge.py

@@ -0,0 +1,66 @@
+import json
+from pathlib import Path
+
+from drawzero.utils.screen_size import set_real_size
+
+set_real_size(1000, 1000)
+
+class PathEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, Path):
+            return str(obj)
+        return super().default(obj)
+
+def draw_line(color, start, end, alpha, line_width):
+    print(json.dumps({"figure": "line", "color": color, "start": start, "end": end, "alpha": alpha, "line_width": line_width}, cls=PathEncoder))
+
+def draw_circle(color, pos, radius, alpha, line_width):
+    print(json.dumps({"figure": "circle", "color": color, "pos": pos, "radius": radius, "alpha": alpha, "line_width": line_width}, cls=PathEncoder))
+
+def draw_rect(color, rect, alpha, line_width):
+    print(json.dumps({"figure": "rect", "color": color, "rect": rect, "alpha": alpha, "line_width": line_width}, cls=PathEncoder))
+
+def draw_ellipse(color, rect, alpha, line_width):
+    print(json.dumps({"figure": "ellipse", "color": color, "rect": rect, "alpha": alpha, "line_width": line_width}, cls=PathEncoder))
+
+def draw_arc(color, rect, start_angle, stop_angle, alpha, line_width):
+    print(json.dumps({"figure": "arc", "color": color, "rect": rect, "start_angle": start_angle, "stop_angle": stop_angle, "alpha": alpha, "line_width": line_width}, cls=PathEncoder))
+
+def draw_polygon(color, points, alpha, line_width):
+    print(json.dumps({"figure": "polygon", "color": color, "points": points, "alpha": alpha, "line_width": line_width}, cls=PathEncoder))
+
+def draw_text(color, text, pos, fontsize, align):
+    print(json.dumps({"figure": "text", "color": color, "text": text, "pos": pos, "fontsize": fontsize, "align": align}, cls=PathEncoder))
+
+def draw_fill(color, alpha):
+    print(json.dumps({"figure": "fill", "color": color, "alpha": alpha}, cls=PathEncoder))
+
+def draw_clear():
+    print(json.dumps({"figure": "clear"}))
+
+def draw_image(path, pos, width, alpha):
+    print(json.dumps({"figure": "image", "path": path, "pos": pos, "width": width, "alpha": alpha}, cls=PathEncoder))
+
+def draw_tick(r=1):
+    print(json.dumps({"cmd": "tick", "r": r}))
+
+def draw_sleep(t=1):
+    print(json.dumps({"cmd": "sleep", "t": t}))
+
+def draw_set_line_width(w):
+    print(json.dumps({"cmd": "set_line_width", "w": w}))
+
+def draw_quit():
+    print(json.dumps({"cmd": "quit"}))
+
+surface_size = 1000
+key_flags = None
+
+get_keys_pressed = lambda: []
+keys_mods_pressed = lambda: []
+get_mouse_pressed = lambda: []
+keysdown = []
+keysup = []
+mousemotions = []
+mousebuttonsdown = []
+mousebuttonsup = []

{drawzero-0.5.1 → drawzero-0.5.4/src/drawzero.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drawzero
-Version: 0.5.1
+Version: 0.5.4
 Summary: A zero-boilerplate canvas drawing framework for Python 3, based on Pygame.
 Author-email: Sergey Shashkov <sh57@yandex.ru>
 License: MIT

{drawzero-0.5.1 → drawzero-0.5.4}/src/drawzero.egg-info/SOURCES.txt

@@ -2,19 +2,20 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-docs/ex_00.png
-docs/ex_01.png
-docs/ex_02.png
-docs/ex_03.png
-docs/ex_04.png
-docs/ex_05.png
-docs/ex_06.png
-docs/ex_10.png
-docs/ex_13.png
 docs/hello_world.png
 docs/keyboard_and_mouse_events.gif
 docs/planet_animation.gif
 docs/transparent.png
+docs/imgs/ex_00.png
+docs/imgs/ex_01.png
+docs/imgs/ex_02.png
+docs/imgs/ex_03.png
+docs/imgs/ex_04.png
+docs/imgs/ex_05.png
+docs/imgs/ex_06.png
+docs/imgs/ex_11.png
+docs/imgs/ex_12.png
+docs/imgs/ex_13.png
 src/drawzero/__about__.py
 src/drawzero/__init__.py
 src/drawzero/__main__.py
@@ -67,4 +68,5 @@ tests/test_examples_gui_mode.py
 tests/test_examples_text_mode.py
 tests/test_gradient.py
 tests/test_i18n.py
-tests/test_pt.py
+tests/test_pt.py
+tests/test_renderer_ejudge.py

{drawzero-0.5.1 → drawzero-0.5.4}/tests/test_errors.py

@@ -46,7 +46,7 @@ class RunExamples(unittest.TestCase):
                 self.assertTrue(exception_printer.last_raised, msg=msg)
                 max_deep = MAX_TRACEBACK_DEEP
                 if func.__name__.startswith('filled'):
-                    max_deep += 1
+                    max_deep += 2
                 self.assertLessEqual(exception_printer.last_deep, max_deep, msg=msg)
 
     def test_bad_pos(self):
@@ -63,7 +63,7 @@ class RunExamples(unittest.TestCase):
                 self.assertTrue(exception_printer.last_raised, msg=msg)
                 max_deep = MAX_TRACEBACK_DEEP
                 if func.__name__.startswith('filled'):
-                    max_deep += 1
+                    max_deep += 2
                 self.assertLessEqual(exception_printer.last_deep, max_deep, msg=msg)
 
 

drawzero-0.5.4/tests/test_renderer_ejudge.py

@@ -0,0 +1,80 @@
+import os
+import unittest
+import json
+from io import StringIO
+import sys
+
+os.environ['EJUDGE_MODE'] = 'true'
+# We need to reload drawzero to apply EJUDGE_MODE
+if 'drawzero' in sys.modules:
+    import importlib
+    importlib.reload(sys.modules['drawzero.utils.draw'])
+    importlib.reload(sys.modules['drawzero'])
+from drawzero import *
+
+class EjudgeRendererTest(unittest.TestCase):
+    def setUp(self):
+        self.held, sys.stdout = sys.stdout, StringIO()
+
+    def tearDown(self):
+        sys.stdout = self.held
+
+    def test_line(self):
+        line('red', (10, 20), (30, 40), alpha=128, line_width=2)
+        output = sys.stdout.getvalue().strip()
+        data = json.loads(output)
+        self.assertEqual(data['figure'], 'line')
+        self.assertEqual(data['color'], [255, 0, 0])
+        self.assertEqual(data['start'], [10, 20])
+        self.assertEqual(data['end'], [30, 40])
+        self.assertEqual(data['alpha'], 128)
+        self.assertEqual(data['line_width'], 2)
+
+    def test_circle(self):
+        circle('blue', (50, 60), 10, alpha=200, line_width=4)
+        output = sys.stdout.getvalue().strip()
+        data = json.loads(output)
+        self.assertEqual(data['figure'], 'circle')
+        self.assertEqual(data['color'], [0, 0, 255])
+        self.assertEqual(data['pos'], [50, 60])
+        self.assertEqual(data['radius'], 10)
+        self.assertEqual(data['alpha'], 200)
+        self.assertEqual(data['line_width'], 4)
+
+    def test_rect(self):
+        rect('green', (10, 20, 30, 40), alpha=100, line_width=1)
+        output = sys.stdout.getvalue().strip()
+        data = json.loads(output)
+        self.assertEqual(data['figure'], 'rect')
+        self.assertEqual(data['color'], [0, 255, 0])
+        self.assertEqual(data['rect'], [10, 20, 30, 40])
+        self.assertEqual(data['alpha'], 100)
+        self.assertEqual(data['line_width'], 1)
+
+    def test_text(self):
+        text('yellow', 'Hello', (10, 20), fontsize=12, align='..')
+        output = sys.stdout.getvalue().strip()
+        data = json.loads(output)
+        self.assertEqual(data['figure'], 'text')
+        self.assertEqual(data['color'], [255, 255, 0])
+        self.assertEqual(data['text'], 'Hello')
+        self.assertEqual(data['pos'], [10, 20])
+        self.assertEqual(data['fontsize'], 12)
+        self.assertEqual(data['align'], '..')
+
+    def test_fill(self):
+        fill('black', alpha=50)
+        output = sys.stdout.getvalue().strip()
+        data = json.loads(output)
+        self.assertEqual(data['figure'], 'fill')
+        self.assertEqual(data['color'], [0, 0, 0])
+        self.assertEqual(data['alpha'], 50)
+
+    def test_clear(self):
+        clear()
+        output = sys.stdout.getvalue().strip()
+        data = json.loads(output)
+        self.assertEqual(data['figure'], 'clear')
+
+if __name__ == "__main__":
+    unittest.main()

drawzero-0.5.1/src/drawzero/utils/renderer_ejudge.py

@@ -1,110 +0,0 @@
-from pathlib import Path
-from drawzero.utils.screen_size import set_real_size
-
-# TODO
-set_real_size(1000, 1000)
-
-
-def jsonize(parms, sep=','):
-    if type(parms) == int or type(parms) == float:
-        return str(parms)
-    elif type(parms) == str:
-        return '"' + parms.replace('"', '\\"') + '"'
-    elif isinstance(parms, Path):
-        return '"' + str(parms).replace('"', '\\"') + '"'
-    elif type(parms) == list or type(parms) == tuple:
-        return '[' + sep.join(map(jsonize, parms)) + ']'
-    elif parms is None:
-        return 'null'
-    else:
-        raise ValueError('Тип не поддерживается')
-
-
-def draw_resize(*parms):
-    print('resize', format(jsonize(parms, sep=', ')))
-
-
-def draw_line(*parms):
-    print('line', format(jsonize(parms, sep=', ')))
-
-
-def draw_circle(*parms):
-    print('circle', format(jsonize(parms, sep=', ')))
-
-
-def draw_filled_circle(*parms):
-    print('filled_circle', format(jsonize(parms, sep=', ')))
-
-
-def draw_rect(*parms):
-    print('rect', format(jsonize(parms, sep=', ')))
-
-
-def draw_filled_rect(*parms):
-    print('filled_rect', format(jsonize(parms, sep=', ')))
-
-
-def draw_ellipse(*parms):
-    print('ellipse', format(jsonize(parms, sep=', ')))
-
-
-def draw_filled_ellipse(*parms):
-    print('filled_ellipse', format(jsonize(parms, sep=', ')))
-
-
-def draw_arc(*parms):
-    print('arc', format(jsonize(parms, sep=', ')))
-
-
-def draw_polygon(*parms):
-    print('polygon', format(jsonize(parms, sep=', ')))
-
-
-def draw_filled_polygon(*parms):
-    print('filled_polygon', format(jsonize(parms, sep=', ')))
-
-
-def draw_text(*parms):
-    print('text', format(jsonize(parms, sep=', ')))
-
-
-def draw_fill(*parms):
-    print('fill', format(jsonize(parms, sep=', ')))
-
-
-def draw_clear(*parms):
-    print('clear', format(jsonize(parms, sep=', ')))
-
-
-def draw_image(*parms):
-    print('image', format(jsonize(parms, sep=', ')))
-
-
-def draw_tick(r=1):
-    print('tick({})'.format(r))
-
-
-def draw_sleep(t=1):
-    print('sleep({})'.format(t))
-
-
-def draw_set_line_width(w):
-    print('set_line_width({})'.format(w))
-
-
-def draw_quit():
-    print('quit')
-    pass
-
-
-surface_size = 1000
-key_flags = None
-
-get_keys_pressed = lambda: []
-keys_mods_pressed = lambda: []
-get_mouse_pressed = lambda: []
-keysdown = []
-keysup = []
-mousemotions = []
-mousebuttonsdown = []
-mousebuttonsup = []