darfix 4.2.0__py3-none-any.whl → 4.3.0__py3-none-any.whl

orangecontrib/darfix/widgets/zsum.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from ewokscore.missing_data import MISSING_DATA
 
-from darfix.gui.zSumWidget import ZSumWidget
+from darfix.gui.zsum_widget import ZSumWidget
 from darfix.tasks.zsum import ZSum
-from orangecontrib.darfix.widgets.datasetWidgetBase import DatasetWidgetBase
+from orangecontrib.darfix.widgets.dataset_widget_base import DatasetWidgetBase
 
 
 class ZSumWidgetOW(DatasetWidgetBase, ewokstaskclass=ZSum):
@@ -17,7 +17,7 @@ class ZSumWidgetOW(DatasetWidgetBase, ewokstaskclass=ZSum):
     want_main_area = True
     want_control_area = False
 
-    _ewoks_inputs_to_hide_from_orange = ("indices", "selected_axis")
+    _ewoks_inputs_to_hide_from_orange = "selected_axis"
 
     def __init__(self):
         super().__init__()
@@ -41,11 +41,9 @@ class ZSumWidgetOW(DatasetWidgetBase, ewokstaskclass=ZSum):
             self._widget.setZSum(z_sum)
 
     def _onAxisChanged(self, selectedAxis: int):
-        self.set_default_input("indices", self._widget.indices)
         self.set_dynamic_input("selected_axis", selectedAxis)
         self.execute_ewoks_task_without_propagation()
 
     def _onUncheckFiltering(self):
-        self.set_default_input("indices", None)
         self.set_dynamic_input("selected_axis", None)
         self.execute_ewoks_task_without_propagation()

darfix/gui/dataPartitionWidget.py

@@ -1,167 +0,0 @@
-from __future__ import annotations
-
-from typing import Optional
-
-import numpy
-from silx.gui import qt
-from silx.gui.plot import Plot1D
-
-from darfix import dtypes
-
-
-class DataPartitionWidget(qt.QMainWindow):
-    sigComputeHistogram = qt.Signal()
-    "emit when the user ask for computing the histogram"
-    sigPartitionData = qt.Signal()
-    "emit when the user ask for filtering the data"
-    sigAbort = qt.Signal()
-    "emit when user request to abort the processing"
-    sigNbBinsChanged = qt.Signal(int)
-    "emit when the number of bins has changed"
-    sigBottomBinChanged = qt.Signal(int)
-    "emit when the bottom bin has changed"
-    sigTopBinChanged = qt.Signal(int)
-    "emit when the top bin has changed"
-
-    def __init__(self, parent=None):
-        qt.QMainWindow.__init__(self, parent)
-        self._dataset = None
-
-        self._plot = Plot1D()
-
-        binsLabel = qt.QLabel("Number of histogram bins:")
-        filterRangeLabel = qt.QLabel("Filter range:")
-        self._bins = qt.QLineEdit("")
-        self._bins.setToolTip(
-            "Defines the number of equal-width bins in the given range for the histogram"
-        )
-        self._bins.setValidator(qt.QIntValidator())
-        self._bottomBinsNumber = qt.QLineEdit("")
-        self._bottomBinsNumber.setPlaceholderText("First bin")
-        self._bottomBinsNumber.setToolTip(
-            "Minimum bin to use. It is 0 if nothing is entered."
-        )
-        self._topBinsNumber = qt.QLineEdit("")
-        self._topBinsNumber.setPlaceholderText("Last bin")
-        self._topBinsNumber.setToolTip(
-            "Maximum bin to use. It is the number of bins if nothing is entered"
-        )
-        self._bottomBinsNumber.setValidator(qt.QIntValidator())
-        self._topBinsNumber.setValidator(qt.QIntValidator())
-        self._computeHistogramPB = qt.QPushButton("Compute histogram")
-        self._computePartitionPB = qt.QPushButton("Filter")
-        self._abortPB = qt.QPushButton("Abort")
-        widget = qt.QWidget(parent=self)
-        layout = qt.QGridLayout()
-        layout.addWidget(binsLabel, 0, 0, 1, 1)
-        layout.addWidget(self._bins, 0, 1, 1, 1)
-        layout.addWidget(filterRangeLabel, 1, 0, 1, 1)
-        layout.addWidget(self._bottomBinsNumber, 1, 1)
-        layout.addWidget(self._topBinsNumber, 1, 2)
-        layout.addWidget(self._computeHistogramPB, 0, 2, 1, 1)
-        layout.addWidget(self._computePartitionPB, 2, 2, 1, 1)
-        layout.addWidget(self._abortPB, 3, 2, 1, 1)
-        layout.addWidget(self._plot, 3, 0, 1, 3)
-        widget.setLayout(layout)
-        widget.setSizePolicy(qt.QSizePolicy.Minimum, qt.QSizePolicy.Minimum)
-        self.setCentralWidget(widget)
-        self._plot.hide()
-
-        self.setProcessingButtonsEnabled(enable=False)
-
-        # set up
-        self._abortPB.hide()
-
-        # connect signal / slot
-        self._abortPB.pressed.connect(self.sigAbort)
-        self._computeHistogramPB.released.connect(self.sigComputeHistogram)
-        self._computePartitionPB.released.connect(self.sigPartitionData)
-        self._bins.editingFinished.connect(self._nbBinsChanged)
-        self._bottomBinsNumber.editingFinished.connect(self._nbBottomBinChanged)
-        self._topBinsNumber.editingFinished.connect(self._nbTopBinChanged)
-
-    def _nbBinsChanged(self):
-        self.sigNbBinsChanged.emit(self.getBins())
-
-    def _nbBottomBinChanged(self):
-        self.sigBottomBinChanged.emit(self.getBottomBin())
-
-    def _nbTopBinChanged(self):
-        self.sigTopBinChanged.emit(self.getTopBin())
-
-    def setDataset(self, dataset):
-        if not isinstance(dataset, dtypes.Dataset):
-            raise dtypes.DatasetTypeError(dataset)
-        self.setBins(dataset.dataset.nframes)
-        self.setProcessingButtonsEnabled(enable=True)
-
-    def _showHistogramCallback(self):
-        sender = self.sender()
-        frames_intensity = sender.data
-        if frames_intensity is None:
-            raise RuntimeError(
-                "An exception occured during frame intensity computation."
-            )
-        self.showHistogram(frames_intensity=frames_intensity)
-
-    def showHistogram(self, frames_intensity: Optional[numpy.array]):
-        """
-        Plots the frame intensity histogram.
-        """
-        self._abortPB.hide()
-        self._abortPB.setEnabled(True)
-        self._computePartitionPB.setEnabled(True)
-        self._computeHistogramPB.setEnabled(True)
-        self._plot.clear()
-        if frames_intensity is not None:
-            values, bins = numpy.histogram(
-                frames_intensity, numpy.arange(self.getBins())
-            )
-            self._plot.addHistogram(values, bins, fill=True)
-            self._plot.show()
-
-    # bins getter / setter
-    def getBins(self) -> Optional[int]:
-        text = self._bins.text().replace(" ", "")
-        if text == "":
-            return None
-        else:
-            return int(text)
-
-    def setBins(self, value: int | str | None):
-        if value in ("", None):
-            self._bins.clear()
-        else:
-            self._bins.setText(str(value))
-
-    def getBottomBin(self) -> Optional[int]:
-        text = self._bottomBinsNumber.text().replace(" ", "")
-        if text == "":
-            return None
-        else:
-            return int(text)
-
-    def setBottomBin(self, value: int | str | None):
-        if value in ("", None):
-            self._bottomBinsNumber.clear()
-        else:
-            self._bottomBinsNumber.setText(str(value))
-
-    def getTopBin(self) -> Optional[int]:
-        text = self._topBinsNumber.text().replace(" ", "")
-        if text == "":
-            return None
-        else:
-            return int(text)
-
-    def setTopBin(self, value: int | str | None):
-        if value in ("", None):
-            self._topBinsNumber.clear()
-        else:
-            self._topBinsNumber.setText(str(value))
-
-    # util function
-    def setProcessingButtonsEnabled(self, enable: bool):
-        self._abortPB.setEnabled(not enable)
-        self._computePartitionPB.setEnabled(enable)
-        self._computeHistogramPB.setEnabled(enable)

darfix/gui/data_selection/DataSelectionBase.py

@@ -1,59 +0,0 @@
-from __future__ import annotations
-
-from silx.gui import qt
-
-from .WorkingDirSelectionWidget import WorkingDirSelectionWidget
-
-
-class DataSelectionBase(qt.QTabWidget):
-    """Define the base class to define the data selection"""
-
-    sigRawDataInfosChanged = qt.Signal()
-    sigDarkDataInfosChanged = qt.Signal()
-    sigTreatedDirInfoChanged = qt.Signal()
-
-    def __init__(self, parent: qt.QWidget | None = None) -> None:
-        super().__init__(parent)
-
-        self._dataset = None
-        self.bg_dataset = None
-        self.indices = None
-        self.bg_indices = None
-
-        self._rawDataWidget = self.buildRawDataWidget()
-        self.addTab(self._rawDataWidget, "raw data")
-
-        self._darkDataWidget = self.buildDarkDataWidget()
-        self.addTab(self._darkDataWidget, "dark data")
-
-        self._treatedDirWidget = self.buildProcessedDataWidget()
-        self.addTab(self._treatedDirWidget, "treated data")
-
-        # connect signal / slot
-        self._treatedDirData.dirChanged.connect(self.sigTreatedDirInfoChanged)
-
-    def getTreatedDir(self) -> str:
-        return self._treatedDirData.getDir()
-
-    def setTreatedDir(self, _dir):
-        self._treatedDirData.setDir(_dir)
-
-    def buildProcessedDataWidget(self):
-        widget = qt.QWidget()
-        widget.setLayout(qt.QVBoxLayout())
-        self._treatedDirData = WorkingDirSelectionWidget(parent=self)
-        widget.layout().addWidget(self._treatedDirData)
-        spacer = qt.QWidget()
-        spacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding)
-        widget.layout().addWidget(spacer)
-        return widget
-
-    # Base class API to be redefined
-    def buildRawDataWidget(self):
-        raise NotImplementedError("Base class")
-
-    def buildDarkDataWidget(self):
-        raise NotImplementedError("Base class")
-
-    def keepDataOnDisk(self) -> bool:
-        raise NotImplementedError("Base class")

darfix/tests/tasks/test_datapartition.py

@@ -1,52 +0,0 @@
-import numpy
-import pytest
-
-from darfix import dtypes
-from darfix.tasks.datapartition import DataPartition
-from darfix.tests.utils import createDataset
-
-
-@pytest.fixture
-def one_motor_dataset():
-    # Dataset with scan shape 100, and frame shape 3,3, with frame intensity gradually increasing from 1 to 10
-    return dtypes.Dataset(
-        dataset=createDataset(
-            data=numpy.linspace(1, 10, 100).repeat(9).reshape((100, 3, 3))
-        ),
-    )
-
-
-def test_data_partition(one_motor_dataset):
-
-    # test default processing
-    task = DataPartition(
-        inputs={
-            "dataset": one_motor_dataset,
-        }
-    )
-    task.run()
-
-    # if no filtering then indices of all frames must exist
-    numpy.testing.assert_array_equal(
-        task.outputs.dataset.indices,
-        numpy.arange(0, 100, step=1),
-    )
-
-
-def test_data_partition_with_filtering(one_motor_dataset):
-
-    # test filtering
-    task = DataPartition(
-        inputs={
-            "dataset": one_motor_dataset,
-            "filter_bottom_bin_idx": 5,
-            "filter_top_bin_idx": 45,
-        },
-    )
-    task.run()
-
-    # if filtering then some indices must be ignored
-    assert not numpy.array_equal(
-        task.outputs.dataset.indices,
-        numpy.arange(0, 100, step=1),
-    )