Skip to content

Commit

Permalink
readd ensure_unique
Browse files Browse the repository at this point in the history
  • Loading branch information
brisvag committed Jul 8, 2022
1 parent 33582b8 commit 1ff7830
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions napari/components/layerlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,31 @@ def _update_name(self, event):
layer = event.source
layer.name = self._coerce_name(layer.name, layer)

def _ensure_unique(self, values, allow=()):
bad = set(self._list) - set(allow)
values = tuple(values) if isinstance(values, Iterable) else (values,)
for v in values:
if v in bad:
raise ValueError(
trans._(
"Layer '{v}' is already present in layer list",
deferred=True,
v=v,
)
)
return values

def __setitem__(self, key, value):
old = self._list[key]
if isinstance(key, slice):
value = self._ensure_unique(value, old)
elif isinstance(key, int):
(value,) = self._ensure_unique((value,), (old,))
super().__setitem__(key, value)

def insert(self, index: int, value: Layer):
"""Insert ``value`` before index."""
(value,) = self._ensure_unique((value,))
new_layer = self._type_check(value)
new_layer.name = self._coerce_name(new_layer.name)
self._clean_cache()
Expand Down

0 comments on commit 1ff7830

Please sign in to comment.