Commit f7e1979a authored by payno's avatar payno
Browse files

fix 6f127e5e, process, progress.. should still...

fix 6f127e5e, process, progress.. should still be part of xas.process
parent 50a420c3
......@@ -30,7 +30,7 @@ __date__ = "07/08/2019"
from silx.gui import qt
from xas.core.process.pymca.progress import Progress
from xas.core.process.progress import Progress
class QProgress(Progress, qt.QObject):
......
......@@ -35,7 +35,7 @@ from Orange.widgets.settings import Setting
from Orange.widgets.widget import OWWidget
from silx.gui import qt
import xas.core.process.pymca.roi
import xas.core.process.roi
from xas.core.types import XASObject
from xas.gui.roiselector import ROISelector
......@@ -60,7 +60,7 @@ class RoiSelectionOW(OWWidget):
inputs = [InputSignal(name="spectra", type=XASObject, handler='process')]
outputs = [OutputSignal(name="spectra", type=XASObject)]
process_function = xas.core.process.pymca.roi.ROIProcess
process_function = xas.core.process.roi.ROIProcess
want_main_area = True
resizing_enabled = True
......@@ -104,8 +104,8 @@ class RoiSelectionOW(OWWidget):
return
try:
roi_process = xas.core.process.pymca.roi.ROIProcess()
xas_roi = xas.core.process.pymca.roi._ROI.from_silx_def(
roi_process = xas.core.process.roi.ROIProcess()
xas_roi = xas.core.process.roi._ROI.from_silx_def(
self.getROI()).to_dict()
roi_prop = {'roi': xas_roi}
roi_process.setProperties(roi_prop)
......
......@@ -106,7 +106,7 @@ class XASInputOW(OWWidget):
qt.QMessageBox.warning(self, '', str(e))
else:
if _DEBUG is True and xas_obj.n_spectrum > 100:
from xas.core.process.pymca.roi import ROIProcess, _ROI
from xas.core.process.roi import ROIProcess, _ROI
roiProcess = ROIProcess()
roiProcess.setRoi(origin=(0, 0), size=(10, 10))
xas_obj = roiProcess.process(xas_obj)
......
......@@ -27,14 +27,16 @@ __authors__ = ["H. Payno"]
__license__ = "MIT"
__date__ = "06/11/2019"
from xas.core.types import XASObject, Spectrum
from .process import Process
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
from PyMca5.PyMcaPhysics.xas.XASClass import e2k, k2e
import multiprocessing
import functools
import numpy
import logging
import multiprocessing
import numpy
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
from PyMca5.PyMcaPhysics.xas.XASClass import e2k, k2e
from xas.core.process.process import Process
from xas.core.types import XASObject, Spectrum
_logger = logging.getLogger(__name__)
......
......@@ -27,13 +27,15 @@ __authors__ = ["H. Payno"]
__license__ = "MIT"
__date__ = "06/11/2019"
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
from xas.core.types import XASObject, Spectrum
from .process import Process
import functools
import logging
import multiprocessing
import numpy
import logging
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
from xas.core.process.process import Process
from xas.core.types import XASObject, Spectrum
_logger = logging.getLogger(__name__)
......
......@@ -33,9 +33,9 @@ import multiprocessing
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass, e2k
from xas.core.process.process import Process
from xas.core.process.pymca.exafs import process_spectr_exafs
from xas.core.types import XASObject, Spectrum
from .process import Process
_logger = logging.getLogger(__name__)
......
......@@ -28,12 +28,15 @@ __license__ = "MIT"
__date__ = "06/11/2019"
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
from xas.core.types import Spectrum, XASObject
from .process import Process, Progress
import multiprocessing
import functools
import logging
import multiprocessing
from PyMca5.PyMcaPhysics.xas.XASClass import XASClass
from xas.core.process.process import Process, Progress
from xas.core.types import Spectrum, XASObject
_logger = logging.getLogger(__name__)
......
......@@ -37,7 +37,7 @@ import numpy
from silx.io.url import DataUrl
from xas.core.io import read as read_xas
from xas.core.process.pymca.roi import xas_roi
from xas.core.process.roi import xas_roi
from xas.core.utils import spectra as spectra_utils
......
......@@ -139,7 +139,7 @@ if __name__ == '__main__':
import numpy
from xas.core.utils import spectra as spectra_utils
from xas.core.process.pymca.roi import ROIProcess, _ROI
from xas.core.process.roi import ROIProcess, _ROI
from silx.gui.colors import Colormap
spectra = spectra_utils.create_dataset(shape=(256, 32, 64))
energy = numpy.linspace(start=3.25, stop=3.69, num=256)
......
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