Network Explorer: Clear selection on new network (on none)

biolab · Feb 25, 2021 · 4ebf7c5 · 4ebf7c5
1 parent ec534c9
commit 4ebf7c5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/orangecontrib/network/widgets/OWNxExplorer.py b/orangecontrib/network/widgets/OWNxExplorer.py
@@ -506,12 +506,14 @@ def set_checkboxes(value):
         if self.positions is None:
             set_actual_edges()
             self.set_random_positions()
+            self.clear()
             self.graph.reset_graph()
             self.relayout(True)
         else:
             self.graph.update_point_props()
         self.update_marks()
         self.update_selection_buttons()
+        self.unconditional_commit()
 
     def init_attr_values(self):
         super().init_attr_values()
@@ -527,7 +529,7 @@ def randomize(self):
 
     def set_random_positions(self):
         if self.network is None:
-            self.position = None
+            self.positions = None
         else:
             self.positions = np.random.uniform(size=(self.number_of_nodes, 2))
 
@@ -564,6 +566,10 @@ def send_data(self):
         else:
             Outputs.distances.send(distances.submatrix(sorted(selected_indices)))
 
+    def clear(self):
+        super().clear()
+        self.nSelected = 0
+
     def get_coordinates_data(self):
         if self.positions is not None:
             return self.positions.T

diff --git a/orangecontrib/network/widgets/tests/test_OWNxExplorer.py b/orangecontrib/network/widgets/tests/test_OWNxExplorer.py
@@ -1,4 +1,5 @@
 import unittest
+from unittest.mock import Mock
 
 import numpy as np
 
@@ -36,7 +37,6 @@ def test_too_many_labels(self):
 
     def test_subset_selection(self):
         # test if selecting from the graph works
-
         self.send_signal(self.widget.Inputs.network, self.network)
         self.assertEqual(self.widget.nSelected, 0)
         self.send_signal(self.widget.Inputs.node_data, self.data)
@@ -96,6 +96,17 @@ def test_input_subset(self):
         sub_mask = self.widget.get_subset_mask()
         self.assertIsNone(sub_mask)
 
+    def test_clear_selection_on_no_data(self):
+        self.widget.relayout = Mock()
+        self.send_signal(self.widget.Inputs.network, self.network)
+        self.widget.graph.selection_select(np.arange(0, 5))
+        self.assertEqual(self.widget.nSelected, 5)
+        self.assertIsNotNone(self.widget.selection)
+        self.send_signal(self.widget.Inputs.network, None)
+        self.assertEqual(self.widget.nSelected, 0)
+        self.assertIsNone(self.widget.selection)
+        self.assertIsNone(self.get_output(self.widget.Outputs.selected_data))
+
 
 if __name__ == "__main__":
     unittest.main()