Commit d3403620 authored by payno's avatar payno
Browse files

[ewoks] remove inheritence from Registered of the OWWidget

parent 5fe8bac1
Pipeline #51478 passed with stages
in 17 minutes and 28 seconds
...@@ -52,7 +52,6 @@ from est.gui.larch.autobk import _AutobkParameters ...@@ -52,7 +52,6 @@ from est.gui.larch.autobk import _AutobkParameters
from orangecontrib.est.progress import QProgress from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -141,7 +140,7 @@ class AutobkWindow(qt.QMainWindow): ...@@ -141,7 +140,7 @@ class AutobkWindow(qt.QMainWindow):
) )
class AutobkOW(_ProcessForOrangeMixIn, OWWidget, Registered): class AutobkOW(_ProcessForOrangeMixIn, OWWidget):
""" """
Widget used for signal extraction Widget used for signal extraction
""" """
......
...@@ -47,7 +47,6 @@ from orangecontrib.est.progress import QProgress ...@@ -47,7 +47,6 @@ from orangecontrib.est.progress import QProgress
from est.gui.XasObjectViewer import _plot_norm, _plot_raw, _plot_fpp, _plot_f2 from est.gui.XasObjectViewer import _plot_norm, _plot_raw, _plot_fpp, _plot_f2
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -114,7 +113,7 @@ class MbackWindow(qt.QMainWindow): ...@@ -114,7 +113,7 @@ class MbackWindow(qt.QMainWindow):
return len(self.xasObjViewer._spectrumViews[0]._plotWidget.getAllCurves()) return len(self.xasObjViewer._spectrumViews[0]._plotWidget.getAllCurves())
class MbackOW(_ProcessForOrangeMixIn, OWWidget, Registered): class MbackOW(_ProcessForOrangeMixIn, OWWidget):
""" """
Widget used for signal extraction Widget used for signal extraction
""" """
......
...@@ -47,7 +47,6 @@ from est.gui.larch.mback import _MBackParameters ...@@ -47,7 +47,6 @@ from est.gui.larch.mback import _MBackParameters
from orangecontrib.est.progress import QProgress from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -117,7 +116,6 @@ class Mback_normWindow(qt.QMainWindow): ...@@ -117,7 +116,6 @@ class Mback_normWindow(qt.QMainWindow):
class Mback_normOW( class Mback_normOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -54,7 +54,6 @@ from est.gui.larch.pre_edge import _MPreEdgeParameters ...@@ -54,7 +54,6 @@ from est.gui.larch.pre_edge import _MPreEdgeParameters
from orangecontrib.est.progress import QProgress from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -131,7 +130,6 @@ class _PreEdgeWindow(qt.QMainWindow): ...@@ -131,7 +130,6 @@ class _PreEdgeWindow(qt.QMainWindow):
class PreEdgeOW( class PreEdgeOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -53,7 +53,6 @@ from est.gui.larch.xftf import _MXFTFParameters ...@@ -53,7 +53,6 @@ from est.gui.larch.xftf import _MXFTFParameters
from orangecontrib.est.progress import QProgress from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -153,7 +152,6 @@ class XFTFWindow(qt.QMainWindow): ...@@ -153,7 +152,6 @@ class XFTFWindow(qt.QMainWindow):
class XFTFOW( class XFTFOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -40,7 +40,6 @@ from est.core.types import XASObject ...@@ -40,7 +40,6 @@ from est.core.types import XASObject
from PyMca5.PyMcaGui.physics.xas.XASPostEdgeParameters import XASPostEdgeParameters from PyMca5.PyMcaGui.physics.xas.XASPostEdgeParameters import XASPostEdgeParameters
from silx.gui import qt from silx.gui import qt
from silx.gui.plot import LegendSelector from silx.gui.plot import LegendSelector
from ewokscore.registration import Registered
import est.core.process.pymca.exafs import est.core.process.pymca.exafs
from orangecontrib.est.process import _ProcessForOrangeMixIn, ProcessRunnable from orangecontrib.est.process import _ProcessForOrangeMixIn, ProcessRunnable
from est.gui.XasObjectViewer import XasObjectViewer, ViewType from est.gui.XasObjectViewer import XasObjectViewer, ViewType
...@@ -120,7 +119,6 @@ class ExafsWindow(qt.QMainWindow): ...@@ -120,7 +119,6 @@ class ExafsWindow(qt.QMainWindow):
class ExafsOW( class ExafsOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -48,7 +48,6 @@ from est.core.types import XASObject ...@@ -48,7 +48,6 @@ from est.core.types import XASObject
from est.gui.XasObjectViewer import XasObjectViewer, ViewType from est.gui.XasObjectViewer import XasObjectViewer, ViewType
from est.gui.XasObjectViewer import _normalized_exafs, _ft_window_plot from est.gui.XasObjectViewer import _normalized_exafs, _ft_window_plot
from est.gui.XasObjectViewer import _ft_intensity_plot, _ft_imaginary_plot from est.gui.XasObjectViewer import _ft_intensity_plot, _ft_imaginary_plot
from ewokscore.registration import Registered
from orangecontrib.est.progress import QProgress from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
...@@ -139,7 +138,6 @@ class FTWindow(qt.QMainWindow): ...@@ -139,7 +138,6 @@ class FTWindow(qt.QMainWindow):
class FTOW( class FTOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -36,7 +36,6 @@ from Orange.widgets.widget import OWWidget ...@@ -36,7 +36,6 @@ from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output from Orange.widgets.widget import Input, Output
import Orange.data import Orange.data
from silx.gui import qt from silx.gui import qt
from ewokscore.registration import Registered
import est.core.process.pymca.k_weight import est.core.process.pymca.k_weight
from orangecontrib.est.process import _ProcessForOrangeMixIn, ProcessRunnable from orangecontrib.est.process import _ProcessForOrangeMixIn, ProcessRunnable
from est.core.types import XASObject from est.core.types import XASObject
...@@ -69,7 +68,6 @@ class KWeightWindow(qt.QMainWindow): ...@@ -69,7 +68,6 @@ class KWeightWindow(qt.QMainWindow):
class KWeightOW( class KWeightOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -56,7 +56,6 @@ from est.gui.e0calculator import E0CalculatorDialog ...@@ -56,7 +56,6 @@ from est.gui.e0calculator import E0CalculatorDialog
from est.core.types import XASObject from est.core.types import XASObject
from est.gui.XasObjectViewer import XasObjectViewer, ViewType from est.gui.XasObjectViewer import XasObjectViewer, ViewType
import est.core.process.pymca.normalization import est.core.process.pymca.normalization
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -187,7 +186,6 @@ class NormalizationWindow(qt.QMainWindow): ...@@ -187,7 +186,6 @@ class NormalizationWindow(qt.QMainWindow):
class NormalizationOW( class NormalizationOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -33,10 +33,9 @@ from est.core.types import XASObject ...@@ -33,10 +33,9 @@ from est.core.types import XASObject
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
import Orange.data import Orange.data
from Orange.widgets.widget import OWWidget from Orange.widgets.widget import OWWidget
from ewokscore.registration import Registered
class ConverterOW(OWWidget, Registered): class ConverterOW(OWWidget):
""" """
Offer a conversion from XASObject to Orange.data.Table, commonly used Offer a conversion from XASObject to Orange.data.Table, commonly used
from Orange widget from Orange widget
......
...@@ -40,14 +40,12 @@ import est.core.process.ignoreprocess ...@@ -40,14 +40,12 @@ import est.core.process.ignoreprocess
import est.core.process.setconfig import est.core.process.setconfig
from est.core.types import XASObject from est.core.types import XASObject
from est.gui.e0calculator import E0Calculator, E0ComputationMethod from est.gui.e0calculator import E0Calculator, E0ComputationMethod
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
class E0calculatorOW( class E0calculatorOW(
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used to make compute E0 from the dataset. Widget used to make compute E0 from the dataset.
......
...@@ -39,14 +39,12 @@ from silx.gui import qt ...@@ -39,14 +39,12 @@ from silx.gui import qt
import est.core.process.energyroi import est.core.process.energyroi
from est.core.types import XASObject from est.core.types import XASObject
from est.gui.energyroi import EnergyRoiWidget from est.gui.energyroi import EnergyRoiWidget
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
class EnergyRoiOW( class EnergyRoiOW(
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used to make the selection of a region of Interest to treat in a Widget used to make the selection of a region of Interest to treat in a
......
...@@ -43,7 +43,6 @@ from silx.gui import qt ...@@ -43,7 +43,6 @@ from silx.gui import qt
import est.core.process.noise import est.core.process.noise
from est.core.types import XASObject from est.core.types import XASObject
from est.gui.noise import SavitskyGolayNoise from est.gui.noise import SavitskyGolayNoise
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -51,7 +50,6 @@ _logger = logging.getLogger(__file__) ...@@ -51,7 +50,6 @@ _logger = logging.getLogger(__file__)
class NoiseOW( class NoiseOW(
_ProcessForOrangeMixIn, _ProcessForOrangeMixIn,
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used to make the selection of a region of Interest to treat in a Widget used to make the selection of a region of Interest to treat in a
......
...@@ -36,7 +36,6 @@ from Orange.widgets.widget import Input, Output ...@@ -36,7 +36,6 @@ from Orange.widgets.widget import Input, Output
import Orange.data import Orange.data
from orangecontrib.est.utils import Converter from orangecontrib.est.utils import Converter
from silx.gui import qt from silx.gui import qt
from ewokscore.registration import Registered
import est.core.process.roi import est.core.process.roi
from est.core.types import XASObject from est.core.types import XASObject
from est.gui.roiselector import ROISelector from est.gui.roiselector import ROISelector
...@@ -46,7 +45,6 @@ _logger = logging.getLogger(__file__) ...@@ -46,7 +45,6 @@ _logger = logging.getLogger(__file__)
class RoiSelectionOW( class RoiSelectionOW(
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used to make the selection of a region of Interest to treat in a Widget used to make the selection of a region of Interest to treat in a
......
...@@ -40,7 +40,6 @@ import est.core.process.ignoreprocess ...@@ -40,7 +40,6 @@ import est.core.process.ignoreprocess
import est.core.process.io import est.core.process.io
from est.gui.xas_object_definition import XASObjectWindow from est.gui.xas_object_definition import XASObjectWindow
from est.core.types import XASObject from est.core.types import XASObject
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
...@@ -50,7 +49,6 @@ _DEBUG = False ...@@ -50,7 +49,6 @@ _DEBUG = False
class XASInputOW( class XASInputOW(
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
...@@ -37,14 +37,12 @@ from est.core.types import XASObject ...@@ -37,14 +37,12 @@ from est.core.types import XASObject
import est.core.process.io import est.core.process.io
import logging import logging
import h5py import h5py
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__) _logger = logging.getLogger(__file__)
class XASOutputOW( class XASOutputOW(
OWWidget, OWWidget,
Registered,
): ):
""" """
Widget used for signal extraction Widget used for signal extraction
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment