|
241 | 241 | " self.scheme = scheme if scheme is not None else self.scheme\n",
|
242 | 242 | "\n",
|
243 | 243 | " padding = 0.1\n",
|
244 |
| - " padding_x = padding * self.size[0]\n", |
245 |
| - " padding_y = padding * self.size[1]\n", |
| 244 | + " padding_x = padding * self.width\n", |
| 245 | + " padding_y = padding * self.height\n", |
246 | 246 | "\n",
|
247 |
| - " self.drawarea = (drawarea_min_x, drawarea_min_y, drawarea_max_x, drawarea_max_y) = (padding_x, padding_y, self.size[0] - 2 * padding_x, self.size[1] - 2 * padding_y)\n", |
| 247 | + " self.drawarea = (drawarea_min_x, drawarea_min_y, drawarea_max_x, drawarea_max_y) = (padding_x, padding_y, self.width - 2 * padding_x, self.height - 2 * padding_y)\n", |
248 | 248 | "\n",
|
249 | 249 | " min_x, min_y, max_x, max_y = np.min(x), np.min(y), np.max(x), np.max(y)\n",
|
250 | 250 | "\n",
|
|
393 | 393 | " canvas.fill_style = '#FFF0C9'\n",
|
394 | 394 | " canvas.stroke_style = 'white'\n",
|
395 | 395 | " canvas.rough_fill_style = 'solid'\n",
|
396 |
| - " canvas.fill_rect(-10, -10, canvas.size[0] + 10, canvas.size[1] + 10)\n", |
| 396 | + " canvas.fill_rect(-10, -10, canvas.width + 10, canvas.height + 10)\n", |
397 | 397 | " canvas.rough_fill_style = 'cross-hatch'\n",
|
398 | 398 | "\n",
|
399 | 399 | " canvas.fill_style = color\n",
|
|
428 | 428 | "canvas = RoughCanvas(width=x.shape[0]*n_pixels, height=x.shape[1]*n_pixels)\n",
|
429 | 429 | "canvas.fill_style = '#FFF0C9'\n",
|
430 | 430 | "canvas.stroke_style = 'white'\n",
|
431 |
| - "canvas.fill_rect(0, 0, canvas.size[0], canvas.size[1])\n", |
| 431 | + "canvas.fill_rect(0, 0, canvas.width, canvas.height)\n", |
432 | 432 | "\n",
|
433 | 433 | "draw(x, canvas, '#5770B3')\n",
|
434 | 434 | "\n",
|
|
0 commit comments