VariablesSelection: Do not plot embedding until VariableSelection is initialized

Author: VesnaT

Orange/widgets/utils/itemmodels.py

@@ -496,6 +496,7 @@ class PyListModel(QAbstractListModel):
     """
     MIME_TYPE = "application/x-Orange-PyListModelData"
     Separator = object()
+    moved = Signal()
 
     def __init__(self, iterable=None, parent=None,
                  flags=Qt.ItemIsSelectable | Qt.ItemIsEnabled,
@@ -616,6 +617,7 @@ def removeRows(self, row, count, parent=QModelIndex()):
         """
         if not parent.isValid():
             del self[row:row + count]
+            self.moved.emit()
             return True
         else:
             return False

Orange/widgets/utils/plot/owplotgui.py

@@ -38,7 +38,7 @@
 from AnyQt.QtWidgets import QWidget, QToolButton, QVBoxLayout, QHBoxLayout, QGridLayout, QMenu, QAction,\
     QDialog, QSizePolicy, QPushButton, QListView, QLabel
 from AnyQt.QtGui import QIcon, QKeySequence
-from AnyQt.QtCore import Qt, pyqtSignal, QPoint, QSize
+from AnyQt.QtCore import Qt, pyqtSignal, QPoint, QSize, QObject
 
 from .owconstants import NOTHING, ZOOMING, SELECT, SELECT_POLYGON, PANNING, SELECTION_ADD,\
     SELECTION_REMOVE, SELECTION_TOGGLE, SELECTION_REPLACE
@@ -49,6 +49,8 @@
 
 
 class AddVariablesDialog(QDialog):
+    add = pyqtSignal()
+
     def __init__(self, master, model):
         QDialog.__init__(self)
 
@@ -131,10 +133,16 @@ def add_variables(self):
             del model[i]
 
         self.master.model_selected.extend(variables)
+        self.add.emit()
+
 
+class VariablesSelection(QObject):
+    added = pyqtSignal()
+    removed = pyqtSignal()
 
-class VariablesSelection:
-    def __init__(self, master, model_selected, model_other, widget=None):
+    def __init__(self, master, model_selected, model_other,
+                 widget=None, parent=None):
+        super().__init__(parent)
         self.master = master
         self.model_selected = model_selected
         self.model_other = model_other
@@ -194,9 +202,11 @@ def __deactivate_selection(self):
             del model[i]
 
         self.model_other.extend(variables)
+        self.removed.emit()
 
     def _action_add(self):
         self.add_variables_dialog = AddVariablesDialog(self, self.model_other)
+        self.add_variables_dialog.add.connect(lambda: self.added.emit())
 
 
 class OrientedWidget(QWidget):

Orange/widgets/visualize/owlinearprojection.py

@@ -270,8 +270,7 @@ class Error(OWAnchorProjectionWidget.Error):
 
     def __init__(self):
         self.model_selected = VariableListModel(enable_dnd=True)
-        self.model_selected.rowsInserted.connect(self.__model_selected_changed)
-        self.model_selected.rowsRemoved.connect(self.__model_selected_changed)
+        self.model_selected.moved.connect(self.__model_selected_changed)
         self.model_other = VariableListModel(enable_dnd=True)
 
         self.vizrank, self.btn_vizrank = LinearProjectionVizRank.add_vizrank(
@@ -295,6 +294,8 @@ def _add_controls_variables(self):
         self.variables_selection = VariablesSelection(
             self, self.model_selected, self.model_other, self.controlArea
         )
+        self.variables_selection.added.connect(self.__model_selected_changed)
+        self.variables_selection.removed.connect(self.__model_selected_changed)
         self.variables_selection.add_remove.layout().addWidget(
             self.btn_vizrank
         )
@@ -327,6 +328,7 @@ def __vizrank_set_attrs(self, attrs):
         self.model_selected[:] = attrs[:]
         self.model_other[:] = [var for var in self.continuous_variables
                                if var not in attrs]
+        self.__model_selected_changed()
 
     def __model_selected_changed(self):
         self.selected_vars = [(var.name, vartype(var)) for var
@@ -367,6 +369,7 @@ def set_data(self, data):
 
         self._check_options()
         self._init_vizrank()
+        self.init_projection()
 
     def _check_options(self):
         buttons = self.radio_placement.buttons
@@ -422,8 +425,6 @@ def init_attr_values(self):
         self.selected_vars = []
 
     def init_projection(self):
-        if not len(self.effective_variables):
-            return
         if self.placement == self.Placement.Circular:
             self.projector = CircularPlacement()
         elif self.placement == self.Placement.LDA:

Orange/widgets/visualize/owradviz.py

@@ -286,8 +286,7 @@ class Error(OWAnchorProjectionWidget.Error):
 
     def __init__(self):
         self.model_selected = VariableListModel(enable_dnd=True)
-        self.model_selected.rowsInserted.connect(self.__model_selected_changed)
-        self.model_selected.rowsRemoved.connect(self.__model_selected_changed)
+        self.model_selected.moved.connect(self.__model_selected_changed)
         self.model_other = VariableListModel(enable_dnd=True)
 
         self.vizrank, self.btn_vizrank = RadvizVizRank.add_vizrank(
@@ -299,6 +298,8 @@ def _add_controls(self):
         self.variables_selection = VariablesSelection(
             self, self.model_selected, self.model_other, self.controlArea
         )
+        self.variables_selection.added.connect(self.__model_selected_changed)
+        self.variables_selection.removed.connect(self.__model_selected_changed)
         self.variables_selection.add_remove.layout().addWidget(
             self.btn_vizrank
         )
@@ -324,6 +325,7 @@ def __vizrank_set_attrs(self, attrs):
         self.model_selected[:] = attrs[:]
         self.model_other[:] = [var for var in self.primitive_variables
                                if var not in attrs]
+        self.__model_selected_changed()
 
     def __model_selected_changed(self):
         self.selected_vars = [(var.name, vartype(var)) for var
@@ -358,6 +360,7 @@ def set_data(self, data):
             self.model_other[:] = variables[5:] + class_var
 
         self._init_vizrank()
+        self.init_projection()
 
     def _init_vizrank(self):
         is_enabled = self.data is not None and \

Orange/widgets/visualize/tests/test_owlinearprojection.py

@@ -169,8 +169,6 @@ class LinProjVizRankTests(WidgetTest):
     def setUpClass(cls):
         super().setUpClass()
         cls.data = Table("iris")
-        # dom = Domain(cls.iris.domain.attributes, [])
-        # cls.iris_no_class = Table(dom, cls.iris)
 
     def setUp(self):
         self.widget = self.create_widget(OWLinearProjection)
@@ -192,6 +190,7 @@ def test_continuous_class(self):
     def test_set_attrs(self):
         self.send_signal(self.widget.Inputs.data, self.data)
         model_selected = self.widget.model_selected[:]
+        c1 = self.get_output(self.widget.Outputs.components)
         self.vizrank.toggle()
         self.process_events(until=lambda: not self.vizrank.keep_running)
         self.assertEqual(len(self.vizrank.scores), self.vizrank.state_count())
@@ -200,3 +199,5 @@ def test_set_attrs(self):
             QItemSelectionModel.ClearAndSelect
         )
         self.assertNotEqual(self.widget.model_selected[:], model_selected)
+        c2 = self.get_output(self.widget.Outputs.components)
+        self.assertNotEqual(c1.domain.attributes, c2.domain.attributes)

Orange/widgets/visualize/tests/test_owradviz.py

@@ -63,10 +63,12 @@ def test_not_enough_instances(self):
     def test_saved_features(self):
         self.send_signal(self.widget.Inputs.data, self.data)
         self.widget.model_selected.pop(0)
+        self.widget.variables_selection.removed.emit()
+        selected = [a.name for a in self.widget.model_selected]
+
         settings = self.widget.settingsHandler.pack_data(self.widget)
         w = self.create_widget(OWRadviz, stored_settings=settings)
-        self.send_signal(self.widget.Inputs.data, self.data, widget=w)
-        selected = [a.name for a in self.widget.model_selected]
+        self.send_signal(w.Inputs.data, self.data, widget=w)
         self.assertListEqual(selected, [a.name for a in w.model_selected])
         self.send_signal(self.widget.Inputs.data, self.heart_disease)
         selected = [a.name for a in self.widget.model_selected]