tomwer 1.2.9__py3-none-any.whl → 1.3.0a0__py3-none-any.whl

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__)
 
@@ -251,7 +253,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 +334,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 +358,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 +371,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 +524,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 +620,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 +724,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 +746,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 +857,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 +931,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 +958,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/{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

@@ -11,7 +11,7 @@ from silx.io.url import DataUrl
 from silx.gui.dialog.DataFileDialog import DataFileDialog
 
 from tomoscan.esrf.scan.utils import cwd_context
-from tomoscan.framereducerbase import REDUCER_TARGET
+from tomoscan.framereducer.target import REDUCER_TARGET
 from tomoscan.io import HDF5File
 
 from tomwer.io.utils import get_default_directory

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.

tomwer/gui/control/serie/seriecreator.py

@@ -107,10 +107,10 @@ class SerieWidget(qt.QTabWidget):
 
         # conenct signal / slot
         self._historyWidget.sigEditSerie.connect(self._serieEditionRequested)
-        self._historyWidget.sigSerieSend.connect(self._repeatSerieSend)
+        self._historyWidget.sigSerieSend.connect(self.sigSerieSend)
         self._historyWidget.sigHistoryUpdated.connect(self._repeatHistoryUpdated)
         self._serieDefinitionWidget.sigSerieChanged.connect(self._repeatSerieChanged)
-        self._serieDefinitionWidget.sigSerieSend.connect(self._repeatSerieSend)
+        self._serieDefinitionWidget.sigSerieSend.connect(self.sigSerieSend)
         self._serieDefinitionWidget.sigSerieSend.connect(self._historyWidget.addSerie)
 
     def getHistoryWidget(self):
@@ -143,9 +143,6 @@ class SerieWidget(qt.QTabWidget):
     def _repeatSerieChanged(self, *args, **kwargs):
         self.sigCurrentSerieChanged.emit()
 
-    def _repeatSerieSend(self, serie: Serie):
-        self.sigSerieSend.emit(serie)
-
     def _repeatHistoryUpdated(self, *args, **kwargs):
         self.sigHistoryChanged.emit()
 
@@ -186,9 +183,7 @@ class SerieDefinition(qt.QWidget):
 
         # connect signal / slot
         self._modeCB.currentIndexChanged.connect(self._updateVisibility)
-        self._manualDefWidget._newSerieWidget.sigUpdated.connect(
-            self._repeatSerieChanged
-        )
+        self._manualDefWidget._newSerieWidget.sigUpdated.connect(self.sigSerieChanged)
 
         # set up
         self._updateVisibility()
@@ -217,12 +212,6 @@ class SerieDefinition(qt.QWidget):
     def getAutoDefinitionWidget(self):
         return self._automaticDefWidget
 
-    def _repeatSerieChanged(self, *args, **kwargs):
-        self.sigSerieChanged.emit()
-
-    def _repeatSerieSend(self, serie: Serie):
-        self.sigSerieSend.emit(serie)
-
     def createManualSerie(self):
         self._manualDefWidget.createSerie()
 
@@ -651,7 +640,7 @@ class NewSerieWidget(qt.QWidget):
 
         # Signal / slot connection
         self._serieTree.itemChanged.connect(self._handleItemUpdate)
-        self._serieTree.sigUpdated.connect(self._repeatUpdateSignal)
+        self._serieTree.sigUpdated.connect(self.sigUpdated)
         self._nameQLE.textChanged.connect(self._nameChangedOnQLE)
 
     def setSerie(self, serie: Serie) -> None:
@@ -674,9 +663,6 @@ class NewSerieWidget(qt.QWidget):
             self.blockSignals(old)
         self.sigUpdated.emit()
 
-    def _repeatUpdateSignal(self):
-        self.sigUpdated.emit()
-
     def addTomoObjToCurrentSerie(self, tomo_obj: TomwerObject):
         assert isinstance(
             tomo_obj, TomwerObject
@@ -726,7 +712,7 @@ class SerieManualDefinitionDialog(qt.QDialog):
 
         # connect signal / slot
         self._newSerieWidget.sigNameChanged.connect(self._nameChanged)
-        self._newSerieWidget.sigUpdated.connect(self._repeatUpdateSignal)
+        self._newSerieWidget.sigUpdated.connect(self.sigUpdated)
         self._addScanButton.clicked.connect(self.addScanFromFileDialog)
         self._removeSelectedButton.clicked.connect(self.removeSelectedTomoObjs)
         self._clearButton.clicked.connect(self.clearSerie)
@@ -742,9 +728,6 @@ class SerieManualDefinitionDialog(qt.QDialog):
             serieTree.setSerieName(name=new_name)
         self.sigUpdated.emit()
 
-    def _repeatUpdateSignal(self):
-        self.sigUpdated.emit()
-
     def setSerieName(self, name: str):
         self._newSerieWidget.setSerieName(name=name)
 

tomwer/gui/control/test/test_email.py

@@ -1,5 +1,5 @@
 from tomwer.tests.conftest import qtapp  # noqa F401
-from tomwer.gui.control.email import Emailwidget
+from tomwer.gui.control.emailnotifier import Emailwidget
 
 
 def test_Emailwidget(qtapp):  # noqa F811

tomwer/gui/control/test/test_scanvalidator.py

@@ -37,7 +37,8 @@ import time
 import pytest
 from silx.gui.utils.testutils import TestCaseQt
 
-from tomwer.core import settings, utils
+from tomwer.core import settings
+from tomwer.core.utils.lbsram import mock_low_memory, is_low_on_memory
 from tomwer.core.process.control.scanvalidator import ScanValidatorP
 from tomwer.core.scan.edfscan import EDFTomoScan
 from tomwer.core.utils.scanutils import MockEDF
@@ -57,7 +58,7 @@ class TestScanValidator(TestCaseQt):
     NB_SCANS = 2
 
     def tearDown(self):
-        utils.mockLowMemory(False)
+        mock_low_memory(False)
 
     @classmethod
     def setUpClass(cls):
@@ -81,7 +82,7 @@ class TestScanValidator(TestCaseQt):
                 shutil.rmtree(f)
 
     @pytest.mark.skipif(
-        (settings.isOnLbsram() and utils.isLowOnMemory(settings.get_lbsram_path())),
+        (settings.isOnLbsram() and is_low_on_memory(settings.get_lbsram_path())),
         reason="Lbsram already overloaded",
     )
     def testMemoryReleaseLoop(self):
@@ -102,11 +103,11 @@ class TestScanValidator(TestCaseQt):
                 time.sleep(self.LOOP_MEM_RELEASER_DURATION * 2)
 
         add_all_scans()
-        utils.mockLowMemory(True)
+        mock_low_memory(True)
         my_wait()
         self.assertEqual(len(self.scanValidator._scans), 0)
 
-        utils.mockLowMemory(False)
+        mock_low_memory(False)
         add_all_scans()
         my_wait()
         self.assertEqual(len(self.scanValidator._scans), self.NB_SCANS)

tomwer/gui/control/test/test_single_tomo_obj.py

@@ -5,7 +5,7 @@ import numpy
 from silx.gui import qt
 from silx.gui.utils.testutils import TestCaseQt
 
-from tomwer.core.utils.scanutils import MockHDF5
+from tomwer.core.utils.scanutils import MockNXtomo
 from tomwer.core.volume.hdf5volume import HDF5Volume
 from tomwer.gui.control.singletomoobj import SingleTomoObj
 
@@ -29,7 +29,7 @@ class TestSingletomoObj(TestCaseQt):
         self.volume.save()
 
         self._scan_file_path = os.path.join(self._tempdir, "scan.nx")
-        self.scan_hdf5 = MockHDF5(
+        self.scan_hdf5 = MockNXtomo(
             scan_path=self._scan_file_path,
             n_proj=10,
             n_ini_proj=10,

tomwer/gui/control/tomoobjdisplaymode.py

@@ -0,0 +1,8 @@
+from silx.utils.enum import Enum as _Enum
+
+
+class DisplayMode(_Enum):
+    """possible display mode for the tomo object"""
+
+    URL = "url"
+    SHORT = "short"

tomwer/gui/debugtools/datasetgenerator.py

@@ -34,7 +34,7 @@ from silx.gui import qt
 
 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
 
 
 class DatasetGeneratorDialog(qt.QDialog):
@@ -116,13 +116,13 @@ class DatasetGeneratorConfig(qt.QWidget):
         self._typeCB = qt.QComboBox(self)
         for _typeClass in (
             EDFTomoScan,
-            HDF5TomoScan,
+            NXtomoScan,
             BlissScan,
         ):
             self._typeCB.addItem(_typeClass.__name__)
         self.layout().addWidget(qt.QLabel("type", self), 0, 0, 1, 1)
         self.layout().addWidget(self._typeCB, 0, 1, 1, 2)
-        txt_index = self._typeCB.findText(HDF5TomoScan.__name__)
+        txt_index = self._typeCB.findText(NXtomoScan.__name__)
         self._typeCB.setCurrentIndex(txt_index)
 
         # generation timeout