Test IsoColor

Signed-off-by: martinRenou <[email protected]>

Author: martinRenou

ipygany/ipygany.py

@@ -436,7 +436,7 @@ def input_dim(self):
     @default('input')
     def _default_input(self):
         if not len(self.data):
-            if not self.input_dim:
+            if self.input_dim == 0 or self.input_dim == 1:
                 return 0
             return tuple(0 for _ in range(self.input_dim))
 
@@ -531,12 +531,15 @@ class Alpha(Effect):
 
     _model_name = Unicode('AlphaModel').tag(sync=True)
 
-    input = Union((Tuple(trait=Unicode, minlen=2, maxlen=2), Unicode(), CFloat(0.))).tag(sync=True)
-
     @default('input')
     def _default_input(self):
         return 0.7
 
+    @property
+    def input_dim(self):
+        """Input dimension."""
+        return 1
+
 
 class RGB(Effect):
     """A color effect to another block."""
@@ -551,14 +554,13 @@ class IsoColor(Effect):
 
     _model_name = Unicode('IsoColorModel').tag(sync=True)
 
-    input = Union((Tuple(trait=Unicode, minlen=2, maxlen=2), Unicode(), CFloat(0.))).tag(sync=True)
-
     min = CFloat(0.).tag(sync=True)
     max = CFloat(0.).tag(sync=True)
 
-    @default('input')
-    def _default_input(self):
-        return self.parent.data[0].name
+    @property
+    def input_dim(self):
+        """Input dimension."""
+        return 1
 
 
 class IsoSurface(Effect):

tests/test_isocolor.py

@@ -0,0 +1,43 @@
+import pytest
+
+from traitlets import TraitError
+
+from ipygany import PolyMesh, IsoColor
+
+from .utils import get_test_assets
+
+
+def test_default_input():
+    vertices, triangles, data_1d, data_3d = get_test_assets()
+
+    poly = PolyMesh(vertices=vertices, triangle_indices=triangles, data=[data_1d, data_3d])
+
+    colored_mesh = IsoColor(poly)
+
+    assert colored_mesh.input == '1d'
+
+    poly = PolyMesh(vertices=vertices, triangle_indices=triangles, data=[data_3d])
+
+    colored_mesh = IsoColor(poly)
+
+    assert colored_mesh.input == (('3d', 'x'), )
+
+
+def test_input():
+    vertices, triangles, data_1d, data_3d = get_test_assets()
+
+    poly = PolyMesh(vertices=vertices, triangle_indices=triangles, data=[data_1d, data_3d])
+
+    colored_mesh = IsoColor(poly)
+
+    with pytest.raises(TraitError):
+        colored_mesh.input = ('1d', 0)
+
+    colored_mesh.input = ('1d', )
+    assert colored_mesh.input == (('1d', 'x'), )
+
+    colored_mesh.input = (3.2, )
+    assert colored_mesh.input == (3.2, )
+
+    colored_mesh.input = 3.2
+    assert colored_mesh.input == 3.2