Merge pull request #2314 from jerneju/value-schemeedit

[FIX] Paint Data: now stores data in list and not np.array

Author: lanzagar

Orange/widgets/data/owpaintdata.py

@@ -798,8 +798,13 @@ def __init__(self):
         self.class_model.rowsRemoved.connect(self._class_count_changed)
 
         if self.data is None:
-            self.data = np.zeros((0, 3))
-        self.__buffer = self.data.copy()
+            self.data = []
+            self.__buffer = np.zeros((0, 3))
+        elif isinstance(self.data, np.ndarray):
+            self.__buffer = self.data.copy()
+            self.data = self.data.tolist()
+        else:
+            self.__buffer = np.array(self.data)
 
         self.colors = colorpalette.ColorPaletteGenerator(
             len(colorpalette.DefaultRGBColors))
@@ -1033,8 +1038,8 @@ def reset_to_input(self):
         newindex = min(max(index, 0), len(self.class_model) - 1)
         itemmodels.select_row(self.classValuesView, newindex)
 
-        self.data = self.input_data
-        self.__buffer = self.data.copy()
+        self.data = self.input_data.tolist()
+        self.__buffer = self.input_data.copy()
 
         prev_attr2 = self.hasAttr2
         self.hasAttr2 = self.input_has_attr2
@@ -1237,19 +1242,20 @@ def _attr_name_changed(self):
         self.invalidate()
 
     def invalidate(self):
-        self.data = self.__buffer.copy()
+        self.data = self.__buffer.tolist()
         self.commit()
 
     def commit(self):
-        if len(self.data) == 0:
+        data = np.array(self.data)
+        if len(data) == 0:
             self.send("Data", None)
             return
         if self.hasAttr2:
-            X, Y = self.data[:, :2], self.data[:, 2]
+            X, Y = data[:, :2], data[:, 2]
             attrs = (Orange.data.ContinuousVariable(self.attr1),
                      Orange.data.ContinuousVariable(self.attr2))
         else:
-            X, Y = self.data[:, np.newaxis, 0], self.data[:, 2]
+            X, Y = data[:, np.newaxis, 0], data[:, 2]
             attrs = (Orange.data.ContinuousVariable(self.attr1),)
         if len(np.unique(Y)) >= 2:
             domain = Orange.data.Domain(