Merge pull request #48 from jerneju/tsne-remove-metas-handling

[FIX] t-SNE: remove metas handling
biolab · Feb 2, 2018 · ac9e38d · ac9e38d
2 parents 055d513 + 952f35f
commit ac9e38d
Showing 1 changed file with 6 additions and 22 deletions.
diff --git a/orangecontrib/single_cell/widgets/owtsne.py b/orangecontrib/single_cell/widgets/owtsne.py
@@ -193,7 +193,6 @@ def __init__(self):
         self._invalidated = False
         self.pca_data = None
         self._curve = None
-        self._primitive_metas = ()
         self._data_metas = None
 
         self.variable_x = ContinuousVariable("tsne-x")
@@ -328,16 +327,6 @@ def set_data(self, data):
         else:
             self._invalidated = True
 
-        if data is not None:
-            self._primitive_metas = tuple(a for a in data.domain.metas
-                                          if a.is_primitive())
-            keys = [k for k, a in enumerate(data.domain.metas)
-                    if a.is_primitive()]
-            self._data_metas = data.metas[:, keys]
-        else:
-            self._primitive_metas = ()
-            self._data_metas = None
-
     @Inputs.data_subset
     def set_subset_data(self, subset_data):
         """Set a subset of `data` input to highlight in the plot.
@@ -544,17 +533,12 @@ def _update_plot(self, new=False):
     def _setup_plot(self, new=False):
         emb_x, emb_y = self.embedding[:, 0], self.embedding[:, 1]
         coords = np.vstack((emb_x, emb_y)).T
-        attributes = (self.data.domain.attributes +
-                      (self.variable_x, self.variable_y) +
-                      self._primitive_metas)
-        domain = Domain(attributes=attributes,
-                        class_vars=self.data.domain.class_vars)
-        if self._data_metas is not None:
-             data_x = (self.data.X, coords, self._data_metas)
-        else:
-             data_x = (self.data.X, coords)
-        data = Table.from_numpy(domain, X=np.hstack(data_x),
-                                Y = self.data.Y)
+        domain = Domain(
+            attributes=self.data.domain.attributes + (self.variable_x, self.variable_y),
+            class_vars=self.data.domain.class_vars,
+            metas=self.data.domain.metas)
+        data = Table.from_numpy(
+            domain, X=np.hstack((self.data.X, coords)), Y=self.data.Y, metas=self.data.metas)
         subset_data = data[self._subset_mask] if self._subset_mask is not None else None
         self.graph.new_data(data, subset_data=subset_data, new=new)
         self.graph.update_data(self.variable_x, self.variable_y, True)