mirror of https://gitlab.com/pamhyr/pamhyr2
Ensemble: Table: Fix double assignation for data type and target.
parent
3583a93ae0
commit
ae006f52f4
|
|
@ -71,12 +71,28 @@ class ComboBoxDelegate(QItemDelegate):
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
elif self._mode == "stricklers":
|
elif self._mode == "stricklers":
|
||||||
|
used = list(
|
||||||
|
map(
|
||||||
|
lambda e: (e.data_type, e._target_data),
|
||||||
|
self._data.lst
|
||||||
|
)
|
||||||
|
)
|
||||||
|
current = self._data.get(index.row())
|
||||||
|
|
||||||
self.editor.addItems(
|
self.editor.addItems(
|
||||||
[self._trad["not_defined"]] +
|
[self._trad["not_defined"]] +
|
||||||
list(
|
list(
|
||||||
map(
|
map(
|
||||||
lambda s: str(s),
|
lambda s: str(s),
|
||||||
self._study.river.stricklers.stricklers
|
filter(
|
||||||
|
# Exclude target data already used for
|
||||||
|
# this data type
|
||||||
|
lambda s: (
|
||||||
|
current.target_data == s or
|
||||||
|
(current.data_type, s) not in used
|
||||||
|
),
|
||||||
|
self._study.river.stricklers.stricklers
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue