tomwer 0.5.2b3__tar.gz → 0.5.3__tar.gz

users/payno/.local/share/virtualenvs/tomwer_venc/bin/tomwer

@@ -1,6 +1,6 @@
 #!/users/payno/.local/share/virtualenvs/tomwer_venc/bin/python
-# EASY-INSTALL-ENTRY-SCRIPT: 'tomwer==0.5.2b3','console_scripts','tomwer'
-__requires__ = 'tomwer==0.5.2b3'
+# EASY-INSTALL-ENTRY-SCRIPT: 'tomwer==0.5.3','console_scripts','tomwer'
+__requires__ = 'tomwer==0.5.3'
 import re
 import sys
 from pkg_resources import load_entry_point
@@ -8,5 +8,5 @@ from pkg_resources import 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.5.2b3', 'console_scripts', 'tomwer')()
+        load_entry_point('tomwer==0.5.3', 'console_scripts', 'tomwer')()
     )

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/DataListOW.py

@@ -74,7 +74,7 @@ class DataListOW(widget.OWWidget, OWClient):
         :param parent: the parent widget
         """
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, logger)
+        OWClient.__init__(self)
         self.widget = GenericDataListDialog(parent=self)
         self.widget.setScanIDs(self._scanIDs)
         layout = gui.vBox(self.mainArea, self.name).layout()

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/DataListenerOW.py

@@ -82,7 +82,7 @@ class DataListenerOW(widget.OWWidget, OWClient, WidgetLongProcessing,
 
     def __init__(self, parent=None):
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (logger, ))
+        OWClient.__init__(self)
         WidgetLongProcessing.__init__(self)
         DataListener.__init__(self)
         self._widget = DataListenerWidget(parent=self)
@@ -125,6 +125,27 @@ class DataListenerOW(widget.OWWidget, OWClient, WidgetLongProcessing,
 
     @docstring(DataListener.activate)
     def activate(self, activate=True):
+        if activate and not self.is_port_available():
+            old = self._widget.blockSignals(True)
+            self._widget.activate(activate=False)
+            self._widget.blockSignals(old)
+            err = (
+                "port ({port}) of {host} already in use. Maybe an "
+                'other instance of "datalistener" is running in this '
+                "session or another tomwer session. As this widget is "
+                "connecting with bliss we enforce it to be unique. "
+                "If necessary you can hard kill server process ()"
+                "".format(port=self.port, host=self.host)
+            )
+            logger.warning(err)
+            mess = qt.QMessageBox(self)
+            mess.setIcon(qt.QMessageBox.Warning)
+            mess.setText(err)
+            mess.setModal(False)
+            mess.setWindowTitle("Unable to launch two listener in parallel")
+            mess.show()
+            return
+
         old = self._widget.blockSignals(True)
         self.set_configuration(self._widget.getBlissServerConfiguration())
         self._widget.activate(activate=activate)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/DataSelectorOW.py

@@ -61,7 +61,7 @@ class DataSelectorOW(widget.OWWidget, OWClient):
         """
         """
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (logger))
+        OWClient.__init__(self)
 
         self.widget = ScanSelectorWidget(parent=self)
         self.widget.sigSelectionChanged.connect(self.changeSelection)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/DataTransfertOW.py

@@ -85,7 +85,7 @@ class DataTransfertOW(widget.OWWidget, FolderTransfert, OWClient):
     def __init__(self, parent=None):
         FolderTransfert.__init__(self)
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (logger, FTLogger))
+        OWClient.__init__(self)
 
         # define GUI
         self._widget = DataTransfertSelector(parent=self,

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/DataWatcherOW.py

@@ -84,7 +84,7 @@ class DataWatcherOW(widget.OWWidget, OWClient, WidgetLongProcessing):
         :param parent: the parent widget
         """
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (logger, TDLogger))
+        OWClient.__init__(self)
         WidgetLongProcessing.__init__(self)
         self._widget = DataWatcherWidget(parent=self)
         self._widget.setFolderObserved(self.folderObserved)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/FilterOW.py

@@ -65,7 +65,7 @@ class NameFilterOW(widget.OWWidget, OWClient):
         """
         """
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (logger))
+        OWClient.__init__(self)
 
         self.widget = FileNameFilterWidget(parent=self)
         self.widget.setContentsMargins(0, 0, 0, 0)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/NXTomomillOW.py

@@ -91,7 +91,7 @@ class NXTomomillOW(widget.OWWidget, OWClient):
 
     def __init__(self, parent=None):
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, logger)
+        OWClient.__init__(self)
         self.widget = HDF5DataListDialog(parent=self)
         self.widget.setScanIDs(self._scans)
         layout = gui.vBox(self.mainArea, self.name).layout()
@@ -118,6 +118,8 @@ class NXTomomillOW(widget.OWWidget, OWClient):
     def _sendList(self):
         """Send a signal for each list to the next widget"""
         for bliss_url in self.widget.datalist.items:
+            logger.processStarted(
+                'Start translate {} to NXTomo'.format(str(bliss_url)))
 
             entry, file_path = bliss_url.split('@')
             bliss_scan = BlissScan(master_file=file_path, entry=entry,
@@ -137,20 +139,20 @@ class NXTomomillOW(widget.OWWidget, OWClient):
                                                      file_extension='.nx',
                                                      input_callback=_nxtomomill_input_callback)
             except Exception as e:
-                logger.error(
-                    'Fail to convert from bliss file: %s to NXTomo.'
+                logger.processFailed(
+                    'Fail to convert from bliss file: %s to NXTomo. '
                     'Conversion error is: %s' % (bliss_url, e))
             else:
                 if len(conv) != 1:
-                    logger.error(
-                        'Something went wrong during file conversion. Unable to process the file.')
+                    logger.processFailed(
+                        'Something went wrong during file conversion. '
+                        'Unable to process the file.')
                 else:
                     conv_file, conv_entry = conv[0]
                     scan_converted = HDF5TomoScan(scan=conv_file, entry=conv_entry)
-                    mess = "sending one scan %s" % bliss_url
-                    logger.debug(mess,
-                                 extra={logconfig.DOC_TITLE: self.widget._scheme_title,
-                                        logconfig.SCAN_ID: bliss_url})
+                    mess = '{} has been translated to {}' \
+                           ''.format(str(bliss_scan), str(scan_converted))
+                    logger.processSucceed(mess)
                     self.Outputs.data_out.send(scan_converted)
 
     def _userAgreeForOverwrite(self, file_path):

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/OldDataValidatorOW.py

@@ -108,7 +108,7 @@ class OldDataValidatorOW(widget.OWWidget, ScanValidator):
         """
         widget.OWWidget.__init__(self, parent)
         ScanValidator.__init__(self, memoryReleaser=QWaiterThread(memReleaserWaitLoop))
-        OWClient.__init__(self, (logger, SVLogger))
+        OWClient.__init__(self)
 
         self._buildGUI(ftserie)
 

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/control/TimerOW.py

@@ -33,11 +33,11 @@ from Orange.widgets.settings import Setting
 from Orange.widgets.widget import Input, Output
 from tomwer.core.process.timer import Timer
 from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.core.log import TomwerLogger
+import logging
 
 import functools
 
-_logger = TomwerLogger(__name__)
+_logger = logging.getLogger(__name__)
 
 
 class _TimerWidget(qt.QWidget):

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/AxisOW.py

@@ -343,3 +343,12 @@ class AxisOW(widget.OWWidget, WidgetLongProcessing):
 
     def patch_calc_method(self, mode, function):
         self._patches.append((mode, function))
+
+    def keyPressEvent(self, event):
+        """The event has to be filtered since we have some children
+         that can be edited using the 'enter' key as defining the cor manually
+        (see #481)). As we are in a dialog this automatically trigger
+        'accepted'. See https://forum.qt.io/topic/5080/preventing-enter-key-from-triggering-ok-in-qbuttonbox-in-particular-qlineedit-qbuttonbox/5
+        """
+        if event.key() != qt.Qt.Key_Enter:
+            super().keyPressEvent(event)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py

@@ -90,7 +90,7 @@ class DarkRefAndCopyOW(widget.OWWidget, OWClient, WidgetLongProcessing):
         :param QReconsParams reconsparams: reconstruction parameters
         """
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (logger, DRLogger))
+        OWClient.__init__(self)
         recons_params = reconsparams or QReconsParams()
         if self._rpSetting != dict():
             try:

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/FtseriesOW.py

@@ -32,12 +32,15 @@ from Orange.widgets import widget, gui
 from Orange.widgets.settings import Setting
 from Orange.widgets.widget import Input, Output
 from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
-from tomwer.core.process.reconstruction.ftseries.ftseries import _Ftseries, logger
+from tomwer.core.process.reconstruction.ftseries.ftseries import _Ftseries
 from tomwer.gui.reconstruction.ftserie import FtserieWidget
 from tomwer.web.client import OWClient
 from tomwer.core.scan.scanbase import TomwerScanBase
 from silx.gui import qt
 import copy
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class FtseriesOW(widget.OWWidget, OWClient, WidgetLongProcessing):
@@ -90,7 +93,7 @@ class FtseriesOW(widget.OWWidget, OWClient, WidgetLongProcessing):
                               If None, some will be created.
         :type: :class:`QReconsParams`
         """
-        OWClient.__init__(self, (logger, ))
+        OWClient.__init__(self)
         widget.OWWidget.__init__(self, parent)
 
         # add the ftserie widget
@@ -131,6 +134,8 @@ class FtseriesOW(widget.OWWidget, OWClient, WidgetLongProcessing):
         self._ftserie.reconsStack.sigReconsStarted.connect(self.__processing_start)
         self._ftserie.reconsStack.sigReconsFinished.connect(self.__processing_end)
         self._ftserie.reconsStack.sigReconsFailed.connect(self.__processing_end)
+        self._ftserie.reconsStack.sigReconsFinished.connect(self._log_succeed)
+        self._ftserie.reconsStack.sigReconsFailed.connect(self._log_failed)
         self._ftserie.reconsStack.sigReconsMissParams.connect(self.__processing_end)
 
         self._controlButtons.accepted.connect(self.accept)
@@ -174,11 +179,20 @@ class FtseriesOW(widget.OWWidget, OWClient, WidgetLongProcessing):
         self._signalReconsReady(self._ftserie._scan)
 
     def __processing_start(self, scan):
+        logger.processStarted(
+            "Start pyhst slice reconstruction of {}".format(str(scan))
+        )
         self.processing_state(working=True, info=' ')
 
     def __processing_end(self, scan):
         self.processing_state(working=False, info=' ')
 
+    def _log_succeed(self, scan):
+        logger.processSucceed("Pyhst succeed to reconstruct {}".format(str(scan)))
+
+    def _log_failed(self, scan):
+        logger.processFailed("Pyhst failed to reconstruct {}".format(str(scan)))
+
     def close(self):
         self._ftserie.reconsStack.stop()
         super(FtseriesOW, self).close()

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/NabuOW.py

@@ -112,7 +112,7 @@ class NabuOW(widget.OWWidget, OWClient, WidgetLongProcessing):
                               If None, some will be created.
         :type: :class:`QReconsParams`
         """
-        OWClient.__init__(self, (_logger, ))
+        OWClient.__init__(self)
         WidgetLongProcessing.__init__(self)
         widget.OWWidget.__init__(self, parent)
         self.__exec_for_ci = False

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py

@@ -117,7 +117,7 @@ class NabuVolumeOW(widget.OWWidget, OWClient, WidgetLongProcessing):
                               If None, some will be created.
         :type: :class:`QReconsParams`
         """
-        OWClient.__init__(self, (_logger, ))
+        OWClient.__init__(self)
         WidgetLongProcessing.__init__(self)
         widget.OWWidget.__init__(self, parent)
         self.__exec_for_ci = False

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/TofuOW.py

@@ -92,7 +92,7 @@ class TofuOW(widget.OWWidget, OWClient, WidgetLongProcessing):
 
     def __init__(self, parent=None):
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, (_logger,))
+        OWClient.__init__(self)
         WidgetLongProcessing.__init__(self)
         self._lastScan = None
         self._box = gui.vBox(self.mainArea, self.name)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/reconstruction/test/test_axis.py

@@ -53,7 +53,7 @@ class TestOWAxis(TestCaseQt):
         self._window = AxisOW()
         self.recons_params = self._window.recons_params
         self.scan_path = UtilsTest.getEDFDataset("D2_H2_T2_h_")
-        self._window.getAxis().mode = AxisMode.accurate
+        self._window.getAxis().mode = AxisMode.centered
         self._window.show()
         self.qWaitForWindowExposed(self._window)
 
@@ -65,7 +65,8 @@ class TestOWAxis(TestCaseQt):
         """Test behavior when locking the axis position. Could not be included
         in the tomwer/gui because the lock action is only available for the OW
         """
-        assert self._window.getAxis().mode is AxisMode.accurate
+        assert self._window.getAxis().mode in (AxisMode.centered,
+                                               AxisMode.global_)
         radio_axis = self._window._widget._axisWidget._radioAxis
         main_widget = self._window._widget._axisWidget
         self.assertFalse(main_widget._controlWidget._lockBut.isLocked())
@@ -124,10 +125,10 @@ class TestWindowAxisComputation(TestCaseQt):
         # monkey patch the method used
         radioAxis = self._mainWindow._widget._axisWidget._radioAxis
         self._mainWindow._processingStack._computationThread.patch_calc_method(
-            AxisMode.accurate, TestWindowAxisComputation._long_computation)
-        self.recons_params.mode = AxisMode.accurate
+            AxisMode.centered, TestWindowAxisComputation._long_computation)
+        self.recons_params.mode = AxisMode.centered
         self.qapp.processEvents()
-        self.assertTrue(radioAxis.getMode() == AxisMode.accurate)
+        self.assertTrue(radioAxis.getMode() == AxisMode.centered)
         self._mainWindow.process(self.scan_path)
         self.qapp.processEvents()
         # need the data to be loaded from thread and the cor calculation thread
@@ -192,9 +193,9 @@ class TestAxisStack(TestCaseQt):
         global _computation_res
         _computation_res = 0
 
-        self._mainWindow.patch_calc_method(AxisMode.accurate,
+        self._mainWindow.patch_calc_method(AxisMode.centered,
                                            TestAxisStack._test_computation)
-        self.recons_params.mode = AxisMode.accurate
+        self.recons_params.mode = AxisMode.centered
 
         self._mainWindow.show()
         self.qWaitForWindowExposed(self._mainWindow)

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/test/test_reconstruction.py

@@ -43,11 +43,11 @@ from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.test.utils import skip_gui_test, skip_orange_workflows_test
 import time
 
-from tomwer.core.log import TomwerLogger
+import logging
 import logging
 logging.disable(logging.INFO)
 
-_logger = TomwerLogger(__name__)
+_logger = logging.getLogger(__name__)
 
 
 @unittest.skipIf(skip_orange_workflows_test(), reason='skip orange workflows tests')

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/visualization/DataViewerOW.py

@@ -98,3 +98,8 @@ class DataViewerOW(widget.OWWidget):
         if 'radio_opt' in settings:
             self.viewer.setRadioOption(settings['radio_opt'])
         self.viewer.blockSignals(old_state)
+
+    def close(self):
+        self.viewer.close()
+        self.viewer = None
+        super().close()

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/orangecontrib/tomwer/widgets/visualization/SampleMovedOW.py

@@ -68,7 +68,7 @@ class SampleMovedOW(widget.OWWidget, OWClient):
 
     def __init__(self, parent=None):
         widget.OWWidget.__init__(self, parent)
-        OWClient.__init__(self, logger)
+        OWClient.__init__(self)
 
         layout = gui.vBox(self.mainArea, self.name).layout()
 

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/tomwer/__init__.py

@@ -30,11 +30,8 @@ __license__ = "MIT"
 __date__ = "23/05/2016"
 
 import os as _os
-import logging as _logging
-
-
-# Attach a do nothing logging handler for silx
-_logging.getLogger(__name__).addHandler(_logging.NullHandler())
+from tomwer.core.log import logger
+from tomwer.core.log import processlog
 
 
 project = _os.path.basename(_os.path.dirname(_os.path.abspath(__file__)))

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/tomwer/__main__.py

@@ -35,9 +35,6 @@ __license__ = "MIT"
 __date__ = "04/01/2018"
 
 
-import logging
-logging.basicConfig()
-
 import sys
 from tomwer.utils import Launcher
 import tomwer.version