Merge pull request #263 from martinRenou/canvas_manager

Fix sync issues between canvases

Author: martinRenou

docs/source/animation.ipynb

@@ -86,7 +86,7 @@
     "from time import sleep\n",
     "\n",
     "for i in range(200):\n",
-    "    with hold_canvas(canvas):\n",
+    "    with hold_canvas():\n",
     "        canvas.clear()\n",
     "        canvas.fill_style = \"white\"\n",
     "        canvas.fill_rect(0, 0, size, size)\n",

docs/source/animations.rst

@@ -25,7 +25,7 @@ A simple animation loop will look like the following:
     steps_number = 200
 
     for i in range(steps_number):
-        with hold_canvas(canvas):
+        with hold_canvas():
             # Clear the old animation step
             canvas.clear()
 
@@ -49,7 +49,7 @@ You can also make an infinite animation using a ``while`` loop:
     display(canvas)
 
     while(True):
-        with hold_canvas(canvas):
+        with hold_canvas():
             # Clear the old animation step
             canvas.clear()
 
@@ -93,7 +93,7 @@ to the Jupyter client, and the animation will run entirely without any communica
     steps_number = 200
 
     # Note how `hold_canvas` now wraps the entire for-loop
-    with hold_canvas(canvas):
+    with hold_canvas():
         for i in range(steps_number):
             # Clear the old animation step
             canvas.clear()
@@ -106,4 +106,4 @@ to the Jupyter client, and the animation will run entirely without any communica
             canvas.sleep(20)
 
 
-You cannot make an infinite animation using this approach.
+You cannot make an infinite animation using this approach.

docs/source/api.rst

@@ -7,7 +7,7 @@ There are some API differences though:
 
 - The Canvas widget is directly exposing the `CanvasRenderingContext2D <https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D>`_ API
 - All the API is written in *snake_case* instead of *camelCase*, so for example ``canvas.fillStyle = 'red'`` in JavaScript becomes ``canvas.fill_style = 'red'`` in Python
-- The Canvas widget exposes a ``clear`` method, ``canvas.clear()`` is a shortcut for ``canvas.clear_rect(0, 0, canvas.size[0], canvas.size[1])``
+- The Canvas widget exposes a ``clear`` method, ``canvas.clear()`` is a shortcut for ``canvas.clear_rect(0, 0, canvas.width, canvas.height)``
 - We provide a `hold_canvas` context manager if you want to perform lots of commands at once
 - The Web canvas putImageData method does not support transparency and the current transformation state, our ``Canvas.put_image_data`` does support them!
 

docs/source/basic_usage.rst

@@ -109,5 +109,5 @@ optimal performance you should try to use ``hold_canvas`` as much as possible.
 
     canvas = Canvas(width=200, height=200)
 
-    with hold_canvas(canvas):
+    with hold_canvas():
         # Perform drawings...

docs/source/clock.ipynb

@@ -94,7 +94,7 @@
     "\n",
     "\n",
     "def draw_clock(hours, minutes):\n",
-    "    with hold_canvas(canvas):\n",
+    "    with hold_canvas():\n",
     "        clear_drawing()\n",
     "        draw_dial()\n",
     "        draw_hands((hours % 12) * 60 + minutes)\n",

docs/source/conways_game_of_life.ipynb

@@ -62,11 +62,11 @@
    "outputs": [],
    "source": [
     "def draw(x, canvas, color=\"black\"):\n",
-    "    with hold_canvas(canvas):\n",
+    "    with hold_canvas():\n",
     "        canvas.clear()\n",
     "        canvas.fill_style = \"#FFF0C9\"\n",
     "        canvas.stroke_style = \"white\"\n",
-    "        canvas.fill_rect(0, 0, canvas.size[0], canvas.size[1])\n",
+    "        canvas.fill_rect(0, 0, canvas.width, canvas.height)\n",
     "\n",
     "        canvas.fill_style = color\n",
     "        canvas.stroke_style = color\n",
@@ -446,7 +446,7 @@
     "canvas = RoughCanvas(width=x.shape[0] * n_pixels, height=x.shape[1] * n_pixels)\n",
     "canvas.fill_style = \"#FFF0C9\"\n",
     "canvas.stroke_style = \"white\"\n",
-    "canvas.fill_rect(0, 0, canvas.size[0], canvas.size[1])\n",
+    "canvas.fill_rect(0, 0, canvas.width, canvas.height)\n",
     "\n",
     "canvas"
    ]

docs/source/drag_and_drop_example.ipynb

@@ -109,7 +109,7 @@
     "\n",
     "def handle_mouse_move(x, y):\n",
     "    if [o for o in objects_to_draw if o.selected]:\n",
-    "        with hold_canvas(canvas):\n",
+    "        with hold_canvas():\n",
     "            [o for o in objects_to_draw if o.selected][-1].set_x_y(x, y)\n",
     "            canvas_restart()\n",
     "            [o.draw() for o in objects_to_draw]\n",

docs/source/drawing_images.rst

@@ -116,16 +116,16 @@ Drawing from another ``Canvas`` is by far the fastest of the three solutions pre
 
     canvas = Canvas(width=800, height=600)
 
-    with hold_canvas(canvas):
+    with hold_canvas():
         for _ in range(2_000):
             canvas.save()
 
             # Choose a random sprite texture
             sprite = sprites[choice(range(3))]
 
             # Choose a random sprite position
-            pos_x = randint(0, canvas.size[0])
-            pos_y = randint(0, canvas.size[1])
+            pos_x = randint(0, canvas.width)
+            pos_y = randint(0, canvas.height)
 
             # Choose a random rotation angle (but first set the rotation center with `translate`)
             canvas.translate(pos_x, pos_y)

docs/source/drawing_shapes.rst

@@ -324,7 +324,7 @@ Rects
     colors_fill = np.random.randint(0, 255, size=(n_rects, 3))
     colors_outline = np.random.randint(0, 255, size=(n_rects, 3))
     alphas = np.random.random(n_rects)
-    with hold_canvas(canvas):
+    with hold_canvas():
         canvas.fill_styled_rects(x, y, width, height,
                                  color=colors_fill,
                                  alpha=alphas)
@@ -354,7 +354,7 @@ Circles
     colors_fill = np.random.randint(0, 255, size=(n_circles, 3))
     colors_outline = np.random.randint(0, 255, size=(n_circles, 3))
     alphas = np.random.random(n_circles)
-    with hold_canvas(canvas):
+    with hold_canvas():
         canvas.fill_styled_circles(x, y, r, color=colors_fill, alpha=alphas)
         canvas.line_width = 2
         canvas.stroke_styled_circles(x, y, r, color=colors_outline)
@@ -385,7 +385,7 @@ Arcs
     start_angle = np.random.random(n_circles) * math.pi
     end_angle = np.random.random(n_circles) * math.pi
     alphas = np.random.random(n_circles)
-    with hold_canvas(canvas):
+    with hold_canvas():
         canvas.fill_style = "cyan"
         canvas.fill_arcs(x, y, r, start_angle, end_angle)
         canvas.line_width = 1
@@ -440,7 +440,7 @@ Case 1: All polygons / line-segments have the same number of points
     polygons += np.linspace(1.0, 100.0, num=n_polygons)[:, None, None]
 
     points_per_polygon = np.ones([n_polygons]) * n_points_per_polygon
-    with hold_canvas(canvas):
+    with hold_canvas():
         canvas.stroke_styled_polygons(polygons, color=colors_fill)
     canvas
 
@@ -473,7 +473,7 @@ Case 1: All polygons / line-segments have the same number of points
     line_segments[:, :, 1] += np.linspace(1.0, canvas.height,
                                           num=n_line_segments)[:, None]
 
-    with hold_canvas(canvas):
+    with hold_canvas():
         canvas.stroke_styled_line_segments(line_segments, color=colors_fill)
     canvas
 
@@ -500,7 +500,7 @@ Polygons can be given as a list of ndarrays:
     polygons = [triangle, rectangle, irregular]
     colors = [(255, 0, 0), (0, 255, 0), (0, 0, 255)]
 
-    with hold_canvas(canvas):
+    with hold_canvas():
         canvas.fill_styled_polygons(polygons, color=colors)
     canvas
 
@@ -524,7 +524,7 @@ Polygons can be given as a flat ndarray:
     colors_fill = np.random.randint(0, 255, size=(n_polygons, 3))
     colors_outline = np.random.randint(0, 255, size=(n_polygons, 3))
 
-    with hold_canvas(canvas):
+    with hold_canvas():
         # the filling
         canvas.fill_styled_polygons(
             polygons, points_per_polygon=points_per_polygon,

docs/source/fractals_tree.ipynb

@@ -71,7 +71,7 @@
    "outputs": [],
    "source": [
     "def draw_tree(canvas):\n",
-    "    with hold_canvas(canvas):\n",
+    "    with hold_canvas():\n",
     "        canvas.save()\n",
     "\n",
     "        canvas.clear()\n",