Merge pull request #10 from martinRenou/remove_figure

Remove FigureGL

Author: martinRenou

bqplot_gl/__init__.py

@@ -4,7 +4,6 @@
 # Copyright (c) The bqplot Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from .figure import FigureGL  # noqa
 from .marks import *  # noqa
 from ._version import __version__, version_info  # noqa
 

bqplot_gl/figure.py

@@ -2,29 +2,14 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "faf6701a",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "c4ee4d8bc9a04a279a55494a782a76cd",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "FigureGL(axes=[Axis(label='Index', scale=LinearScale()), Axis(label='lines', orientation='vertical', scale=Lin…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "outputs": [],
    "source": [
     "from bqplot import *\n",
     "\n",
-    "from bqplot_gl import FigureGL, ScatterGL, LinesGL\n",
+    "from bqplot_gl import ScatterGL, LinesGL\n",
     "\n",
     "import numpy as np\n",
     "import pandas as pd\n",
@@ -47,12 +32,12 @@
     "ax_x = Axis(scale=sc_x, label='Index')\n",
     "ax_y = Axis(scale=sc_y, orientation='vertical', label='lines')\n",
     "\n",
-    "FigureGL(marks=[lines], axes=[ax_x, ax_y], title='Lines', interaction=panzoom)"
+    "Figure(marks=[lines], axes=[ax_x, ax_y], title='Lines', interaction=panzoom)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "bd78813d",
    "metadata": {},
    "outputs": [],
@@ -62,7 +47,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "52a1f6dc",
    "metadata": {},
    "outputs": [],
@@ -91,7 +76,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -105,7 +90,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.6"
+   "version": "3.9.5"
   }
  },
  "nbformat": 4,

examples/lines.ipynb

@@ -9,7 +9,7 @@
    "source": [
     "from bqplot import *\n",
     "\n",
-    "from bqplot_gl import FigureGL, ScatterGL\n",
+    "from bqplot_gl import ScatterGL\n",
     "\n",
     "import numpy as np\n",
     "import pandas as pd\n",
@@ -44,7 +44,7 @@
     "ax_x = Axis(scale=sc_x, label='Date')\n",
     "ax_y = Axis(scale=sc_y, orientation='vertical', tick_format='0.0f', label='Security 2')\n",
     "\n",
-    "fig = FigureGL(marks=[scatt], axes=[ax_x, ax_y])\n",
+    "fig = Figure(marks=[scatt], axes=[ax_x, ax_y])\n",
     "fig"
    ]
   },

examples/scatter.ipynb

@@ -13,16 +13,18 @@ import 'three/examples/js/lines/LineMaterial';
 import 'three/examples/js/lines/LineSegmentsGeometry';
 import 'three/examples/js/lines/LineGeometry';
 
-import { ScaleType, FigureGLView } from './figure';
-
 import { LinesGLModel } from './LinesGLModel';
 
 import { Values } from './values';
 
+import { ScaleType, initializeBqplotFigure } from './utils';
+
 export class LinesGLView extends Lines {
   async render() {
     await super.render();
 
+    initializeBqplotFigure(this.parent);
+
     // Create material for markers
     this.material = new THREE.LineMaterial();
     this.material.uniforms.domain_x = { type: '2f', value: [0, 1] };
@@ -56,10 +58,8 @@ export class LinesGLView extends Lines {
     this.listenTo(this.model, 'change:x change:y', this.updateGeometry);
     this.listenTo(this.model, 'change:stroke_width', this.update_stroke_width);
 
-    this.updateScene();
-    this.listenTo(this.parent, 'margin_updated', () => {
-      this.updateScene();
-    });
+    this.parent.extras.webGLMarks.push(this);
+    this.parent.extras.webGLRequestRender();
   }
 
   beforeCompile(shader) {
@@ -124,11 +124,11 @@ export class LinesGLView extends Lines {
     );
     this.geometry.setPositions(current.array_vec3['position']);
 
-    this.updateScene();
+    this.parent.extras.webGLRequestRender();
   }
 
   update_line_xy(animate: boolean) {
-    this.updateScene();
+    this.parent.extras.webGLRequestRender();
   }
 
   update_style() {
@@ -140,12 +140,12 @@ export class LinesGLView extends Lines {
     } else {
       this.material.uniforms.opacity.value = 1;
     }
-    this.updateScene();
+    this.parent.extras.webGLRequestRender();
   }
 
   update_stroke_width() {
     this.material.linewidth = this.model.get('stroke_width');
-    this.updateScene();
+    this.parent.extras.webGLRequestRender();
   }
 
   updateMaterialScales() {
@@ -182,15 +182,8 @@ export class LinesGLView extends Lines {
     ];
     this.updateMaterialScales();
 
-    fig.renderer.render(this.scene, fig.camera);
-  }
-
-  updateScene() {
-    this.parent.update_gl();
-  }
-
-  relayout() {
-    this.updateScene();
+    const { renderer, camera } = fig.extras.webGLRenderer;
+    renderer.render(this.scene, camera);
   }
 
   draw(animate) {}
@@ -202,6 +195,4 @@ export class LinesGLView extends Lines {
   scene: THREE.Scene;
 
   model: LinesGLModel;
-
-  parent: FigureGLView;
 }