tomwer 0.7.1__tar.gz → 0.7.2__tar.gz

home/payno/.local/share/virtualenvs/tomwer_venv/bin/tomwer

@@ -1,10 +1,10 @@
 #!/home/payno/.local/share/virtualenvs/tomwer_venv/bin/python
-# EASY-INSTALL-ENTRY-SCRIPT: 'tomwer==0.7.1','console_scripts','tomwer'
+# EASY-INSTALL-ENTRY-SCRIPT: 'tomwer==0.7.2','console_scripts','tomwer'
 import re
 import sys
 
 # for compatibility with easy_install; see #2198
-__requires__ = 'tomwer==0.7.1'
+__requires__ = 'tomwer==0.7.2'
 
 try:
     from importlib.metadata import distribution
@@ -30,4 +30,4 @@ globals().setdefault('load_entry_point', importlib_load_entry_point)
 
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-    sys.exit(load_entry_point('tomwer==0.7.1', 'console_scripts', 'tomwer')())
+    sys.exit(load_entry_point('tomwer==0.7.2', 'console_scripts', 'tomwer')())

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/edit/DarkFlatPatchOW.py

@@ -29,12 +29,14 @@ __license__ = "MIT"
 __date__ = "02/11/2020"
 
 
+from silx.io.url import DataUrl
 from Orange.widgets.widget import Input, Output
 from Orange.widgets import widget, gui
 from tomwer.gui.edit.dkrfpatch import DarkRefPatchWidget
 from tomwer.core.scan.hdf5scan import HDF5TomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.synctools.stacks.edit.darkflatpatch import DarkFlatPatchProcessStack
+from Orange.widgets.settings import Setting
 from ...orange.managedprocess import SuperviseOW
 from ..utils import WidgetLongProcessing
 from tomwer.utils import docstring
@@ -71,6 +73,8 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
     resizing_enabled = True
     compress_signal = False
 
+    _urlsSetting = Setting(dict())
+
     class Inputs:
         data_in = Input(name="data", type=TomwerScanBase)
 
@@ -88,9 +92,12 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
         self.widget = DarkRefPatchWidget(parent=self)
         layout.addWidget(self.widget)
 
+        self.setConfiguration(self._urlsSetting)
+
         # connect signal / slot
         self._processingStack.sigComputationStarted.connect(self._startProcessing)
         self._processingStack.sigComputationEnded.connect(self._endProcessing)
+        self.widget.sigConfigurationChanged.connect(self._updateSettings)
 
     @Inputs.data_in
     def process(self, scan):
@@ -113,7 +120,42 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
             "flats_end": self.widget.getEndFlatUrl(),
         }
 
+    def setConfiguration(self, config):
+        url_keys = ("darks_start", "flats_start", "darks_end", "flats_end")
+        url_index_keys = (
+            "darks_start_index",
+            "flats_start_index",
+            "darks_end_index",
+            "flats_end_index",
+        )
+        setters = (
+            self.widget.setStartDarkUrl,
+            self.widget.setStartFlatUrl,
+            self.widget.setEndDarkUrl,
+            self.widget.setEndFlatUrl,
+        )
+        for url_key, url_idx_key, setter in zip(url_keys, url_index_keys, setters):
+            if url_key in config:
+                index = config.get(url_idx_key, 0)
+                url = config[url_key]
+                if url not in (None, ""):
+                    try:
+                        setter(url=url, serie_index=index)
+                    except Exception as e:
+                        _logger.error(e)
+
     def _endProcessing(self, scan):
         WidgetLongProcessing._endProcessing(self, scan)
         if scan is not None:
             self.Outputs.data_out.send(scan)
+
+    def _updateSettings(self):
+        self._urlsSetting = self.getConfiguration()
+        self._urlsSetting.update(
+            {
+                "darks_start_index": self.widget.getStartDarkIndex(),
+                "flats_start_index": self.widget.getStartFlatIndex(),
+                "darks_end_index": self.widget.getEndDarkIndex(),
+                "flats_end_index": self.widget.getEndFlatIndex(),
+            }
+        )

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/tomwer/gui/edit/dkrfpatch.py

@@ -36,6 +36,7 @@ from silx.io.url import DataUrl
 from tomoscan.io import HDF5File
 from tomwer.core.scan.hdf5scan import HDF5TomoScan
 from silx.gui.dialog.DataFileDialog import DataFileDialog
+from tomwer.io.utils import get_default_directory
 
 from typing import Union
 import logging
@@ -44,6 +45,10 @@ _logger = logging.getLogger(__name__)
 
 
 class _DarkOrFlatUrl(qt.QWidget):
+
+    editingFinished = qt.Signal()
+    """Signal emit when the url changes"""
+
     def __init__(self, parent, type_: ImageKey, when: str):
         assert when in ("start", "end")
         qt.QWidget.__init__(self, parent)
@@ -60,6 +65,11 @@ class _DarkOrFlatUrl(qt.QWidget):
 
         # connect signal / slot
         self._qle.editingFinished.connect(self._tryUpdateOptions)
+        self._qle.editingFinished.connect(self._editingFinished)
+        self._optionsCB.currentIndexChanged.connect(self._editingFinished)
+
+    def _editingFinished(self):
+        self.editingFinished.emit()
 
     def setUrl(self, url):
         """
@@ -86,9 +96,11 @@ class _DarkOrFlatUrl(qt.QWidget):
             msg.setText(text)
             msg.exec_()
             return
-
+        old = self.blockSignals(True)
         self._qle.setText(url.path())
         self._updateOptions(url)
+        self.blockSignals(old)
+        self._editingFinished()
 
     def setSerie(self, serie):
         type_name = self._type.name.lower().replace("_", " ")
@@ -97,6 +109,9 @@ class _DarkOrFlatUrl(qt.QWidget):
         if idx >= 0:
             self._optionsCB.setCurrentIndex(idx)
 
+    def getSerieIndex(self):
+        return self._optionsCB.currentIndex()
+
     def _redirectDataPath(self, url, logger=None):
         try:
             with HDF5File(url.file_path(), mode="r") as h5s:
@@ -225,10 +240,13 @@ class _DarkOrFlatUrl(qt.QWidget):
                     serie_index=serie_index,
                 )
             data_path = url_no_slices.data_path()
+            url_slices = slices
+            if url_slices is not None:
+                url_slices = list(range(slices.start, slices.stop))
             url = DataUrl(
                 file_path=url_no_slices.file_path(),
                 data_path=data_path,
-                data_slice=list(range(slices.start, slices.stop)),
+                data_slice=url_slices,
                 scheme="silx",
             )
         except Exception as e:
@@ -243,6 +261,9 @@ class DarkRefPatchWidget(qt.QWidget):
     Widget to add dark and flat
     """
 
+    sigConfigurationChanged = qt.Signal()
+    """Signal emit when the configuration changed (url update)"""
+
     def __init__(self, parent):
         qt.QWidget.__init__(self, parent)
         self.setLayout(qt.QGridLayout())
@@ -305,6 +326,19 @@ class DarkRefPatchWidget(qt.QWidget):
         self._edCB.toggled.connect(self._toggleED)
         self._efCB.toggled.connect(self._toggleEF)
 
+        # connect QLE modifications
+        self._sdQLE.editingFinished.connect(self._configurationChanged)
+        self._sdCB.toggled.connect(self._configurationChanged)
+        self._sfQLE.editingFinished.connect(self._configurationChanged)
+        self._sfCB.toggled.connect(self._configurationChanged)
+        self._efQLE.editingFinished.connect(self._configurationChanged)
+        self._efCB.toggled.connect(self._configurationChanged)
+        self._edQLE.editingFinished.connect(self._configurationChanged)
+        self._edCB.toggled.connect(self._configurationChanged)
+
+    def _configurationChanged(self):
+        self.sigConfigurationChanged.emit()
+
     def _selectSDDataset(self):
         self._selectDataset("start dark", self._sdQLE)
 
@@ -337,15 +371,20 @@ class DarkRefPatchWidget(qt.QWidget):
         # we can select a dataset or an entry. If this is an entry then we
         # will copy the target dark / flat...
         # ou ajouter un from: to
+        assert isinstance(outputQLE, _DarkOrFlatUrl)
         dialog = DataFileDialog()
         dialog.setWindowTitle(what)
+        dialog.setDirectory(get_default_directory())
+
         if dialog.exec_() and dialog.selectedDataUrl() is not None:
             old = outputQLE.blockSignals(True)
+            url = dialog.selectedDataUrl()
             try:
-                outputQLE.setUrl(dialog.selectedDataUrl())
+                outputQLE.setUrl(url)
             except Exception as e:
                 _logger.error(e)
             outputQLE.blockSignals(old)
+            outputQLE.editingFinished.emit()
 
     def getStartDarkUrl(self) -> Union[None, DataUrl]:
         """
@@ -358,6 +397,9 @@ class DarkRefPatchWidget(qt.QWidget):
         else:
             return None
 
+    def getStartDarkIndex(self):
+        return self._sdQLE.getSerieIndex()
+
     def setStartDarkUrl(self, url, serie_index=None) -> None:
         """
 
@@ -380,6 +422,9 @@ class DarkRefPatchWidget(qt.QWidget):
         else:
             return None
 
+    def getStartFlatIndex(self):
+        return self._sfQLE.getSerieIndex()
+
     def setStartFlatUrl(self, url, serie_index=None) -> None:
         """
 
@@ -402,6 +447,9 @@ class DarkRefPatchWidget(qt.QWidget):
         else:
             return None
 
+    def getEndDarkIndex(self):
+        return self._edQLE.getSerieIndex()
+
     def setEndDarkUrl(self, url, serie_index=None) -> None:
         """
 
@@ -424,6 +472,9 @@ class DarkRefPatchWidget(qt.QWidget):
         else:
             return None
 
+    def getEndFlatIndex(self):
+        return self._efQLE.getSerieIndex()
+
     def setEndFlatUrl(self, url, serie_index=None) -> None:
         """
 

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/tomwer/synctools/stacks/edit/darkflatpatch.py

@@ -72,7 +72,7 @@ class DarkFlatPatchProcessStack(FIFO, qt.QObject):
             self._computationThread.init(scan=scan, configuration=configuration)
             # need to manage connect before starting it because
             ProcessManager().notify_dataset_state(
-                dataset=self._scan,
+                dataset=self._scan_currently_computed,
                 process=self,
                 state=DatasetState.ON_GOING,
                 details=None,

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 0
 MINOR = 7
-MICRO = 1
+MICRO = 2
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/{tomwer-0.7.1-py3.7.egg-info → tomwer-0.7.2-py3.7.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 0.7.1
+Version: 0.7.2
 Summary: Library for tomography workflow
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit