Get selections for scatter and force

Author: freeman-lab

Diff for: lightning/types/images.py

@@ -62,26 +62,24 @@ def clean(imagedata, coordinates=None, xy=None):
 
         return outdict
 
-    @property
     def _coords(self):
         """
-        Coordinates of regions retrieved from visualization user data.
+        Raw coordinates of regions retrieved from visualization user data.
         """
         user_data = self.get_user_data()['settings']
         if 'coords' in user_data.keys():
             return [c for c in user_data['coords'] if len(c) > 1]
         else:
             return []
 
-    @property
     def polygons(self):
         """
         Coordinates of polygons as drawn on an image.
 
         These coordinates can be drawn directly to an image using lighting.imagepoly
-        and should be in the exact same locatinos as they were drawn.
+        and should be in the exact same locations as they were drawn.
         """
-        coords = self._coords
+        coords = self._coords()
         # convert from x/y to row/column indexing
         polygons = map(lambda b: asarray(b)[:, ::-1].tolist(), coords)
         return polygons
@@ -92,10 +90,10 @@ def points(self, z=None):
 
         Parameters
         ----------
-        z : int, optiona, default=None
+        z : int, optional, default=None
             Append a z-index to coordinates (yielding three dimensional coordinates)
         """
-        coords = self._coords
+        coords = self._coords()
         return [polygon_to_points(x, z) for x in coords]
 
     def masks(self, dims, z=None):
@@ -111,7 +109,7 @@ def masks(self, dims, z=None):
             Use a z-index to insert regions into the appropriate slice if using
             three-dimensional volumes.
         """
-        coords = self._coords
+        coords = self._coords()
         return [polygon_to_mask(x, dims, z) for x in coords]
 
 

Diff for: lightning/types/linked.py

@@ -9,7 +9,7 @@ class ScatterLine(Base):
     _func = 'scatterline'
 
     @staticmethod
-    def clean(x, y, series, color=None, label=None, size=None, alpha=None):
+    def clean(x, y, series, color=None, label=None, value=None, colormap=None, size=None, alpha=None):
         """
         Create a joint scatter / line plot.
 
@@ -29,6 +29,12 @@ def clean(x, y, series, color=None, label=None, size=None, alpha=None):
         label : array-like, optional, singleton or (n,)
             Single integer or array to set point colors via group labels
 
+        value : array-like, optional, singleton or (n,)
+            Values to set node colors via a linear scale
+
+        colormap : string
+            Specification of color map, only colorbrewer types supported
+
         size : array-like, optional, singleton or (n,)
             Single size or array to set point sizes
         """
@@ -39,6 +45,8 @@ def clean(x, y, series, color=None, label=None, size=None, alpha=None):
 
         outdict = add_property(outdict, color, 'color')
         outdict = add_property(outdict, label, 'label')
+        outdict = add_property(outdict, value, 'value')
+        outdict = add_property(outdict, colormap, 'colormap')
         outdict = add_property(outdict, size, 'size')
         outdict = add_property(outdict, alpha, 'alpha')
 

Diff for: lightning/types/plots.py

@@ -69,6 +69,17 @@ def clean(x, y, color=None, label=None, value=None, colormap=None, size=None, al
 
         return outdict
 
+    def selected(self):
+        """
+        Selected points from scatter plot
+        """
+        user_data = self.get_user_data()['settings']
+        if 'selected' in user_data.keys():
+            return user_data['selected']
+        else:
+            return []
+
+
 @viztype
 class Matrix(Base):
 
@@ -280,6 +291,16 @@ def clean(conn, color=None, label=None, value=None, colormap=None, size=None):
 
         return outdict
 
+    def selected(self):
+        """
+        Selected points from force plot
+        """
+        user_data = self.get_user_data()['settings']
+        if 'selected' in user_data.keys():
+            return user_data['selected']
+        else:
+            return []
+
 @viztype
 class Graph(Base):