Skip to content

[FIX] Scatter Plot Graph: vars instead of indices & remove dead code #2815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janezd merged 2 commits into from
Dec 8, 2017
Merged

[FIX] Scatter Plot Graph: vars instead of indices & remove dead code #2815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b9842b
Scatter Plot Graph: use vars instead of indices
jerneju Dec 1, 2017
985a49c
Scatter Plot Graph: remove dead code
jerneju Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions Orange/widgets/visualize/owscatterplotgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,6 @@ def update_data(self, attr_x, attr_y, reset_view=True):
if self.jittered_data is None or not len(self.jittered_data):
self.valid_data = None
else:
index_x = self.domain.index(attr_x)
index_y = self.domain.index(attr_y)
self.valid_data = self.get_valid_list([attr_x, attr_y])
if not np.any(self.valid_data):
self.valid_data = None
Expand All @@ -691,10 +689,8 @@ def update_data(self, attr_x, attr_y, reset_view=True):
self.view_box.tag_history()
[min_x, max_x], [min_y, max_y] = self.view_box.viewRange()

for axis, name, index in (("bottom", attr_x, index_x),
("left", attr_y, index_y)):
self.set_axis_title(axis, name)
var = self.domain[index]
for axis, var in (("bottom", attr_x), ("left", attr_y)):
self.set_axis_title(axis, var)
if var.is_discrete:
self.set_labels(axis, get_variable_values_sorted(var))
else:
Expand Down Expand Up @@ -781,11 +777,6 @@ def set_labels(self, axis, labels):
def set_axis_title(self, axis, title):
self.plot_widget.setLabel(axis=axis, text=title)

def get_size_index(self):
if self.attr_size is None:
return -1
return self.domain.index(self.attr_size)

def compute_sizes(self):
self.master.Information.missing_size.clear()
if self.attr_size is None:
Expand Down