Skip to content

Commit

Permalink
ref: don't set RTDCBase.identifier to slot identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Nov 4, 2023
1 parent e39a193 commit c260fc6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
2.14.0
- ref: don't set RTDCBase.identifier to slot identifier
- setup: drop support for Python 3.8
- setup: bump dclab from 0.54.2 to 0.55.0 (better DCOR support)
- build: use Python 3.10 for building executables
Expand Down
4 changes: 2 additions & 2 deletions shapeout2/gui/matrix/data_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ def get_filter_widget_state(self, filter_id):
return fw.__getstate__()

def get_slot_index(self, slot_id):
for ii, ds in enumerate(self.dataset_widgets):
if ds.identifier == slot_id:
for ii, dw in enumerate(self.dataset_widgets):
if dw.identifier == slot_id:
break
else:
raise KeyError("Dataset '{}' not found!".format(slot_id))
Expand Down
4 changes: 2 additions & 2 deletions shapeout2/gui/matrix/plot_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ def get_matrix_element(self, dataset_id, plot_id):
ncols = self.glo.columnCount()
nrows = self.glo.rowCount()
for ii in range(1, nrows):
ds = self.data_matrix.glo.itemAtPosition(ii, 0).widget()
if ds.identifier == dataset_id:
dw = self.data_matrix.glo.itemAtPosition(ii, 0).widget()
if dw.identifier == dataset_id:
for jj in range(ncols):
f = self.glo.itemAtPosition(0, jj).widget()
if f.identifier == plot_id:
Expand Down
6 changes: 3 additions & 3 deletions shapeout2/pipeline/dataslot.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def __init__(self, path, identifier=None, name=None):
cfg = meta_tool.get_rtdc_config(path)
if name is None:
name = cfg["experiment"]["sample"]
#: unique identifier of the filter
#: session-unique identifier of the slot
self.identifier = identifier
#: user-defined name of the filter
#: user-defined name of the slot
self.name = name
#: whether to use this slot
self.slot_used = True
Expand Down Expand Up @@ -188,7 +188,7 @@ def get_dataset(self):
Loaded dataset
"""
if self._dataset is None:
ds = dclab.new_dataset(self.path, identifier=self.identifier)
ds = dclab.new_dataset(self.path)
self._dataset = ds
else:
ds = self._dataset
Expand Down

0 comments on commit c260fc6

Please sign in to comment.