tomwer 1.2.1__py3-none-any.whl → 1.3.12__py3-none-any.whl

tomwer/gui/control/actions.py

@@ -29,8 +29,10 @@ __date__ = "23/03/2021"
 
 
 from silx.gui import qt
+from functools import partial
 
 from tomwer.gui import icons as tomwer_icons
+from tomwer.gui.control.tomoobjdisplaymode import DisplayMode
 
 
 class NXTomomillParamsAction(qt.QAction):
@@ -68,3 +70,55 @@ class CFGFileActiveLabel(qt.QLabel):
 
     def setInactive(self):
         self.setActive(active=False)
+
+
+class TomoObjDisplayModeToolButton(qt.QToolButton):
+    """
+    Button to change the way tomo object are displayed.
+    Either using the full url or only a 'short' description.
+    """
+
+    sigDisplayModeChanged = qt.Signal(str)
+
+    _SHORT_DESC_TOOLTIP = "Use a short description of the tomo object. Two different scans can have the same short desciption"
+    _URL_TOOLTIP = (
+        "Use the full url to display the tomo object. Url is guaranted to be unique."
+    )
+
+    def __init__(self, parent=None) -> None:
+        super().__init__(parent)
+
+        self._shortDescIcon = tomwer_icons.getQIcon("short_description")
+        shortDescAction = qt.QAction(self._shortDescIcon, "short description", self)
+        shortDescAction.setToolTip(self._SHORT_DESC_TOOLTIP)
+
+        self._urlIcon = tomwer_icons.getQIcon("url")
+        urlDescAction = qt.QAction(self._urlIcon, "url", self)
+        urlDescAction.setToolTip(self._URL_TOOLTIP)
+
+        menu = qt.QMenu(self)
+        menu.addAction(shortDescAction)
+        menu.addAction(urlDescAction)
+        self.setMenu(menu)
+        self.setPopupMode(qt.QToolButton.InstantPopup)
+
+        # set up
+        self.setDisplayMode(DisplayMode.SHORT)
+
+        # connect signal / slot
+        shortDescAction.triggered.connect(
+            partial(self.setDisplayMode, DisplayMode.SHORT)
+        )
+        urlDescAction.triggered.connect(partial(self.setDisplayMode, DisplayMode.URL))
+
+    def setDisplayMode(self, mode: DisplayMode):
+        mode = DisplayMode.from_value(mode)
+        if mode is DisplayMode.SHORT:
+            self.setIcon(self._shortDescIcon)
+            self.setToolTip(self._SHORT_DESC_TOOLTIP)
+        elif mode is DisplayMode.URL:
+            self.setIcon(self._urlIcon)
+            self.setToolTip(self._URL_TOOLTIP)
+        else:
+            raise ValueError(f"display mode {mode} not handled")
+        self.sigDisplayModeChanged.emit(mode.value)

tomwer/gui/control/datalist.py

@@ -39,11 +39,11 @@ from silx.gui import qt
 
 from tomoscan.esrf.volume.utils import guess_volumes
 from tomoscan.identifier import BaseIdentifier
-from tomoscan.esrf.identifier.hdf5Identifier import HDF5TomoScanIdentifier
+from tomoscan.esrf.identifier.hdf5Identifier import NXtomoScanIdentifier
 
 from tomwer.core.scan.blissscan import BlissScan
 from tomwer.core.scan.edfscan import EDFTomoScan
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.tomwer_object import TomwerObject
 from tomwer.core.volume.volumefactory import VolumeFactory
@@ -56,6 +56,8 @@ from tomwer.gui.utils.inputwidget import (
     NXTomomillOutputDirSelector,
 )
 from tomwer.gui.utils.qt_utils import block_signals
+from tomwer.gui.control.tomoobjdisplaymode import DisplayMode
+from tomwer.gui.control.actions import TomoObjDisplayModeToolButton
 
 logger = logging.getLogger(__name__)
 
@@ -240,6 +242,11 @@ class BlissHDF5DataListDialog(_DataListDialog):
             os.environ["TOMWER_DEFAULT_INPUT_DIR"]
         ):
             dialog.setDirectory(os.environ["TOMWER_DEFAULT_INPUT_DIR"])
+        elif dialog.directory() != os.getcwd() or str(dialog.directory()).startswith(
+            "/data"
+        ):
+            # if the directory as already been set by the user. Avoid redefining it
+            pass
         elif os.path.isdir("/data"):
             dialog.setDirectory("/data")
 
@@ -251,7 +258,8 @@ class BlissHDF5DataListDialog(_DataListDialog):
         added_scans = []
         for file_ in filesSelected:
             added_scans = self.add(file_)
-            assert added_scans is not None
+            if added_scans is None:
+                continue
             added_scans.extend(added_scans)
         super()._callbackAddPath()
         self.datalist.setMySelection(added_scans)
@@ -331,6 +339,10 @@ class _RawDataListMainWindow(qt.QMainWindow):
         toolbar.addAction(self._parametersAction)
         self._parametersAction.triggered.connect(self._parametersTriggered)
 
+        # add tomo obj display mode
+        self._tomoObjdisplayAction = TomoObjDisplayModeToolButton(self)
+        toolbar.addWidget(self._tomoObjdisplayAction)
+
         # toolbar spacer
         spacer = qt.QWidget(toolbar)
         spacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Minimum)
@@ -351,8 +363,12 @@ class _RawDataListMainWindow(qt.QMainWindow):
 
         # connect signal / slot
         self._dialog.sigConfigFileChanged.connect(self._cfgFileChanged)
-        self._dialog.sigOutputdirChanged.connect(self._propagateUpdateSignal)
-        self._widget.sigUpdated.connect(self._propagateUpdateSignal)
+        self._dialog.sigOutputdirChanged.connect(self.sigUpdated)
+        self._widget.sigUpdated.connect(self.sigUpdated)
+        self._tomoObjdisplayAction.sigDisplayModeChanged.connect(self.setDisplayMode)
+
+    def setDisplayMode(self, *args, **kwargs):
+        self.datalist.setDisplayMode(*args, **kwargs)
 
     def getOutputFolder(self):
         return self._dialog.getOutputFolder()
@@ -360,9 +376,6 @@ class _RawDataListMainWindow(qt.QMainWindow):
     def setOutputFolder(self, output_dir):
         self._dialog.setOutputDialog(output_dir)
 
-    def _propagateUpdateSignal(self):
-        self.sigUpdated.emit()
-
     def _parametersTriggered(self):
         self._dialog.show()
         self._dialog.raise_()
@@ -516,6 +529,44 @@ class GenericScanListDialog(_DataListDialog):
         self.datalist.setMySelection(added_scans)
 
 
+class GenericScanListWindow(qt.QMainWindow):
+    def __init__(self, parent=None) -> None:
+        super().__init__(parent)
+        self.setWindowFlags(qt.Qt.Widget)
+
+        self._widget = GenericScanListDialog()
+        self.datalist = self._widget.datalist
+        self.setCentralWidget(self._widget)
+
+        # toolbar
+        toolbar = qt.QToolBar()
+        toolbar.setMovable(False)
+        toolbar.setFloatable(False)
+        self.addToolBar(qt.Qt.TopToolBarArea, toolbar)
+
+        tomoObjdisplayAction = TomoObjDisplayModeToolButton(self)
+        toolbar.addWidget(tomoObjdisplayAction)
+
+        # set up
+        self.setDisplayMode(DisplayMode.SHORT)
+
+        # expose API
+        self.sigUpdated = self._widget.sigUpdated
+
+        # connect signal / slot
+        tomoObjdisplayAction.sigDisplayModeChanged.connect(self.setDisplayMode)
+
+    def setDisplayMode(self, display_mode: DisplayMode):
+        self.datalist.setDisplayMode(display_mode)
+
+    # expose API
+    def n_scan(self):
+        return self._widget.n_scan()
+
+    def add(self, *args, **kwargs):
+        self._widget.add(*args, **kwargs)
+
+
 class VolumeListDialog(_DataListDialog):
     """Dialog used to load EDFScan or HEDF5 scans"""
 
@@ -574,13 +625,19 @@ class _TomwerObjectList(qt.QTableWidget):
         self.menu.addAction(self._copyAction)
         self.menu.addAction(self._pasteAction)
 
+        self.setDisplayMode(DisplayMode.SHORT)
+
+    def setDisplayMode(self, mode: DisplayMode) -> None:
+        self._displayMode = DisplayMode.from_value(mode)
+        self._update()
+
     def n_data(self):
         return len(self._myitems)
 
     def remove_item(self, item):
         """Remove a given folder"""
         try:
-            del self._myitems[item.text()]
+            del self._myitems[item.data(qt.Qt.UserRole).get_identifier().to_str()]
         except RuntimeError:
             # look like this could failed on some Qt or PyQt version (see issue 802)
             # no much that we can do so ignore it.
@@ -672,8 +729,8 @@ class _TomwerObjectList(qt.QTableWidget):
             raise TypeError(
                 f"is expected to be an instance of str or of {TomwerObject} but {type(obj)}"
             )
-        identifier_as_str = obj.get_identifier().to_str()
 
+        identifier_as_str = obj.get_identifier().to_str()
         if identifier_as_str in self._myitems:
             # in this case we will update the value. Because if the same identifier already exists at launch time
             # it will create two different objects that could be an issue.
@@ -694,14 +751,24 @@ class _TomwerObjectList(qt.QTableWidget):
         return (obj,)
 
     def getTextToDisplay(self, obj: TomwerObject):
-        return obj.get_identifier().to_str()
+        if self._displayMode is DisplayMode.SHORT:
+            return obj.get_identifier().short_description()
+        elif self._displayMode is DisplayMode.URL:
+            return obj.get_identifier().to_str()
+        else:
+            raise ValueError(
+                f"Requested display mode {self._displayMode} is not handled"
+            )
 
     def setMySelection(self, datasets: tuple):
         if datasets is None:
             datasets = tuple()
         for row in range(self.rowCount()):
             item = self.item(row, 0)
-            select_it = item.data(qt.Qt.UserRole) in datasets or item.text() in datasets
+            select_it = (
+                item.data(qt.Qt.UserRole).get_identifier().to_str() in datasets
+                or item.text() in datasets
+            )
             item.setSelected(select_it)
 
     def clear(self):
@@ -795,7 +862,7 @@ class _TomwerObjectList(qt.QTableWidget):
 class GenericScanList(_TomwerObjectList):
     """Data list able to manage directories (EDF/HDF5?) or files (HDF5)"""
 
-    HEADER_NAMES = ("scan url",)
+    HEADER_NAMES = ("dataset",)
 
     def _getTomoObject(self, obj: str, allow_several: bool = False):
         """
@@ -869,7 +936,7 @@ class BlissScanList(_TomwerObjectList):
                 types = qt.QMessageBox.Ok | qt.QMessageBox.Cancel
                 msg.setStandardButtons(types)
 
-                if HDF5TomoScan.is_nexus_nxtomo_file(data):
+                if NXtomoScan.is_nexus_nxtomo_file(data):
                     text = (
                         f"The input file `{data}` seems to contain `NXTomo` entries. "
                         "and no valid `Bliss` valid entry. \n"
@@ -896,12 +963,12 @@ class BlissScanList(_TomwerObjectList):
             else:
                 file_path = data
         else:
-            identifier = HDF5TomoScanIdentifier.from_str(data)
+            identifier = NXtomoScanIdentifier.from_str(data)
             possible_entries.append(identifier.data_path)
             file_path = identifier.file_path
         created_scans = []
         for entry in possible_entries:
-            scan = HDF5TomoScan(scan=file_path, entry=entry)
+            scan = NXtomoScan(scan=file_path, entry=entry)
             scan_objs = super().add(scan)
             if scan_objs is not None:
                 for scan_obj in scan_objs:

tomwer/gui/control/datalistener.py

@@ -125,10 +125,10 @@ class DataListenerWidget(qt.QMainWindow):
 
         # signal / slot connection
         self._actionGroup.triggered.connect(self._updateCentralWidget)
-        self._controlWidget.sigActivated.connect(self._activated)
-        self._controlWidget.sigDeactivated.connect(self._deactivated)
-        self._configWindow.sigConfigurationChanged.connect(self._configChanged)
-        self._configWindow.sigCFGFileChanged.connect(self._cfgFileChanged)
+        self._controlWidget.sigActivated.connect(self.sigActivate)
+        self._controlWidget.sigDeactivated.connect(self.sigDeactivate)
+        self._configWindow.sigConfigurationChanged.connect(self.sigConfigurationChanged)
+        self._configWindow.sigCFGFileChanged.connect(self.sigCFGFileChanged)
 
         # expose api
         self.activate = self._controlWidget.activate
@@ -171,18 +171,6 @@ class DataListenerWidget(qt.QMainWindow):
         self._listener().sigScanAdded.disconnect(self._acquisitionUpdated)
         self._listener().sigAcquisitionEnded.disconnect(self._acquisitionEnded)
 
-    def _activated(self):
-        self.sigActivate.emit()
-
-    def _deactivated(self):
-        self.sigDeactivate.emit()
-
-    def _configChanged(self):
-        self.sigConfigurationChanged.emit()
-
-    def _cfgFileChanged(self, cfg_file):
-        self.sigCFGFileChanged.emit(cfg_file)
-
     def _updateCentralWidget(self, action_triggered):
         action_to_widget = {
             self._controlAction: self._controlWidget,

tomwer/gui/control/datawatcher/controlwidget.py

@@ -99,10 +99,8 @@ class ControlWidget(qt.QWidget):
         """
         Ask the user the path to the folder to observe
         """
-        defaultDirectory = self.getFolderObserved()
+        defaultDirectory = self._qteFolderSelected.text()
         if defaultDirectory is None or not os.path.isdir(defaultDirectory):
-            if os.path.isdir(self.DEFAULT_DIRECTORY):
-                defaultDirectory = self.DEFAULT_DIRECTORY
             if defaultDirectory is None:
                 defaultDirectory = get_default_directory()
 
@@ -113,4 +111,4 @@ class ControlWidget(qt.QWidget):
             dialog.close()
             return
 
-        self.setFolderObserved(dialog.selectedFiles()[0])
+        self._qteFolderSelected.setText(dialog.selectedFiles()[0])

tomwer/gui/control/datawatcher/datawatcher.py

@@ -148,7 +148,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
 
         # set initial path to observe
         self.setFolderObserved(self._getInitPath())
-        self._initStatusView()
 
         # hide all windows by default
         for widget in (
@@ -475,20 +474,10 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
             self.observationThread.sigScanReady.disconnect(self._signalScanReady)
             self.obsThIsConnected = False
 
-    def _initStatusView(self):
-        """
-        The status view need a thread to update the animated icon when scanning
-        """
-        self.__threadAnimation = QWaiterThread(0.1)
-        self.__threadAnimation.finished.connect(self._updateAnimatedIcon)
-
     def _updateStatusView(self):
         """Update the processing state"""
         if self.currentStatus in self._animatedStates:
-            if not self.__threadAnimation.isRunning():
-                self.__threadAnimation.start()
-            elif self.__threadAnimation is not None:
-                self.__threadAnimation.wait(4000)
+            pass
         elif self.currentStatus == "acquisition ended":
             self._setStateIcon(silxicons.getQIcon("selected"))
         elif self.currentStatus == "failure":
@@ -506,18 +495,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         else:
             self._stateLabel.setPixmap(icon.pixmap(30, state=qt.QIcon.On))
 
-    def _updateAnimatedIcon(self):
-        """Simple function which manage the waiting icon"""
-        if self.currentStatus in self._animatedStates:
-            icon = self.animated_icon.currentIcon()
-            if icon is None:
-                icon = qt.QIcon()
-            self.animated_icon._updateState()
-            self._setStateIcon(icon)
-
-            # get ready for the next animation
-            self.__threadAnimation.start()
-
     def _signalScanReady(self, scan):
         if type(scan) is str:
             try:

tomwer/gui/control/{email.py → emailnotifier.py}

@@ -1,7 +1,7 @@
 from typing import Optional
 from silx.gui import qt
 from tomwer.gui import icons as tomwericons
-from tomwer.core.utils import concatenate_dict
+from tomwer.core.utils.dictutils import concatenate_dict
 
 
 class EmailComposition(qt.QWidget):
@@ -59,13 +59,10 @@ class EmailComposition(qt.QWidget):
         self.layout().addRow(self._textQLE)
 
         # connect signal / slot
-        self._fromAddressesQLE.editingFinished.connect(self._changed)
-        self._toAdressesQLE.editingFinished.connect(self._changed)
-        self._subjectQLE.editingFinished.connect(self._changed)
-        self._textQLE.textChanged.connect(self._changed)
-
-    def _changed(self):
-        self.sigChanged.emit()
+        self._fromAddressesQLE.editingFinished.connect(self.sigChanged)
+        self._toAdressesQLE.editingFinished.connect(self.sigChanged)
+        self._subjectQLE.editingFinished.connect(self.sigChanged)
+        self._textQLE.textChanged.connect(self.sigChanged)
 
     def getToAddrs(self) -> tuple:
         adresses = self._toAdressesQLE.text().replace(" ", "")
@@ -118,11 +115,8 @@ class EmailSettings(qt.QWidget):
         self.layout().addRow("port", self._portQLE)
 
         # connect signal / slot
-        self._hostQLE.editingFinished.connect(self._changed)
-        self._portQLE.editingFinished.connect(self._changed)
-
-    def _changed(self):
-        self.sigChanged.emit()
+        self._hostQLE.editingFinished.connect(self.sigChanged)
+        self._portQLE.editingFinished.connect(self.sigChanged)
 
     def getConfiguration(self) -> dict:
         return {"host": self._hostQLE.text(), "port": int(self._portQLE.text())}
@@ -166,11 +160,8 @@ class Emailwidget(qt.QTabWidget):
         )
 
         # connect signal / slot
-        self._compositionWidget.sigChanged.connect(self._changed)
-        self._serverSettingsWidget.sigChanged.connect(self._changed)
-
-    def _changed(self):
-        self.sigChanged.emit()
+        self._compositionWidget.sigChanged.connect(self.sigChanged)
+        self._serverSettingsWidget.sigChanged.connect(self.sigChanged)
 
     def getConfiguration(self) -> dict:
         return concatenate_dict(

tomwer/gui/control/history.py

@@ -32,7 +32,7 @@ from operator import itemgetter
 
 from silx.gui import qt
 
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 
 
@@ -120,7 +120,7 @@ class _FoundScanModel(qt.QAbstractTableModel):
                 return path.type
             elif isinstance(path, str) and path.startswith("hdf5 scan"):
                 return "hdf5"
-            elif HDF5TomoScan.directory_contains_scan(path) or "@" in path:
+            elif NXtomoScan.directory_contains_scan(path) or "@" in path:
                 return "hdf5"
             else:
                 return "edf"

tomwer/gui/control/observations.py

@@ -35,7 +35,7 @@ from collections import OrderedDict
 from silx.gui import qt
 
 from tomwer.core.scan.blissscan import BlissScan
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 
 
@@ -206,7 +206,7 @@ class _ObservedScanModel(qt.QAbstractTableModel):
                 return obs.type
             elif isinstance(obs, BlissScan):
                 return "hdf5"
-            elif HDF5TomoScan.directory_contains_scan(directory=obs):
+            elif NXtomoScan.directory_contains_scan(directory=obs):
                 return "hdf5"
             else:
                 return "edf"

tomwer/gui/control/reducedarkflatselector.py

@@ -8,11 +8,11 @@ from silx.gui import qt
 from silx.gui.plot import Plot2D
 from silx.io.dictdump import h5todict
 from silx.io.url import DataUrl
+from silx.io.utils import open as open_hdf5
 from silx.gui.dialog.DataFileDialog import DataFileDialog
 
 from tomoscan.esrf.scan.utils import cwd_context
-from tomoscan.framereducerbase import REDUCER_TARGET
-from tomoscan.io import HDF5File
+from tomoscan.framereducer.target import REDUCER_TARGET
 
 from tomwer.io.utils import get_default_directory
 
@@ -249,7 +249,7 @@ class ReduceDarkFlatSelectorTableWidget(qt.QWidget):
         if not os.path.exists(file_path):
             _logger.error(f"file doesn't exists ({file_path})")
 
-        with HDF5File(file_path, mode="r") as h5f:
+        with open_hdf5(file_path) as h5f:
             entries = tuple(h5f.keys())
 
         res = []
@@ -289,16 +289,16 @@ class ReduceDarkFlatSelectorTableWidget(qt.QWidget):
             for target in REDUCER_TARGET.values():
                 if target in reduced_info_dict:
                     reduced_frames = reduced_info_dict[target]
-                    reduced_frames[
-                        "reduce_frames_name"
-                    ] = f"{target} from {url.data_path()}@{os.path.basename(url.file_path())}"
+                    reduced_frames["reduce_frames_name"] = (
+                        f"{target} from {url.data_path()}@{os.path.basename(url.file_path())}"
+                    )
                     result.append(reduced_frames)
 
             if len(reduced_frames) == 0:
                 # else we consider the data_path is the valid one
-                reduced_frames[
-                    "reduce_frames_name"
-                ] = f"{url.data_path()}@{os.path.basename(url.file_path())}"
+                reduced_frames["reduce_frames_name"] = (
+                    f"{url.data_path()}@{os.path.basename(url.file_path())}"
+                )
                 result.append(reduced_frames)
 
         return tuple(result)

tomwer/gui/control/selectorwidgetbase.py

@@ -3,11 +3,13 @@ import logging
 from silx.gui import qt
 
 from tomwer.gui.utils.qt_utils import block_signals
+from tomwer.gui.control.actions import TomoObjDisplayModeToolButton
+from tomwer.gui.control.tomoobjdisplaymode import DisplayMode
 
 _logger = logging.getLogger(__name__)
 
 
-class _SelectorWidget(qt.QWidget):
+class _SelectorWidget(qt.QMainWindow):
     """widget used to select a dataset on a list (a scan or a volume for now)"""
 
     sigSelectionChanged = qt.Signal(list)
@@ -17,18 +19,38 @@ class _SelectorWidget(qt.QWidget):
     """signal emitted when the scan list change"""
 
     def __init__(self, parent=None):
-        qt.QWidget.__init__(self, parent)
-        self.setLayout(qt.QVBoxLayout())
+        qt.QMainWindow.__init__(self, parent)
+        # widget
+        self._mainWidget = qt.QWidget(self)
+        self._mainWidget.setLayout(qt.QVBoxLayout())
         self.dataList = self._buildDataList()
         self.dataList.setSelectionMode(qt.QAbstractItemView.ExtendedSelection)
-        self.layout().addWidget(self.dataList)
-        self.layout().addWidget(self._getAddAndRmButtons())
-        self.layout().addWidget(self._getSendButtons())
+        self._mainWidget.layout().addWidget(self.dataList)
+        self._mainWidget.layout().addWidget(self._getAddAndRmButtons())
+        self._mainWidget.layout().addWidget(self._getSendButtons())
+        self._mainWidget.setAcceptDrops(True)
         self.setAcceptDrops(True)
+        self.setCentralWidget(self._mainWidget)
+
+        # toolbar
+        toolbar = qt.QToolBar()
+        toolbar.setMovable(False)
+        toolbar.setFloatable(False)
+        self.addToolBar(qt.Qt.TopToolBarArea, toolbar)
+
+        tomoObjdisplayAction = TomoObjDisplayModeToolButton(self)
+        toolbar.addWidget(tomoObjdisplayAction)
+
+        # set up
+        self.setDisplayMode(DisplayMode.SHORT)
 
         # connect signal / slot
         # for drag / drop we need to have an indirect call to the sigUpdated
         self.dataList.listChanged.connect(self._updatedFromDragDrop)
+        tomoObjdisplayAction.sigDisplayModeChanged.connect(self.setDisplayMode)
+
+    def setDisplayMode(self, *args, **kwargs):
+        self.dataList.setDisplayMode(*args, **kwargs)
 
     def _updatedFromDragDrop(self, *args, **kwargs):
         self.sigUpdated.emit()
@@ -99,7 +121,9 @@ class _SelectorWidget(qt.QWidget):
     def _selectActiveData(self):
         sItem = self.dataList.selectedItems()
         if sItem and len(sItem) >= 1:
-            selection = [_item.text() for _item in sItem]
+            selection = [
+                _item.data(qt.Qt.UserRole).get_identifier().to_str() for _item in sItem
+            ]
             self.sigSelectionChanged.emit(list(selection))
         else:
             _logger.warning("No active scan detected")
@@ -112,7 +136,10 @@ class _SelectorWidget(qt.QWidget):
     def _callbackRemoveSelectedDatasets(self):
         """ """
         selected_items = self.dataList.selectedItems()
-        tomwer_objs_to_remove = [item.data(qt.Qt.UserRole) for item in selected_items]
+        tomwer_objs_to_remove = [
+            item.data(qt.Qt.UserRole).get_identifier().to_str()
+            for item in selected_items
+        ]
         for tomwer_obj in tomwer_objs_to_remove:
             self.remove(tomwer_obj)
         self.sigUpdated.emit()
@@ -129,7 +156,7 @@ class _SelectorWidget(qt.QWidget):
 
     def removeSelectedDatasets(self):
         sItem = self.dataList.selectedItems()
-        selection = [_item.text() for _item in sItem]
+        selection = [_item.text().get_identifier().to_str() for _item in sItem]
 
         with block_signals(self):
             # make sure sigUpdated is called only once.