Merge pull request #15 from martinRenou/array_widget_support

Add support for NDArray widget

Author: martinRenou

ipygany/ipygany.py

@@ -15,7 +15,7 @@
 )
 import vtk
 
-from .serialization import array_serialization
+from .serialization import array_serialization, component_array_serialization
 from .vtk_loader import (
     load_vtk, FLOAT32, UINT32,
     get_ugrid_vertices, get_ugrid_triangles, get_ugrid_tetrahedrons, get_ugrid_data
@@ -44,7 +44,7 @@ class Component(_GanyWidgetBase):
     _model_name = Unicode('ComponentModel').tag(sync=True)
 
     name = Unicode().tag(sync=True)
-    array = Array(default_value=array(FLOAT32)).tag(sync=True, **array_serialization)
+    array = Union((Instance(Widget), Array())).tag(sync=True, **component_array_serialization)
 
     min = CFloat(allow_none=True, default_value=None)
     max = CFloat(allow_none=True, default_value=None)

ipygany/serialization.py

@@ -1,5 +1,7 @@
 import numpy as np
 
+from ipywidgets import Widget, widget_serialization
+
 
 def array_to_binary(ar, obj=None, force_contiguous=True):
     if ar is None:
@@ -19,7 +21,18 @@ def json_to_array(json, obj=None):
     return np.array(json)
 
 
+def component_array_to_json(value, obj=None, force_contiguous=True):
+    if isinstance(value, Widget):
+        return widget_serialization['to_json'](value, obj)
+    else:
+        return array_to_binary(value, obj, force_contiguous)
+
+
 array_serialization = dict(
     to_json=array_to_binary,
     from_json=json_to_array
 )
+
+component_array_serialization = dict(
+    to_json=component_array_to_json
+)

src/widget.ts

@@ -35,6 +35,14 @@ function deserialize_uint32array (data: any, manager: any) {
     return new Uint32Array(data.data.buffer);
 }
 
+function deserialize_component_array (value: any, manager: any) {
+  if (typeof value == 'string') {
+    return unpack_models(value, manager);
+  } else {
+    return deserialize_float32array(value, manager);
+  }
+}
+
 
 abstract class _GanyWidgetModel extends WidgetModel {
 
@@ -81,19 +89,29 @@ class ComponentModel extends _GanyWidgetModel {
     };
   }
 
+  get array () {
+    const array = this.get('array');
+
+    if (array.hasOwnProperty('name') && array.name == 'NDArrayModel') {
+      return array.getNDArray().data;
+    } else {
+      return array;
+    }
+  }
+
   initialize (attributes: any, options: any) {
     super.initialize(attributes, options);
 
-    this.component = new Component(this.get('name'), this.get('array'));
+    this.component = new Component(this.get('name'), this.array);
 
-    this.on('change:array', () => { this.component.array = this.get('array'); });
+    this.on('change:array', () => { this.component.array = this.array; });
   }
 
   component: Component;
 
   static serializers: ISerializers = {
     ..._GanyWidgetModel.serializers,
-    array: { deserialize: deserialize_float32array },
+    array: { deserialize: deserialize_component_array },
   }
 
   static model_name = 'ComponentModel';