Merge pull request #135 from martinRenou/examples

Improve examples

Author: martinRenou

examples/RoughCanvas.ipynb

@@ -250,7 +250,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,

examples/conways_game_of_life.ipynb

@@ -58,16 +58,13 @@
     "        canvas.fill_style = color\n",
     "        canvas.stroke_style = color\n",
     "\n",
-    "        r = 0\n",
-    "        for row in x:\n",
-    "            c = 0\n",
-    "            for value in row:\n",
-    "                if value:\n",
-    "                    canvas.fill_rect(r * n_pixels, c * n_pixels, n_pixels, n_pixels)\n",
-    "                    canvas.stroke_rect(r * n_pixels, c * n_pixels, n_pixels, n_pixels)\n",
+    "        living_cells = np.where(x)\n",
+    "        \n",
+    "        rects_x = living_cells[0] * n_pixels\n",
+    "        rects_y = living_cells[1] * n_pixels\n",
     "\n",
-    "                c += 1\n",
-    "            r += 1"
+    "        canvas.fill_rects(rects_x, rects_y, n_pixels)\n",
+    "        canvas.stroke_rects(rects_x, rects_y, n_pixels)"
    ]
   },
   {
@@ -155,7 +152,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,

examples/drag_and_drop_example.ipynb

@@ -105,6 +105,13 @@
     "\n",
     "canvas"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -123,7 +130,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,

examples/hand_drawing.ipynb

@@ -40,13 +40,6 @@
     "drawing = False\n",
     "start = None\n",
     "\n",
-    "def draw_line(canvas, start, end):\n",
-    "    canvas.begin_path()\n",
-    "    canvas.move_to(start[0], start[1])\n",
-    "    canvas.line_to(end[0], end[1])\n",
-    "    canvas.stroke()\n",
-    "    canvas.close_path()\n",
-    "\n",
     "def on_mouse_down(x, y):\n",
     "    global drawing\n",
     "    global start\n",
@@ -55,7 +48,7 @@
     "        start = (x, y)\n",
     "    else:\n",
     "        with hold_canvas(canvas):\n",
-    "            draw_line(drawing_layer, start, (x, y))\n",
+    "            drawing_layer.stroke_line(start[0], start[1], x, y)\n",
     "\n",
     "            interaction_layer.clear()\n",
     "\n",
@@ -70,7 +63,7 @@
     "    with hold_canvas(canvas):\n",
     "        interaction_layer.clear()\n",
     "\n",
-    "        draw_line(interaction_layer, start, (x, y))\n",
+    "        interaction_layer.stroke_line(start[0], start[1], x, y)\n",
     "\n",
     "interaction_layer.on_mouse_down(on_mouse_down)\n",
     "interaction_layer.on_mouse_move(on_mouse_move)\n",
@@ -117,7 +110,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.1"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,

examples/mapping.ipynb

@@ -262,7 +262,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.1"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,

examples/particle_system.ipynb

@@ -205,7 +205,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.1"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,

examples/plotting.ipynb

@@ -87,20 +87,17 @@
     "        background.fill_style = 'black'\n",
     "        background.stroke_style = '#8c8c8c'\n",
     "        background.line_width = 1\n",
-    "        background.begin_path()\n",
     "\n",
     "        for i in range(n_lines):\n",
     "            j = i / (n_lines - 1)\n",
     "            line_x = drawarea_max_x * j + drawarea_min_x\n",
     "            line_y = drawarea_max_y * j + drawarea_min_y\n",
     "\n",
     "            # Line on the y axis\n",
-    "            background.move_to(line_x, drawarea_min_y)\n",
-    "            background.line_to(line_x, drawarea_max_y + drawarea_min_y)\n",
+    "            background.stroke_line(line_x, drawarea_min_y, line_x, drawarea_max_y + drawarea_min_y)\n",
     "\n",
     "            # Line on the x axis\n",
-    "            background.move_to(drawarea_min_x, line_y)\n",
-    "            background.line_to(drawarea_max_x + drawarea_min_x, line_y)\n",
+    "            background.stroke_line(drawarea_min_x, line_y, drawarea_max_x + drawarea_min_x, line_y)\n",
     "\n",
     "            # Draw y tick\n",
     "            background.text_align = 'right'\n",
@@ -110,10 +107,7 @@
     "            # Draw x tick\n",
     "            background.text_align = 'center'\n",
     "            background.text_baseline = 'top'\n",
-    "            background.fill_text('{0:.2e}'.format(self.unscale_x(line_x)), line_x, drawarea_max_y + drawarea_min_y + drawarea_min_y * 0.05)\n",
-    "\n",
-    "        background.stroke()\n",
-    "        background.close_path()"
+    "            background.fill_text('{0:.2e}'.format(self.unscale_x(line_x)), line_x, drawarea_max_y + drawarea_min_y + drawarea_min_y * 0.05)"
    ]
   },
   {
@@ -502,7 +496,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.9.0"
   }
  },
  "nbformat": 4,