Skip to content

[FIX] Hierarchical Clustering: Fix Annotations selection #4214

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
lanzagar merged 1 commit into from
Nov 22, 2019
Merged

[FIX] Hierarchical Clustering: Fix Annotations selection #4214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions Orange/widgets/unsupervised/owhierarchicalclustering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,16 +894,23 @@ def __init__(self):
model[:] = self.basic_annotations

box = gui.widgetBox(self.controlArea, "Annotations")
self.label_cb = combobox.ComboBoxSearch(
self.label_cb = cb = combobox.ComboBoxSearch(
minimumContentsLength=14,
sizeAdjustPolicy=QComboBox.AdjustToMinimumContentsLengthWithIcon
)
cb.setModel(model)
cb.setCurrentIndex(cb.findData(self.annotation, Qt.EditRole))

def on_annotation_activated():
self.annotation = cb.currentData(Qt.EditRole)
self._update_labels()
cb.activated.connect(on_annotation_activated)

def on_annotation_changed(value):
cb.setCurrentIndex(cb.findData(value, Qt.EditRole))
self.connect_control("annotation", on_annotation_changed)

box.layout().addWidget(self.label_cb)
self.label_cb.activated[int].connect(
lambda idx: setattr(self, "annotation", model[idx])
)
self.label_cb.activated.connect(self._update_labels)
self.label_cb.setModel(model)

box = gui.radioButtons(
self.controlArea, self, "pruning", box="Pruning",
Expand Down Expand Up @@ -1101,7 +1108,6 @@ def _set_items(self, items, axis=1):
else:
self.annotation = "Enumeration"
self.openContext(items.domain)
self.label_cb.setCurrentIndex(model.indexOf(self.annotation))
else:
name_option = bool(
items is not None and (
Expand Down