Skip to content

Commit c6e8013

Browse files
authored
Merge pull request #3508 from janezd/variable-selection-view
Easier selection of variables in Radviz, Linear projection and similar
2 parents 0e30d82 + ed040b7 commit c6e8013

File tree

9 files changed

+285
-327
lines changed

9 files changed

+285
-327
lines changed

Orange/widgets/gui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,12 +1077,12 @@ def sizeHint(self):
10771077

10781078

10791079
def listView(widget, master, value=None, model=None, box=None, callback=None,
1080-
sizeHint=None, **misc):
1080+
sizeHint=None, *, viewType=ListViewWithSizeHint, **misc):
10811081
if box:
10821082
bg = vBox(widget, box, addToLayout=False)
10831083
else:
10841084
bg = widget
1085-
view = ListViewWithSizeHint(preferred_size=sizeHint)
1085+
view = viewType(preferred_size=sizeHint)
10861086
view.setModel(model)
10871087
if value is not None:
10881088
connectControl(master, value, callback,

Orange/widgets/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def write_defaults(self):
453453
self.write_defaults_file(settings_file)
454454
except (EOFError, IOError, pickle.PicklingError) as ex:
455455
log.error("Could not write default settings for %s (%s).",
456-
self.widget_class, type(ex).__name__)
456+
self.widget_class, ex)
457457
settings_file.close()
458458
os.remove(filename)
459459
else:

Orange/widgets/utils/listfilter.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ def eventFilter(self, obj, event):
169169
return False
170170

171171

172-
def variables_filter(model, parent=None, accepted_type=Orange.data.Variable):
172+
def variables_filter(model, parent=None, accepted_type=Orange.data.Variable,
173+
view_type=VariablesListItemView):
173174
"""
174175
GUI components: ListView with a lineedit which works as a filter. One can write
175176
a variable name in a edit box and possible matches are then shown in a listview.
@@ -221,7 +222,7 @@ def update_completer_prefix():
221222

222223
proxy = VariableFilterProxyModel()
223224
proxy.setSourceModel(model)
224-
view = VariablesListItemView(acceptedType=accepted_type)
225+
view = view_type(acceptedType=accepted_type)
225226
view.setModel(proxy)
226227

227228
model.dataChanged.connect(update_completer_model)

0 commit comments

Comments
 (0)