oweditdomain: Cleanup and pylint overrides

Author: ales-erjavec

Orange/widgets/data/oweditdomain.py

@@ -24,12 +24,11 @@
 )
 from AnyQt.QtGui import QStandardItemModel, QStandardItem, QKeySequence, QIcon
 from AnyQt.QtCore import pyqtSignal as Signal, pyqtSlot as Slot
-from AnyQt.QtCore import Qt, QEvent, QSize, QModelIndex, QAbstractListModel
+from AnyQt.QtCore import Qt, QEvent, QSize, QModelIndex
 
 import numpy as np
 
 import Orange.data
-import Orange.preprocess.transformation
 
 from Orange.preprocess.transformation import Identity, Lookup
 from Orange.widgets import widget, gui, settings
@@ -48,7 +47,7 @@ class Categorical(
         ("categories", Tuple[str, ...]),
         ("base", Optional[str]),
         ("annotations", AnnotationsType),
-    ])): ...
+    ])): pass
 
 
 class Real(
@@ -57,21 +56,21 @@ class Real(
         # a precision (int, and a format specifier('f', 'g', or '')
         ("format", Tuple[int, str]),
         ("annotations", AnnotationsType),
-    ])): ...
+    ])): pass
 
 
 class String(
     NamedTuple("String", [
         ("name", str),
         ("annotations", AnnotationsType),
-    ])): ...
+    ])): pass
 
 
 class Time(
     NamedTuple("Time", [
         ("name", str),
         ("annotations", AnnotationsType),
-    ])): ...
+    ])): pass
 
 
 Variable = Union[Categorical, Real, Time, String]
@@ -519,51 +518,8 @@ def __init__(self, *args, **kwargs):
             shortcutContext=Qt.WidgetShortcut,
         )
 
-        model = self.values_model
-        view = self.values_edit
-
-        @self.add_new_item.triggered.connect
-        def _add_item():
-            with disconnected(model.dataChanged, self.on_values_changed,
-                              Qt.UniqueConnection):
-                row = model.rowCount()
-                if not model.insertRow(model.rowCount()):
-                    return
-                index = model.index(row, 0)
-                model.setItemData(
-                    index, {
-                        Qt.EditRole: "",
-                        SourcePosRole: None,
-                        EditStateRole: ItemEditState.Added
-                    }
-                )
-                view.setCurrentIndex(index)
-                view.edit(index)
-            self.on_values_changed()
-
-        @self.remove_item.triggered.connect
-        def _remove_item():
-            view = self.values_edit
-            rows = view.selectionModel().selectedRows(0)
-            if not rows:
-                return
-            index = rows[0]  # type: QModelIndex
-            model = index.model()
-            state = index.data(EditStateRole)
-            pos = index.data(Qt.UserRole)
-            if pos is not None and pos >= 0:
-                # existing level -> only mark/toggle its dropped state
-                model.setData(
-                    index,
-                    ItemEditState.Dropped if state != ItemEditState.Dropped
-                    else ItemEditState.NoState,
-                    EditStateRole)
-            elif state == ItemEditState.Added:
-                # new level -> remove it
-                model.removeRow(index.row())
-            else:
-                assert False, "invalid state '{}' for {}" \
-                    .format(state, index.row())
+        self.add_new_item.triggered.connect(self._add_category)
+        self.remove_item.triggered.connect(self._remove_category)
 
         button1 = FixedSizeButton(
             self, defaultAction=self.move_value_up,
@@ -737,6 +693,61 @@ def on_value_selection_changed(self):
             self.move_value_up.setEnabled(False)
             self.move_value_down.setEnabled(False)
 
+    def _remove_category(self):
+        """
+        Remove the current selected category.
+
+        If the item is an existing category present in the source variable it
+        is marked as removed in the view. But if it was added in the set
+        transformation it is removed entirely from the model and view.
+        """
+        view = self.values_edit
+        rows = view.selectionModel().selectedRows(0)
+        if not rows:
+            return
+        assert len(rows) == 1
+        index = rows[0]  # type: QModelIndex
+        model = index.model()
+        state = index.data(EditStateRole)
+        pos = index.data(Qt.UserRole)
+        if pos is not None and pos >= 0:
+            # existing level -> only mark/toggle its dropped state
+            model.setData(
+                index,
+                ItemEditState.Dropped if state != ItemEditState.Dropped
+                else ItemEditState.NoState,
+                EditStateRole)
+        elif state == ItemEditState.Added:
+            # new level -> remove it
+            model.removeRow(index.row())
+        else:
+            assert False, "invalid state '{}' for {}" \
+                .format(state, index.row())
+
+    def _add_category(self):
+        """
+        Add a new category
+        """
+        view = self.values_edit
+        model = view.model()
+
+        with disconnected(model.dataChanged, self.on_values_changed,
+                          Qt.UniqueConnection):
+            row = model.rowCount()
+            if not model.insertRow(model.rowCount()):
+                return
+            index = model.index(row, 0)
+            model.setItemData(
+                index, {
+                    Qt.EditRole: "",
+                    SourcePosRole: None,
+                    EditStateRole: ItemEditState.Added
+                }
+            )
+            view.setCurrentIndex(index)
+            view.edit(index)
+        self.on_values_changed()
+
 
 class ContinuousVariableEditor(VariableEditor):
     # TODO: enable editing of display format...
@@ -965,7 +976,7 @@ def reset_all(self):
             self._invalidate()
 
     def selected_var_index(self):
-        """Return the selected row in 'Domain Features' view."""
+        """Return the current selected variable index."""
         rows = self.variables_view.selectedIndexes()
         assert len(rows) <= 1
         return rows[0].row() if rows else -1
@@ -975,10 +986,6 @@ def set_domain(self, domain):
         self.variables_model[:] = [abstract(v)
                                    for v in domain.variables + domain.metas]
 
-    def set_variables(self, variables):
-        # type: (Iterable[Variable]) -> None
-        self.variables_model[:] = variables
-
     def _restore(self, ):
         """
         Restore the edit transform from saved state.
@@ -1060,8 +1067,6 @@ def _on_variable_changed(self):
 
     def _store_transform(self, var, transform):
         # type: (Variable, List[Transform]) -> None
-        # print("store:", deconstruct(var))
-        # print("      ", [deconstruct(t) for t in transform])
         self._domain_change_store[deconstruct(var)] = [deconstruct(t) for t in transform]
 
     def _restore_transform(self, var):
@@ -1162,6 +1167,7 @@ def send_report(self):
 
     @classmethod
     def migrate_context(cls, context, version):
+        # pylint: disable=bad-continuation
         if version is None or version <= 1:
             hints_ = context.values.get("domain_change_hints", ({}, -2))[0]
             store = []
@@ -1175,10 +1181,10 @@ def migrate_context(cls, context, version):
                         ("Time", (name, ())),
                 "ContinuousVariable":
                     lambda name, _, attrs:
-                    ("Real", (name, (3, "f"), ())),
+                        ("Real", (name, (3, "f"), ())),
                 "StringVariable":
                     lambda name, _, attrs:
-                    ("String", (name, ())),
+                        ("String", (name, ())),
             }
             for (module, class_name, *rest), target in hints_.items():
                 if module != ns: