Update to latest data widgets for fixes

vidartf · vidartf · commit 3797724fe75c · 2017-08-20T17:58:21.000+02:00
diff --git a/examples/superellipsoid.ipynb b/examples/superellipsoid.ipynb
@@ -18,10 +18,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "import numpy as np\n",
@@ -52,10 +50,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
-   "metadata": {
-    "collapsed": true
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "def superellipsoid(rx, ry, rz, m1, m2):\n",
@@ -82,10 +78,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "# superellipsoid parameters\n",
@@ -104,10 +98,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "import scipy.spatial as spatial\n",
@@ -117,32 +109,35 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "from pythreejs import *\n",
+    "from ipydatawidgets import ConstrainedNDArrayWidget\n",
     "from IPython.display import display\n",
     "\n",
-    "surf_g = PlainGeometry(vertices=coords.tolist(), faces=cvx.simplices.tolist())\n",
-    "surf = Mesh(geometry=surf_g, material=BasicMaterial(color='green', wireframe=True))\n",
+    "coordinate_widget = ConstrainedNDArrayWidget(dtype='float32')(array=coords)\n",
+    "\n",
+    "surf_g = PlainBufferGeometry(attributes=dict(\n",
+    "    position=BufferAttribute(coordinate_widget),\n",
+    "    index=BufferAttribute(cvx.simplices.ravel().astype(np.uint16)),\n",
+    "))\n",
+    "surf = Mesh(geometry=surf_g, material=MeshBasicMaterial(color='green', wireframe=True))\n",
     "scene = Scene(children=[surf, AmbientLight(color='#777777')])\n",
     "c = PerspectiveCamera(position=[2, 2, 3], up=[0, 0, 1],\n",
     "                      children=[DirectionalLight(color='white',\n",
     "                                                 position=[3, 5, 1],\n",
     "                                                 intensity=0.6)])\n",
-    "renderer = Renderer(camera=c, scene=scene, controls=[OrbitControls(controlling=c)])\n",
+    "renderer = Renderer(\n",
+    "    camera=c, scene=scene, controls=[OrbitControls(controlling=c)], width=600, height=400)\n",
     "display(renderer)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {
-    "collapsed": true
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "from ipywidgets import FloatSlider, HBox, VBox\n",
@@ -155,10 +150,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
-   "metadata": {
-    "collapsed": true
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "rx_slider, ry_slider, rz_slider = (FloatSlider(description='rx', min=0.01, max=10.0, step=0.01, value=rx, \n",
@@ -171,16 +164,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "def update(change):\n",
     "    superellipsoid(rx_slider.value, ry_slider.value, rz_slider.value, \n",
     "                   m1_slider.value, m2_slider.value)\n",
-    "    surf_g.vertices = coords.tolist()\n",
+    "    coordinate_widget.array = coords\n",
     "    \n",
     "m1_slider.observe(update, names=['value'])\n",
     "m2_slider.observe(update, names=['value'])\n",
@@ -191,10 +182,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "VBox([HBox([renderer, m1_slider, m2_slider]), rx_slider, ry_slider, rz_slider])"
@@ -203,19 +192,17 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": []
   }
  ],
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [conda root]",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "conda-root-py"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -227,7 +214,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.2"
+   "version": "3.5.3"
   },
   "widgets": {
    "state": {
diff --git a/js/scripts/prop-types.js b/js/scripts/prop-types.js
@@ -290,6 +290,9 @@ _.extend(ArrayBufferType.prototype, BaseType.prototype, {
     getPropertyConverterFn: function() {
         return 'convertArrayBuffer';
     },
+    getPropArrayName: function() {
+        return 'datawidget_properties';
+    },
 });
 
 function DictType(defaultValue={}, nullable) {
diff --git a/js/src/_base/Three.js b/js/src/_base/Three.js
@@ -72,6 +72,7 @@ var ThreeModel = widgets.WidgetModel.extend({
         // initialize properties arrays
         this.three_properties = [];
         this.three_array_properties = [];
+        this.datawidget_properties = [];
 
         // TODO: not currently integrated
         this.three_dict_properties = [];
@@ -173,6 +174,33 @@ var ThreeModel = widgets.WidgetModel.extend({
 
         }, this);
 
+        // Handle changes in data widgets/union properties
+        this.datawidget_properties.forEach(function(propName) {
+
+            var curr = this.get(propName) || [];
+            if (curr instanceof widgets.WidgetModel) {
+                // listen to changes in current model
+                this.listenTo(curr, 'change', this.onChildChanged);
+                this.listenTo(curr, 'childchange', this.onChildChanged);
+            }
+
+            // make sure to (un)hook listeners when property changes
+            this.on('change:' + propName, function(model, value, options) {
+                var prev = this.previous(propName) || [];
+                var curr = value || [];
+
+                if (prev instanceof widgets.WidgetModel) {
+                    this.stopListening(prev);
+                }
+                if (curr instanceof widgets.WidgetModel) {
+                    // listen to changes in current model
+                    this.listenTo(curr, 'change', this.onChildChanged);
+                    this.listenTo(curr, 'childchange', this.onChildChanged);
+                }
+            }, this);
+
+        }, this);
+
         this.on('change', this.onChange, this);
         this.on('msg:custom', this.onCustomMessage, this);
 
@@ -738,10 +766,14 @@ var ThreeModel = widgets.WidgetModel.extend({
 
     // ArrayBuffer
     convertArrayBufferModelToThree: function(arr, propName) {
+        if (arr instanceof widgets.WidgetModel) {
+            return arr.get('array').data
+        }
         return arr.data;
     },
 
     convertArrayBufferThreeToModel: function(arrBuffer, propName) {
+        // Never back-convert to a new widget
         return ndarray(arrBuffer);
     },
 
diff --git a/js/src/core/BufferAttribute.js b/js/src/core/BufferAttribute.js
@@ -14,7 +14,7 @@ var BufferAttributeModel = BufferAttributeAutogen.extend({
     },
 
     decodeData() {
-        var rawData = this.get('array');
+        var rawData = datawidgets.getArrayFromUnion(this.get('array'));
         var itemSize = rawData.dimension === 1 ? 1 : rawData.shape[rawData.dimension - 1];
 
         var data = this.convertArrayBufferModelToThree(rawData, 'array');
@@ -44,15 +44,36 @@ var BufferAttributeModel = BufferAttributeAutogen.extend({
     },
 
     mapBufferAttributeArrayThreeToModel: function() {
+        /*
+         * There are a few different cases to take into account here:
+         * 1. We are during initial setup of a normal creation, with a widget ref
+         * 2. We are during initial setup of a normal creation, with an array
+         * 3. We are during initial setup from an existing three obj (nothing in model yet)
+         * 4. We are syncing something back (e.g. after change event), possibly this data.
+         *    The model should already have something defined then (possibly null).
+         */
         var attributeData = this.obj.array;
         var modelNDArray = this.get('array');
         if (modelNDArray) {
-            modelNDArray.data.set(attributeData);
-        } else {
+            // 1. / 2.
+            if (modelNDArray instanceof datawidgets.NDArrayModel) {
+                modelNDArray.get('array').data.set(attributeData);
+            } else {
+                modelNDArray.data.set(attributeData);
+            }
+        } else if (modelNDArray) {
+            // 3. / 4.
             this.set('array', ndarray(attributeData, [this.obj.count, this.obj.itemSize]));
         }
     },
 
+    onChildChanged: function(model, options) {
+        if (model === this.get('array')) {
+            // We need to update data
+            this.mapBufferAttributeArrayModelToThree();
+        }
+    },
+
 });
 
 module.exports = {
diff --git a/js/src/objects/Blackbox.js b/js/src/objects/Blackbox.js
@@ -38,4 +38,8 @@ var BlackboxModel = BlackboxAutogen.extend({
 
     }
 
-});
+});
+
+module.exports = {
+    BlackboxModel: BlackboxModel,
+};
diff --git a/js/src/textures/DataTexture.js b/js/src/textures/DataTexture.js
@@ -14,7 +14,7 @@ var DataTextureModel = DataTextureBase.extend({
     },
 
     decodeData() {
-        var rawData = this.get('data');
+        var rawData = datawidgets.getArrayFromUnion(this.get('data'));
         if (rawData.dimension < 2 || rawData.dimension > 3) {
             throw Error('DataTexture data dimensions need to be 2 or 3, got:', rawData.dimension)
         }

Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,8 @@ var BlackboxModel = BlackboxAutogen.extend({`
`38`	`38`
`39`	`39`	`}`
`40`	`40`
`41`		`-});`
	`41`	`+});`
	`42`	`+`
	`43`	`+module.exports = {`
	`44`	`+ BlackboxModel: BlackboxModel,`
	`45`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ var DataTextureModel = DataTextureBase.extend({`
`14`	`14`	`},`
`15`	`15`
`16`	`16`	`decodeData() {`
`17`		`- var rawData = this.get('data');`
	`17`	`+ var rawData = datawidgets.getArrayFromUnion(this.get('data'));`
`18`	`18`	`if (rawData.dimension < 2 \|\| rawData.dimension > 3) {`
`19`	`19`	`throw Error('DataTexture data dimensions need to be 2 or 3, got:', rawData.dimension)`
`20`	`20`	`}`