ndslice 0.6.0__tar.gz → 0.7.0__tar.gz

{ndslice-0.6.0 → ndslice-0.7.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: ndslice
-Version: 0.6.0
+Version: 0.7.0
 Summary: Interactive N-dimensional numpy array viewer with FFT support
 Author-email: Henric Rydén <henric.ryden@gmail.com>
-License: MIT
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/henricryden/ndslice
 Project-URL: Documentation, https://github.com/henricryden/ndslice#readme
 Project-URL: Bug Tracker, https://github.com/henricryden/ndslice/issues
@@ -11,7 +11,6 @@ Keywords: visualization,numpy,fft,image-viewer,data-visualization
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -27,31 +26,18 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.20.0
 Requires-Dist: pyqtgraph>=0.14.0
 Requires-Dist: PyQt5>=5.15.0
+Requires-Dist: h5py>=3.0.0
+Requires-Dist: scipy>=1.7.0
+Requires-Dist: pydicom>=2.4.0
+Requires-Dist: nibabel>=4.0.0
+Requires-Dist: imageio>=2.9.0
+Requires-Dist: imageio-ffmpeg>=0.4.2
+Requires-Dist: Pillow>=8.0.0
 Provides-Extra: pyqt6
 Requires-Dist: PyQt6>=6.4.0; extra == "pyqt6"
 Provides-Extra: dev
 Requires-Dist: build>=0.10.0; extra == "dev"
 Requires-Dist: twine>=4.0.0; extra == "dev"
-Provides-Extra: hdf5
-Requires-Dist: h5py>=3.0.0; extra == "hdf5"
-Provides-Extra: matlab
-Requires-Dist: scipy>=1.7.0; extra == "matlab"
-Provides-Extra: dicom
-Requires-Dist: pydicom>=2.4.0; extra == "dicom"
-Provides-Extra: nifti
-Requires-Dist: nibabel>=4.0.0; extra == "nifti"
-Provides-Extra: video-export
-Requires-Dist: imageio>=2.9.0; extra == "video-export"
-Requires-Dist: imageio-ffmpeg>=0.4.2; extra == "video-export"
-Requires-Dist: Pillow>=8.0.0; extra == "video-export"
-Provides-Extra: all
-Requires-Dist: h5py>=3.0.0; extra == "all"
-Requires-Dist: scipy>=1.7.0; extra == "all"
-Requires-Dist: pydicom>=2.4.0; extra == "all"
-Requires-Dist: nibabel>=4.0.0; extra == "all"
-Requires-Dist: imageio>=2.9.0; extra == "all"
-Requires-Dist: imageio-ffmpeg>=0.4.2; extra == "all"
-Requires-Dist: Pillow>=8.0.0; extra == "all"
 Dynamic: license-file
 
 [![Python versions](https://img.shields.io/pypi/pyversions/ndslice.svg)](https://pypi.org/project/ndslice/)
@@ -147,6 +133,9 @@ ndslice(data2)  # Shown after first closes
 ### Command Line
 ```bash
 ndslice data.npy # Numpy file
+ndslice image.nii.gz
+ndslice image.dcm
+ndslice some_dicom_dir/ # Automatically attemps to form an nd-array from DICOM the files
 ndslice --help   # Show all options
 ```
 
@@ -160,10 +149,13 @@ ndslice has CLI support and can conveniently display:
 | [BART](https://mrirecon.github.io/bart/) | `.cfl` + `.hdr` | — |
 | Philips REC | `.REC` + `.xml` | — |
 | [NIfTI](https://nifti.nimh.nih.gov/) | `.nii`, `.nii.gz` | nibabel |
-| DICOM (pixel array) | `.dcm` | pydicom |
+| DICOM file | `.dcm` | pydicom |
+| DICOM directory | directory containing `.dcm` files | pydicom, nibabel, `dcm2niix` on `PATH` |
 
 HDF5 files can be compound complex dtype, or real/imag fields.
 
+For DICOM directories, ndslice does not infer series dimensions itself. It runs `dcm2niix`, then loads the produced NIfTI volume.
+
 If there are multiple datasets in the file, a selection GUI appears which highlights arrays supported by ndslice (essentially numeric).
 Double click to open.
 
@@ -175,11 +167,19 @@ Double click to open.
 ### From PyPI
 
 ```bash
-pip install ndslice 
-pip install ndslice[video_export] # Include video export dependencies (imageio, Pillow, imageio-ffmpeg)
-pip install ndslice[all] # includes all optional dependencies (video export and file formats)
+pip install ndslice
+# Or, if you want just the package without pulling in dependencies:
+pip install --no-deps ndslice
+```
+
+For DICOM directories you also need the external `dcm2niix` binary available on `PATH`. A practical install route is:
+
+```bash
+conda install -c conda-forge dcm2niix
 ```
 
+If `dcm2niix` is missing or conversion fails, ndslice reports a clear error instead of trying to infer the series layout itself.
+
 ### From source
 
 ```bash
@@ -199,7 +199,13 @@ pip install -e .
 - NumPy >= 1.20.0
 - PyQtGraph >= 0.12.0
 - PyQt5 >= 5.15.0
-- h5py >= 3.0.0 (for HDF5 file support in CLI)
+- h5py >= 3.0.0
+- scipy >= 1.7.0
+- pydicom >= 2.4.0
+- nibabel >= 4.0.0
+- imageio >= 2.9.0
+- imageio-ffmpeg >= 0.4.2
+- Pillow >= 8.0.0
 
 ## License
 

{ndslice-0.6.0 → ndslice-0.7.0}/README.md

@@ -91,6 +91,9 @@ ndslice(data2)  # Shown after first closes
 ### Command Line
 ```bash
 ndslice data.npy # Numpy file
+ndslice image.nii.gz
+ndslice image.dcm
+ndslice some_dicom_dir/ # Automatically attemps to form an nd-array from DICOM the files
 ndslice --help   # Show all options
 ```
 
@@ -104,10 +107,13 @@ ndslice has CLI support and can conveniently display:
 | [BART](https://mrirecon.github.io/bart/) | `.cfl` + `.hdr` | — |
 | Philips REC | `.REC` + `.xml` | — |
 | [NIfTI](https://nifti.nimh.nih.gov/) | `.nii`, `.nii.gz` | nibabel |
-| DICOM (pixel array) | `.dcm` | pydicom |
+| DICOM file | `.dcm` | pydicom |
+| DICOM directory | directory containing `.dcm` files | pydicom, nibabel, `dcm2niix` on `PATH` |
 
 HDF5 files can be compound complex dtype, or real/imag fields.
 
+For DICOM directories, ndslice does not infer series dimensions itself. It runs `dcm2niix`, then loads the produced NIfTI volume.
+
 If there are multiple datasets in the file, a selection GUI appears which highlights arrays supported by ndslice (essentially numeric).
 Double click to open.
 
@@ -119,11 +125,19 @@ Double click to open.
 ### From PyPI
 
 ```bash
-pip install ndslice 
-pip install ndslice[video_export] # Include video export dependencies (imageio, Pillow, imageio-ffmpeg)
-pip install ndslice[all] # includes all optional dependencies (video export and file formats)
+pip install ndslice
+# Or, if you want just the package without pulling in dependencies:
+pip install --no-deps ndslice
+```
+
+For DICOM directories you also need the external `dcm2niix` binary available on `PATH`. A practical install route is:
+
+```bash
+conda install -c conda-forge dcm2niix
 ```
 
+If `dcm2niix` is missing or conversion fails, ndslice reports a clear error instead of trying to infer the series layout itself.
+
 ### From source
 
 ```bash
@@ -143,7 +157,13 @@ pip install -e .
 - NumPy >= 1.20.0
 - PyQtGraph >= 0.12.0
 - PyQt5 >= 5.15.0
-- h5py >= 3.0.0 (for HDF5 file support in CLI)
+- h5py >= 3.0.0
+- scipy >= 1.7.0
+- pydicom >= 2.4.0
+- nibabel >= 4.0.0
+- imageio >= 2.9.0
+- imageio-ffmpeg >= 0.4.2
+- Pillow >= 8.0.0
 
 ## License
 

{ndslice-0.6.0 → ndslice-0.7.0}/ndslice/__main__.py

@@ -7,7 +7,7 @@ import numpy as np
 from pathlib import Path
 from .ndslice import ndslice
 from .selectors import H5DatasetSelector, NpzDatasetSelector, MatDatasetSelector
-from .file_interpreters import load_file
+from .file_interpreters import load_path
 
 
 def main():
@@ -21,6 +21,7 @@ Examples:
   ndslice data.h5 data2.npy data3.npz   # View multiple files
   ndslice scan.REC                      # View Philips REC/XML pair
   ndslice ref.cfl                       # View BART CFL/HDR pair
+    ndslice dicomdir/                     # Convert DICOM directory via dcm2niix, then view
   ndslice scan.dcm                      # View DICOM file
   ndslice scan.nii                      # View NIfTI file
   ndslice data.txt                      # View text file with numeric data
@@ -29,7 +30,7 @@ For files with multiple datasets (HDF5, NPZ, MAT), a GUI selector will automatic
         """
     )
     parser.add_argument('files', type=str, nargs='+', 
-                        help='Path(s) to data file(s) (.h5, .npy, .mat, ...)')
+                        help='Path(s) to data files or DICOM directories')
     
     args = parser.parse_args()
     
@@ -42,10 +43,14 @@ For files with multiple datasets (HDF5, NPZ, MAT), a GUI selector will automatic
         
         try:
             suffix = ''.join(filepath.suffixes).lower()
-            # Single-dataset formats is handled by file_interpreters.load_file
-            if suffix in ['.npy', '.rec', '.cfl', '.dcm', '.nii', '.nii.gz', '.txt']:
-                data = load_file(filepath)
-                ndslice(data=data, title=filepath.name, block=False, filepath=filepath)
+            # Single-dataset formats and DICOM directories are handled by file_interpreters.load_path
+            if filepath.is_dir() or suffix in ['.npy', '.rec', '.cfl', '.dcm', '.nii', '.nii.gz', '.txt']:
+                loaded = load_path(filepath)
+                title = filepath.name or str(filepath)
+                detected_format = loaded.metadata.get('detected_format')
+                if detected_format:
+                    title = f"{title} [{detected_format}]"
+                ndslice(data=loaded.data, title=title, block=False, filepath=filepath)
                 continue
             
             # Multi-dataset formats - use selectors
@@ -57,7 +62,7 @@ For files with multiple datasets (HDF5, NPZ, MAT), a GUI selector will automatic
             elif suffix == '.mat':
                 selector = MatDatasetSelector(filepath)
             else:
-                print(f"Unsupported file type: {suffix}. Supported types: .h5, .hdf5, .npy, .npz, .mat, .REC, .cfl, .dcm, .nii, .txt")
+                print(f"Unsupported file type: {suffix}. Supported types: directories with DICOM .dcm files, .h5, .hdf5, .npy, .npz, .mat, .REC, .cfl, .dcm, .nii, .nii.gz, .txt")
                 continue
             
             # Select and view dataset (shows GUI if multiple datasets)

{ndslice-0.6.0 → ndslice-0.7.0}/ndslice/file_interpreters.py

@@ -1,7 +1,17 @@
 import xml.etree.ElementTree as ET
 import numpy as np
 import struct
+import subprocess
+import tempfile
+from dataclasses import dataclass
 from pathlib import Path
+import shutil
+
+
+@dataclass
+class LoadedPath:
+    data: np.ndarray
+    metadata: dict
 
 
 def remove_trailing_singletons(data):
@@ -233,6 +243,10 @@ class BartLoader:
 class DicomLoader:
     def __init__(self, dcm_path):
         self.dcm_path = Path(dcm_path)
+        self.metadata = {
+            'source_path': str(self.dcm_path),
+            'detected_format': 'dicom_file',
+        }
         
         if not self.dcm_path.exists():
             raise FileNotFoundError(f"DICOM file not found: {self.dcm_path}")
@@ -247,12 +261,195 @@ class DicomLoader:
             )
         
         dcm = pydicom.dcmread(self.dcm_path)
-        return remove_trailing_singletons(dcm.pixel_array)
+        if not hasattr(dcm, 'pixel_array'):
+            raise ValueError(
+                f"DICOM file does not contain pixel data: {self.dcm_path}"
+            )
+
+        if getattr(dcm, 'SamplesPerPixel', 1) != 1:
+            raise ValueError(
+                "Single-file DICOM loading currently supports grayscale pixel data only. "
+                f"Unsupported SamplesPerPixel={dcm.SamplesPerPixel} for {self.dcm_path}"
+            )
+
+        data = remove_trailing_singletons(np.asarray(dcm.pixel_array))
+        self.metadata.update({
+            'shape': tuple(data.shape),
+            'dtype': str(data.dtype),
+            'dicom_metadata': {
+                'patient_name': str(getattr(dcm, 'PatientName', '')),
+                'series_description': str(getattr(dcm, 'SeriesDescription', '')),
+                'modality': str(getattr(dcm, 'Modality', '')),
+                'pixel_spacing': list(getattr(dcm, 'PixelSpacing', [])) if hasattr(dcm, 'PixelSpacing') else None,
+                'image_position_patient': list(getattr(dcm, 'ImagePositionPatient', [])) if hasattr(dcm, 'ImagePositionPatient') else None,
+            },
+        })
+        return data
+
+
+def _find_dicom_files(directory_path):
+    directory_path = Path(directory_path)
+    return sorted(
+        path for path in directory_path.rglob('*')
+        if path.is_file() and path.suffix.lower() == '.dcm'
+    )
+
+
+def _json_sidecar_for_nifti(nifti_path):
+    nifti_path = Path(nifti_path)
+    json_path = nifti_path.with_suffix('.json')
+    if nifti_path.suffix == '.gz':
+        json_path = nifti_path.with_suffix('').with_suffix('.json')
+    return json_path if json_path.exists() else None
+
+
+def _pick_converted_niftis(output_dir):
+    output_dir = Path(output_dir)
+    nifti_paths = sorted(output_dir.glob('*.nii')) + sorted(output_dir.glob('*.nii.gz'))
+
+    if not nifti_paths:
+        raise ValueError("dcm2niix did not produce a NIfTI file")
+
+    return [(nifti_path, _json_sidecar_for_nifti(nifti_path)) for nifti_path in nifti_paths]
+
+
+def _read_json_sidecar(json_path):
+    if json_path is None:
+        return {}
+
+    import json
+
+    with open(json_path, 'r') as json_file:
+        return json.load(json_file)
+
+
+def _describe_stacking_axis(sidecar_metadata):
+    axis_candidates = [
+        ('EchoNumber', 'echoes'),
+        ('FlipAngle', 'flip angles'),
+        ('DiffusionBValue', 'b-values'),
+        ('SeriesNumber', 'series'),
+        ('AcquisitionNumber', 'acquisitions'),
+    ]
+
+    for key, label in axis_candidates:
+        values = [metadata.get(key) for metadata in sidecar_metadata]
+        if any(value is not None for value in values) and len(set(values)) > 1:
+            return label, key, values
+
+    names = [metadata.get('ProtocolName') or metadata.get('SeriesDescription') for metadata in sidecar_metadata]
+    if any(name for name in names) and len(set(names)) > 1:
+        return 'series', 'SeriesDescription', names
+
+    return 'series', None, None
+
+
+def _run_dcm2niix(directory_path, output_dir):
+    dcm2niix_path = shutil.which('dcm2niix')
+    if dcm2niix_path is None:
+        raise RuntimeError(
+            "dcm2niix is required to load DICOM directories. Install it, for example, with "
+            "'conda install -c conda-forge dcm2niix', and ensure it is on PATH."
+        )
+
+    command = [
+        dcm2niix_path,
+        '-b', 'y',
+        '-z', 'n',
+        '-f', 'ndslice_%s',
+        '-o', str(output_dir),
+        str(directory_path),
+    ]
+    completed = subprocess.run(command, capture_output=True)
+    if completed.returncode != 0:
+        stdout = completed.stdout.decode('utf-8', errors='replace').strip()
+        stderr = completed.stderr.decode('utf-8', errors='replace').strip()
+        error_output = '\n'.join(part for part in [stdout, stderr] if part)
+        raise RuntimeError(
+            "dcm2niix failed to convert the DICOM directory. "
+            f"Input: {directory_path}\n{error_output}"
+        )
+
+    return _pick_converted_niftis(output_dir)
+
+
+class DicomDirectoryLoader:
+    def __init__(self, directory_path):
+        self.directory_path = Path(directory_path)
+        self.metadata = {
+            'source_path': str(self.directory_path),
+            'detected_format': 'dicom_directory',
+        }
+
+        if not self.directory_path.exists():
+            raise FileNotFoundError(f"DICOM directory not found: {self.directory_path}")
+        if not self.directory_path.is_dir():
+            raise NotADirectoryError(f"Expected a directory, got: {self.directory_path}")
+
+    def load(self):
+        dicom_files = _find_dicom_files(self.directory_path)
+        if not dicom_files:
+            raise ValueError(
+                f"No DICOM files with suffix .dcm were found under directory: {self.directory_path}"
+            )
+
+        with tempfile.TemporaryDirectory(prefix='ndslice_dicom_') as temp_dir:
+            nifti_outputs = _run_dcm2niix(self.directory_path, temp_dir)
+            arrays = []
+            nifti_paths = []
+            json_paths = []
+            sidecar_metadata = []
+
+            for nifti_path, json_path in nifti_outputs:
+                nifti_loader = NiftiLoader(nifti_path)
+                arrays.append(nifti_loader.load())
+                nifti_paths.append(str(nifti_path))
+                json_paths.append(str(json_path) if json_path else None)
+                sidecar_metadata.append(_read_json_sidecar(json_path))
+
+            if len(arrays) == 1:
+                data = arrays[0]
+                stacking_label = None
+                stacking_key = None
+                stacking_values = None
+            else:
+                shapes = [tuple(array.shape) for array in arrays]
+                if len(set(shapes)) != 1:
+                    paths = ', '.join(Path(path).name for path in nifti_paths)
+                    raise ValueError(
+                        "dcm2niix produced multiple NIfTI files with different shapes, so ndslice "
+                        f"cannot stack them automatically. Outputs: {paths}"
+                    )
+
+                stacking_label, stacking_key, stacking_values = _describe_stacking_axis(sidecar_metadata)
+                print(f"Dataset stacked automatically along new dimension: {stacking_label}")
+                if stacking_key is not None and stacking_values is not None:
+                    print(f"  {stacking_key}: {stacking_values}")
+                if stacking_key == 'SeriesNumber':
+                    series_descriptions = [metadata.get('SeriesDescription') for metadata in sidecar_metadata]
+                    if any(description is not None for description in series_descriptions):
+                        print(f"  SeriesDescription: {series_descriptions}")
+                data = np.stack(arrays, axis=-1)
+
+            self.metadata.update({
+                'shape': tuple(data.shape),
+                'dtype': str(data.dtype),
+                'nifti_output_path': nifti_paths[0] if len(nifti_paths) == 1 else nifti_paths,
+                'sidecar_json_path': json_paths[0] if len(json_paths) == 1 else json_paths,
+                'stacked_dimension': stacking_label,
+                'stacked_dimension_key': stacking_key,
+                'stacked_dimension_values': stacking_values,
+            })
+            return data
 
 
 class NiftiLoader:
     def __init__(self, file_path):
         self.file_path = Path(file_path)
+        self.metadata = {
+            'source_path': str(self.file_path),
+            'detected_format': 'nifti',
+        }
         
         if not self.file_path.exists():
             raise FileNotFoundError(f"NIfTI file not found: {self.file_path}")
@@ -267,12 +464,21 @@ class NiftiLoader:
             )
         
         data = nib.load(self.file_path).get_fdata()
-        return remove_trailing_singletons(data)
+        data = remove_trailing_singletons(data)
+        self.metadata.update({
+            'shape': tuple(data.shape),
+            'dtype': str(data.dtype),
+        })
+        return data
 
 
 class TextLoader:
     def __init__(self, file_path):
         self.file_path = Path(file_path)
+        self.metadata = {
+            'source_path': str(self.file_path),
+            'detected_format': 'text',
+        }
         
         if not self.file_path.exists():
             raise FileNotFoundError(f"Text file not found: {self.file_path}")
@@ -318,7 +524,58 @@ class TextLoader:
             # Different row lengths - flatten to 1D
             data = np.array([val for row in numeric_lines for val in row], dtype=np.float32)
         
-        return remove_trailing_singletons(data)
+        data = remove_trailing_singletons(data)
+        self.metadata.update({
+            'shape': tuple(data.shape),
+            'dtype': str(data.dtype),
+        })
+        return data
+
+
+def load_path(filepath):
+    filepath = Path(filepath)
+
+    if filepath.is_dir():
+        loader = DicomDirectoryLoader(filepath)
+        data = loader.load()
+        return LoadedPath(data=data, metadata=loader.metadata)
+
+    suffix = ''.join(filepath.suffixes).lower()
+
+    if suffix == '.npy':
+        data = np.load(filepath)
+        return LoadedPath(
+            data=data,
+            metadata={
+                'source_path': str(filepath),
+                'detected_format': 'numpy',
+                'shape': tuple(data.shape),
+                'dtype': str(data.dtype),
+            },
+        )
+
+    if suffix == '.rec':
+        loader = PhilipsRECLoader(filepath)
+    elif suffix == '.cfl':
+        loader = BartLoader(filepath)
+    elif suffix == '.dcm':
+        loader = DicomLoader(filepath)
+    elif suffix in ['.nii', '.nii.gz']:
+        loader = NiftiLoader(filepath)
+    elif suffix == '.txt':
+        loader = TextLoader(filepath)
+    else:
+        raise ValueError(f"Unsupported file format: {suffix}")
+
+    data = loader.load()
+    metadata = {
+        'source_path': str(filepath),
+        'detected_format': suffix.lstrip('.'),
+        'shape': tuple(data.shape),
+        'dtype': str(data.dtype),
+    }
+    metadata.update(getattr(loader, 'metadata', {}))
+    return LoadedPath(data=data, metadata=metadata)
 
 
 
@@ -326,9 +583,10 @@ class TextLoader:
 
 def load_file(filepath):
     """
-    Generic file loader - automatically detects format and returns NumPy array.
+    Generic path loader - automatically detects format and returns a NumPy array.
     
     Supported formats:
+    - directory: DICOM directory via dcm2niix
     - .npy: NumPy binary format
     - .REC: Philips XLM+REC (requires xml file)
     - .cfl: BART format (requires hdr file)
@@ -337,36 +595,10 @@ def load_file(filepath):
     - .txt: Simple text files with numeric data
     
     Args:
-        filepath: Path to data file
+        filepath: Path to data file or DICOM directory
         
     Returns:
         NumPy array
         
     """
-    filepath = Path(filepath)
-    suffix = ''.join(Path(filepath).suffixes).lower()
-    
-    if suffix == '.npy':
-        return np.load(filepath)
-    
-    elif suffix == '.rec':
-        loader = PhilipsRECLoader(filepath)
-        return loader.load()
-    
-    elif suffix == '.cfl':
-        loader = BartLoader(filepath)
-        return loader.load()
-    
-    elif suffix == '.dcm':
-        loader = DicomLoader(filepath)
-        return loader.load()
-    elif suffix in ['.nii', '.nii.gz']:
-        loader = NiftiLoader(filepath)
-        return loader.load()
-    
-    elif suffix == '.txt':
-        loader = TextLoader(filepath)
-        return loader.load()
-    
-    else:
-        raise ValueError(f"Unsupported file format: {suffix}")
+    return load_path(filepath).data

{ndslice-0.6.0 → ndslice-0.7.0}/ndslice/ndslice.py

@@ -4,7 +4,9 @@ import pyqtgraph.Qt as Qt
 from pyqtgraph.Qt import QtWidgets, QtGui
 import os
 import math
+import platform
 from enum import Enum
+from pathlib import Path
 from .imageview2d import ImageView2D
 from .video_export import VideoExportWorker, VideoExportDialog, VideoExportSettingsDialog
 import multiprocessing as mp
@@ -26,6 +28,292 @@ class Domain(Enum):
     NATIVE=0
     FOURIER=1
 
+
+QT_SIGNAL = getattr(Qt.QtCore, 'Signal', getattr(Qt.QtCore, 'pyqtSignal'))
+
+
+class RangeSlider(QtWidgets.QWidget):
+    """A minimal horizontal two-handle slider for inclusive integer ranges."""
+
+    valuesChanged = QT_SIGNAL(int, int)
+
+    def __init__(self, parent=None, minimum=0, maximum=0):
+        super().__init__(parent)
+        self._minimum = int(minimum)
+        self._maximum = max(int(minimum), int(maximum))
+        self._lower_value = self._minimum
+        self._upper_value = self._maximum
+        self._active_handle = None
+        self.setMouseTracking(True)
+        self.setMinimumHeight(30)
+
+    def sizeHint(self):
+        return Qt.QtCore.QSize(240, 30)
+
+    def values(self):
+        return self._lower_value, self._upper_value
+
+    def setValues(self, lower_value, upper_value):
+        lower_value = max(self._minimum, min(int(lower_value), self._maximum))
+        upper_value = max(self._minimum, min(int(upper_value), self._maximum))
+        if lower_value > upper_value:
+            lower_value, upper_value = upper_value, lower_value
+
+        if (lower_value, upper_value) == (self._lower_value, self._upper_value):
+            return
+
+        self._lower_value = lower_value
+        self._upper_value = upper_value
+        self.valuesChanged.emit(self._lower_value, self._upper_value)
+        self.update()
+
+    def paintEvent(self, event):
+        del event
+        painter = QtGui.QPainter(self)
+        painter.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing)
+
+        palette = self.palette()
+        groove_rect = self._groove_rect()
+        lower_center = self._handle_center(self._lower_value)
+        upper_center = self._handle_center(self._upper_value)
+
+        painter.setPen(Qt.QtCore.Qt.PenStyle.NoPen)
+        painter.setBrush(palette.midlight())
+        painter.drawRoundedRect(groove_rect, 3, 3)
+
+        selected_rect = Qt.QtCore.QRectF(
+            lower_center.x(),
+            groove_rect.top(),
+            max(upper_center.x() - lower_center.x(), 1),
+            groove_rect.height(),
+        )
+        painter.setBrush(palette.highlight())
+        painter.drawRoundedRect(selected_rect, 3, 3)
+
+        self._paint_handle(painter, lower_center, self._active_handle == 'lower')
+        self._paint_handle(painter, upper_center, self._active_handle == 'upper')
+
+    def mousePressEvent(self, event):
+        if event.button() != Qt.QtCore.Qt.MouseButton.LeftButton:
+            event.ignore()
+            return
+
+        point = self._event_point(event)
+        self._active_handle = self._closest_handle(point)
+        self._move_active_handle(point.x())
+        event.accept()
+
+    def mouseMoveEvent(self, event):
+        point = self._event_point(event)
+        if self._active_handle is not None:
+            self._move_active_handle(point.x())
+            event.accept()
+            return
+
+        self.setCursor(
+            QtGui.QCursor(
+                Qt.QtCore.Qt.CursorShape.SizeHorCursor if self._is_over_handle(point) else Qt.QtCore.Qt.CursorShape.ArrowCursor
+            )
+        )
+        event.ignore()
+
+    def mouseReleaseEvent(self, event):
+        if event.button() == Qt.QtCore.Qt.MouseButton.LeftButton:
+            self._active_handle = None
+            self.update()
+        event.accept()
+
+    def leaveEvent(self, event):
+        self.setCursor(QtGui.QCursor(Qt.QtCore.Qt.CursorShape.ArrowCursor))
+        super().leaveEvent(event)
+
+    def _event_point(self, event):
+        if hasattr(event, 'position'):
+            return event.position()
+        if hasattr(event, 'localPos'):
+            return event.localPos()
+        return Qt.QtCore.QPointF(event.pos())
+
+    def _handle_radius(self):
+        return 8.0
+
+    def _groove_rect(self):
+        margin = self._handle_radius() + 4.0
+        return Qt.QtCore.QRectF(
+            margin,
+            self.height() / 2.0 - 3.0,
+            max(self.width() - 2.0 * margin, 1.0),
+            6.0,
+        )
+
+    def _handle_center(self, value):
+        groove_rect = self._groove_rect()
+        span = max(self._maximum - self._minimum, 1)
+        ratio = (value - self._minimum) / span
+        return Qt.QtCore.QPointF(groove_rect.left() + groove_rect.width() * ratio, groove_rect.center().y())
+
+    def _handle_rect(self, value):
+        center = self._handle_center(value)
+        radius = self._handle_radius()
+        return Qt.QtCore.QRectF(center.x() - radius, center.y() - radius, radius * 2.0, radius * 2.0)
+
+    def _paint_handle(self, painter, center, active):
+        radius = self._handle_radius()
+        palette = self.palette()
+        rect = Qt.QtCore.QRectF(center.x() - radius, center.y() - radius, radius * 2.0, radius * 2.0)
+        painter.setPen(QtGui.QPen(palette.shadow().color(), 1.0))
+        painter.setBrush(palette.highlight() if active else palette.button())
+        painter.drawEllipse(rect)
+
+        inner_rect = rect.adjusted(3.0, 3.0, -3.0, -3.0)
+        painter.setPen(Qt.QtCore.Qt.PenStyle.NoPen)
+        painter.setBrush(palette.base())
+        painter.drawEllipse(inner_rect)
+
+    def _closest_handle(self, point):
+        lower_distance = abs(point.x() - self._handle_center(self._lower_value).x())
+        upper_distance = abs(point.x() - self._handle_center(self._upper_value).x())
+        return 'lower' if lower_distance <= upper_distance else 'upper'
+
+    def _is_over_handle(self, point):
+        expanded_lower = self._handle_rect(self._lower_value).adjusted(-4, -4, 4, 4)
+        expanded_upper = self._handle_rect(self._upper_value).adjusted(-4, -4, 4, 4)
+        return expanded_lower.contains(point) or expanded_upper.contains(point)
+
+    def _value_from_position(self, position_x):
+        groove_rect = self._groove_rect()
+        clamped_x = min(max(position_x, groove_rect.left()), groove_rect.right())
+        ratio = (clamped_x - groove_rect.left()) / max(groove_rect.width(), 1.0)
+        return int(round(self._minimum + ratio * (self._maximum - self._minimum)))
+
+    def _move_active_handle(self, position_x):
+        value = self._value_from_position(position_x)
+        if self._active_handle == 'lower':
+            self.setValues(min(value, self._upper_value), self._upper_value)
+        elif self._active_handle == 'upper':
+            self.setValues(self._lower_value, max(value, self._lower_value))
+
+
+class SaveRangeDialog(QtWidgets.QDialog):
+    """Dialog for selecting an inclusive index range along each dimension."""
+
+    def __init__(self, parent, data_shape):
+        super().__init__(parent)
+        self.setWindowTitle('Save as NumPy')
+        self._controls = []
+        self._data_shape = tuple(data_shape)
+
+        layout = QtWidgets.QVBoxLayout(self)
+        layout.setContentsMargins(12, 12, 12, 12)
+        layout.setSpacing(10)
+
+        scroll_area = QtWidgets.QScrollArea()
+        scroll_area.setWidgetResizable(True)
+        scroll_area.setHorizontalScrollBarPolicy(Qt.QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+        content = QtWidgets.QWidget()
+        content_layout = QtWidgets.QVBoxLayout(content)
+        content_layout.setContentsMargins(4, 4, 4, 4)
+        content_layout.setSpacing(10)
+
+        for dim, size in enumerate(data_shape):
+            max_index = max(0, size - 1)
+            row_widget = QtWidgets.QWidget()
+            row_layout = QtWidgets.QGridLayout(row_widget)
+            row_layout.setContentsMargins(0, 0, 0, 0)
+            row_layout.setHorizontalSpacing(8)
+            row_layout.setVerticalSpacing(4)
+
+            dimension_label = QtWidgets.QLabel(f'Dim {dim}')
+            dimension_label.setStyleSheet('QLabel { font-size: 9pt; font-weight: bold; }')
+            slider = RangeSlider(row_widget, 0, max_index)
+
+            start_spinbox = QtWidgets.QSpinBox()
+            end_spinbox = QtWidgets.QSpinBox()
+            for spinbox in (start_spinbox, end_spinbox):
+                spinbox.setRange(0, max_index)
+                spinbox.setButtonSymbols(QtWidgets.QAbstractSpinBox.ButtonSymbols.NoButtons)
+                spinbox.setStyleSheet(NDSliceWindow.SPINBOX_STYLE)
+                spinbox.setFixedWidth(70)
+
+            end_spinbox.setValue(max_index)
+            start_spinbox.valueChanged.connect(lambda value, end_box=end_spinbox: end_box.setMinimum(value))
+            end_spinbox.valueChanged.connect(lambda value, start_box=start_spinbox: start_box.setMaximum(value))
+            start_spinbox.valueChanged.connect(lambda value, slider_widget=slider, end_box=end_spinbox: slider_widget.setValues(value, end_box.value()))
+            end_spinbox.valueChanged.connect(lambda value, slider_widget=slider, start_box=start_spinbox: slider_widget.setValues(start_box.value(), value))
+            start_spinbox.valueChanged.connect(lambda _value: self._update_output_shape_label())
+            end_spinbox.valueChanged.connect(lambda _value: self._update_output_shape_label())
+            slider.valuesChanged.connect(lambda lower, upper, start_box=start_spinbox, end_box=end_spinbox: self._sync_spinboxes(start_box, end_box, lower, upper))
+
+            slider.setValues(0, max_index)
+
+            row_layout.addWidget(dimension_label, 0, 0)
+            row_layout.addWidget(slider, 0, 1, 1, 4)
+            row_layout.addWidget(QtWidgets.QLabel('start'), 1, 0)
+            row_layout.addWidget(start_spinbox, 1, 1)
+            row_layout.addItem(QtWidgets.QSpacerItem(24, 1, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum), 1, 2)
+            row_layout.addWidget(QtWidgets.QLabel('end'), 1, 3)
+            row_layout.addWidget(end_spinbox, 1, 4)
+            row_layout.setColumnStretch(1, 0)
+            row_layout.setColumnStretch(2, 1)
+            row_layout.setColumnStretch(4, 0)
+            content_layout.addWidget(row_widget)
+            self._controls.append((slider, start_spinbox, end_spinbox))
+
+        content_layout.addStretch(1)
+
+        scroll_area.setWidget(content)
+        scroll_area.setMaximumHeight(min(440, 84 * max(len(data_shape), 1)))
+        layout.addWidget(scroll_area)
+
+        footer_layout = QtWidgets.QHBoxLayout()
+        footer_layout.setContentsMargins(0, 0, 0, 0)
+        footer_layout.setSpacing(12)
+        self._squeeze_checkbox = QtWidgets.QCheckBox('Squeeze singleton dimensions')
+        self._squeeze_checkbox.setChecked(True)
+        self._squeeze_checkbox.toggled.connect(self._update_output_shape_label)
+        self._output_shape_label = QtWidgets.QLabel()
+        self._output_shape_label.setStyleSheet('QLabel { font-size: 9pt; color: palette(windowText); }')
+        footer_layout.addWidget(self._squeeze_checkbox)
+        footer_layout.addStretch(1)
+        footer_layout.addWidget(self._output_shape_label)
+        layout.addLayout(footer_layout)
+
+        buttons = QtWidgets.QDialogButtonBox(
+            QtWidgets.QDialogButtonBox.StandardButton.Save | QtWidgets.QDialogButtonBox.StandardButton.Cancel
+        )
+        buttons.accepted.connect(self.accept)
+        buttons.rejected.connect(self.reject)
+        layout.addWidget(buttons)
+
+        self._update_output_shape_label()
+        self.resize(640, min(560, 150 + 84 * len(data_shape)))
+
+    def _sync_spinboxes(self, start_spinbox, end_spinbox, lower_value, upper_value):
+        start_spinbox.blockSignals(True)
+        end_spinbox.blockSignals(True)
+        start_spinbox.setValue(lower_value)
+        end_spinbox.setValue(upper_value)
+        start_spinbox.blockSignals(False)
+        end_spinbox.blockSignals(False)
+        self._update_output_shape_label()
+
+    def _selected_shape(self):
+        selected_shape = [max(end.value() - start.value() + 1, 0) for _, start, end in self._controls]
+        if self.should_squeeze():
+            squeezed_shape = [size for size in selected_shape if size != 1]
+            return squeezed_shape or [1]
+        return selected_shape
+
+    def _update_output_shape_label(self):
+        self._output_shape_label.setText(f'Output shape: {self._selected_shape()}')
+
+    def get_ranges(self):
+        """Return Python slice bounds as (start, stop) tuples."""
+        return [(start.value(), end.value() + 1) for _, start, end in self._controls]
+
+    def should_squeeze(self):
+        return self._squeeze_checkbox.isChecked()
+
 class NDSliceWindow(QtWidgets.QMainWindow):
     # Styling constants — use pt (point) units so font sizes are DPI-independent
     DIMENSION_LABEL_STYLE = "QLabel { font-size: 9pt; padding: 1px; margin: 2px; }"
@@ -34,6 +322,13 @@ class NDSliceWindow(QtWidgets.QMainWindow):
     SPINBOX_STYLE = "QSpinBox { font-size: 9pt; } QSpinBox:disabled { color: palette(mid); }"
     RADIO_BUTTON_STYLE = "QRadioButton { font-size: 9pt; }"
     GROUPBOX_BASE_STYLE = "QGroupBox { font-size: 9pt; font-weight: bold; border: 1px solid palette(mid); border-radius: 3px; margin-top: 1.4ex; padding-top: 3pt; } QGroupBox::title { subcontrol-origin: margin; left: 8px; padding: 0 3px; }"
+    
+    @staticmethod
+    def _set_emoji_font(widget):
+        if platform.system() == 'Darwin':
+            font = widget.font()
+            font.setFamily('Apple Color Emoji')
+            widget.setFont(font)
 
     def __init__(self, data, complex_dim=None, filepath=None, dataset_path=None, selector_class_name=None):
         super(NDSliceWindow, self).__init__()
@@ -164,12 +459,14 @@ class NDSliceWindow(QtWidgets.QMainWindow):
             flip_label.mousePressEvent = lambda event, i=i: self.flipAxisClicked(event, i)
             flip_label.setStyleSheet(self.FLIP_ICON_STYLE)
             flip_label.setAlignment(Qt.QtCore.Qt.AlignmentFlag.AlignLeft | Qt.QtCore.Qt.AlignmentFlag.AlignVCenter)
+            self._set_emoji_font(flip_label)
         
         # Set up complex indicator labels with click handlers
         for i, complex_label in enumerate(self.widgets['labels']['complex']):
             complex_label.mousePressEvent = lambda event, i=i: self.complexOrRealClicked(event, i)
             complex_label.setStyleSheet(self.FLIP_ICON_STYLE)
             complex_label.setAlignment(Qt.QtCore.Qt.AlignmentFlag.AlignRight | Qt.QtCore.Qt.AlignmentFlag.AlignVCenter)
+            self._set_emoji_font(complex_label)
         
         # Apply compact styling to dimension control widgets
         for label in self.widgets['labels']['dims']:
@@ -241,6 +538,8 @@ class NDSliceWindow(QtWidgets.QMainWindow):
             w.valueChanged.connect(self.update)
         
         self._setup_export_context_menus()
+        self._save_shortcut = QtGui.QShortcut(QtGui.QKeySequence.StandardKey.Save, self)
+        self._save_shortcut.activated.connect(self._save_current_numpy_file)
         
         # Create a single compact control panel with all radio buttons
         controls_widget = QtWidgets.QWidget()
@@ -450,6 +749,7 @@ class NDSliceWindow(QtWidgets.QMainWindow):
         self._reload_btn.setFixedSize(28, 20)
         self._reload_btn.clicked.connect(self._reload_file)
         self._reload_btn.setVisible(filepath is not None)
+        self._set_emoji_font(self._reload_btn)
         self.layouts['topUp'].addWidget(self._reload_btn)
         self.layouts['topUp'].addWidget(self.widgets['labels']['pixelValue'])
         self.layouts['topUp'].addWidget(self.widgets['labels']['arrayInfo'])
@@ -670,7 +970,7 @@ class NDSliceWindow(QtWidgets.QMainWindow):
             button.setEnabled(enabled_channels[name])
 
         if checked_channel not in enabled_channels or not enabled_channels[checked_channel]:
-            checked_channel = 'abs' if enabled_channels['abs'] else 'real'
+            checked_channel = 'abs' if is_complex else 'real'
 
         channel_buttons[checked_channel].setChecked(True)
     
@@ -1489,6 +1789,43 @@ class NDSliceWindow(QtWidgets.QMainWindow):
         progress_dialog = VideoExportDialog(self)
         progress_dialog.start_export(worker, self.data.shape[export_dim])
 
+    def _save_current_numpy_file(self):
+        """Save the currently displayed array state to a NumPy .npy file."""
+        range_dialog = SaveRangeDialog(self, self.data.shape)
+        if range_dialog.exec() != QtWidgets.QDialog.DialogCode.Accepted:
+            return
+
+        ranges = range_dialog.get_ranges()
+        sliced_data = self.data[tuple(slice(start, stop) for start, stop in ranges)]
+        output_data = np.squeeze(sliced_data) if range_dialog.should_squeeze() else sliced_data
+
+        default_name = 'ndslice.npy'
+        if self._filepath is not None:
+            source_path = Path(self._filepath)
+            source_name = source_path.name
+            if source_name.lower().endswith('.nii.gz'):
+                default_name = source_name[:-7] + '.npy'
+            else:
+                default_name = f"{source_path.stem}.npy"
+
+        file_path, _ = QtWidgets.QFileDialog.getSaveFileName(
+            self,
+            "Save current array as NumPy file",
+            default_name,
+            "NumPy files (*.npy)"
+        )
+        if not file_path:
+            return
+
+        if not file_path.lower().endswith('.npy'):
+            file_path += '.npy'
+
+        try:
+            np.save(file_path, output_data)
+            print(f"Saved array {list(output_data.shape)} to {file_path}")
+        except Exception as e:
+            QtWidgets.QMessageBox.warning(self, "Save Error", f"Failed to save NumPy file:\n{e}")
+
     def _on_file_changed(self, path):
         """Called by QFileSystemWatcher when the source file changes on disk."""
         self._reload_btn.setText("⚠️")

{ndslice-0.6.0 → ndslice-0.7.0}/ndslice/video_export.py

@@ -452,15 +452,15 @@ class VideoExportSettingsDialog(QtWidgets.QDialog):
             format_options = [
                 ("PNG frames", "png", True),
                 ("GIF", "gif", True),
-                ("MP4 (requires imageio-ffmpeg)", "mp4", True),
-                ("WebM (requires imageio-ffmpeg)", "webm", True),
+                ("MP4", "mp4", True),
+                ("WebM", "webm", True),
             ]
         else:
             format_options = [
                 ("PNG frames", "png", True),
                 ("GIF", "gif", True),
-                ("MP4", "mp4", False),
-                ("WebM", "webm", False),
+                ("MP4 (requires imageio-ffmpeg)", "mp4", False),
+                ("WebM (requires imageio-ffmpeg)", "webm", False),
             ]
 
 

{ndslice-0.6.0 → ndslice-0.7.0}/ndslice.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: ndslice
-Version: 0.6.0
+Version: 0.7.0
 Summary: Interactive N-dimensional numpy array viewer with FFT support
 Author-email: Henric Rydén <henric.ryden@gmail.com>
-License: MIT
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/henricryden/ndslice
 Project-URL: Documentation, https://github.com/henricryden/ndslice#readme
 Project-URL: Bug Tracker, https://github.com/henricryden/ndslice/issues
@@ -11,7 +11,6 @@ Keywords: visualization,numpy,fft,image-viewer,data-visualization
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -27,31 +26,18 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.20.0
 Requires-Dist: pyqtgraph>=0.14.0
 Requires-Dist: PyQt5>=5.15.0
+Requires-Dist: h5py>=3.0.0
+Requires-Dist: scipy>=1.7.0
+Requires-Dist: pydicom>=2.4.0
+Requires-Dist: nibabel>=4.0.0
+Requires-Dist: imageio>=2.9.0
+Requires-Dist: imageio-ffmpeg>=0.4.2
+Requires-Dist: Pillow>=8.0.0
 Provides-Extra: pyqt6
 Requires-Dist: PyQt6>=6.4.0; extra == "pyqt6"
 Provides-Extra: dev
 Requires-Dist: build>=0.10.0; extra == "dev"
 Requires-Dist: twine>=4.0.0; extra == "dev"
-Provides-Extra: hdf5
-Requires-Dist: h5py>=3.0.0; extra == "hdf5"
-Provides-Extra: matlab
-Requires-Dist: scipy>=1.7.0; extra == "matlab"
-Provides-Extra: dicom
-Requires-Dist: pydicom>=2.4.0; extra == "dicom"
-Provides-Extra: nifti
-Requires-Dist: nibabel>=4.0.0; extra == "nifti"
-Provides-Extra: video-export
-Requires-Dist: imageio>=2.9.0; extra == "video-export"
-Requires-Dist: imageio-ffmpeg>=0.4.2; extra == "video-export"
-Requires-Dist: Pillow>=8.0.0; extra == "video-export"
-Provides-Extra: all
-Requires-Dist: h5py>=3.0.0; extra == "all"
-Requires-Dist: scipy>=1.7.0; extra == "all"
-Requires-Dist: pydicom>=2.4.0; extra == "all"
-Requires-Dist: nibabel>=4.0.0; extra == "all"
-Requires-Dist: imageio>=2.9.0; extra == "all"
-Requires-Dist: imageio-ffmpeg>=0.4.2; extra == "all"
-Requires-Dist: Pillow>=8.0.0; extra == "all"
 Dynamic: license-file
 
 [![Python versions](https://img.shields.io/pypi/pyversions/ndslice.svg)](https://pypi.org/project/ndslice/)
@@ -147,6 +133,9 @@ ndslice(data2)  # Shown after first closes
 ### Command Line
 ```bash
 ndslice data.npy # Numpy file
+ndslice image.nii.gz
+ndslice image.dcm
+ndslice some_dicom_dir/ # Automatically attemps to form an nd-array from DICOM the files
 ndslice --help   # Show all options
 ```
 
@@ -160,10 +149,13 @@ ndslice has CLI support and can conveniently display:
 | [BART](https://mrirecon.github.io/bart/) | `.cfl` + `.hdr` | — |
 | Philips REC | `.REC` + `.xml` | — |
 | [NIfTI](https://nifti.nimh.nih.gov/) | `.nii`, `.nii.gz` | nibabel |
-| DICOM (pixel array) | `.dcm` | pydicom |
+| DICOM file | `.dcm` | pydicom |
+| DICOM directory | directory containing `.dcm` files | pydicom, nibabel, `dcm2niix` on `PATH` |
 
 HDF5 files can be compound complex dtype, or real/imag fields.
 
+For DICOM directories, ndslice does not infer series dimensions itself. It runs `dcm2niix`, then loads the produced NIfTI volume.
+
 If there are multiple datasets in the file, a selection GUI appears which highlights arrays supported by ndslice (essentially numeric).
 Double click to open.
 
@@ -175,11 +167,19 @@ Double click to open.
 ### From PyPI
 
 ```bash
-pip install ndslice 
-pip install ndslice[video_export] # Include video export dependencies (imageio, Pillow, imageio-ffmpeg)
-pip install ndslice[all] # includes all optional dependencies (video export and file formats)
+pip install ndslice
+# Or, if you want just the package without pulling in dependencies:
+pip install --no-deps ndslice
+```
+
+For DICOM directories you also need the external `dcm2niix` binary available on `PATH`. A practical install route is:
+
+```bash
+conda install -c conda-forge dcm2niix
 ```
 
+If `dcm2niix` is missing or conversion fails, ndslice reports a clear error instead of trying to infer the series layout itself.
+
 ### From source
 
 ```bash
@@ -199,7 +199,13 @@ pip install -e .
 - NumPy >= 1.20.0
 - PyQtGraph >= 0.12.0
 - PyQt5 >= 5.15.0
-- h5py >= 3.0.0 (for HDF5 file support in CLI)
+- h5py >= 3.0.0
+- scipy >= 1.7.0
+- pydicom >= 2.4.0
+- nibabel >= 4.0.0
+- imageio >= 2.9.0
+- imageio-ffmpeg >= 0.4.2
+- Pillow >= 8.0.0
 
 ## License
 

{ndslice-0.6.0 → ndslice-0.7.0}/ndslice.egg-info/requires.txt

@@ -1,8 +1,6 @@
 numpy>=1.20.0
 pyqtgraph>=0.14.0
 PyQt5>=5.15.0
-
-[all]
 h5py>=3.0.0
 scipy>=1.7.0
 pydicom>=2.4.0
@@ -15,22 +13,5 @@ Pillow>=8.0.0
 build>=0.10.0
 twine>=4.0.0
 
-[dicom]
-pydicom>=2.4.0
-
-[hdf5]
-h5py>=3.0.0
-
-[matlab]
-scipy>=1.7.0
-
-[nifti]
-nibabel>=4.0.0
-
 [pyqt6]
 PyQt6>=6.4.0
-
-[video_export]
-imageio>=2.9.0
-imageio-ffmpeg>=0.4.2
-Pillow>=8.0.0

{ndslice-0.6.0 → ndslice-0.7.0}/pyproject.toml

@@ -4,18 +4,17 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndslice"
-version = "0.6.0"
+version = "0.7.0"
 description = "Interactive N-dimensional numpy array viewer with FFT support"
 readme = "README.md"
 authors = [
     {name = "Henric Rydén", email = "henric.ryden@gmail.com"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -32,6 +31,13 @@ dependencies = [
     "numpy>=1.20.0",
     "pyqtgraph>=0.14.0",
     "PyQt5>=5.15.0",
+    "h5py>=3.0.0",
+    "scipy>=1.7.0",
+    "pydicom>=2.4.0",
+    "nibabel>=4.0.0",
+    "imageio>=2.9.0",
+    "imageio-ffmpeg>=0.4.2",
+    "Pillow>=8.0.0",
 ]
 
 [project.scripts]
@@ -43,32 +49,6 @@ dev = [
     "build>=0.10.0",
     "twine>=4.0.0",
 ]
-hdf5 = [
-    "h5py>=3.0.0",
-]
-matlab = [
-    "scipy>=1.7.0",
-]
-dicom = [
-    "pydicom>=2.4.0",
-]
-nifti = [
-    "nibabel>=4.0.0",
-]
-video_export = [
-    "imageio>=2.9.0",
-    "imageio-ffmpeg>=0.4.2",
-    "Pillow>=8.0.0",
-]
-all = [
-    "h5py>=3.0.0",
-    "scipy>=1.7.0",
-    "pydicom>=2.4.0",
-    "nibabel>=4.0.0",
-    "imageio>=2.9.0",
-    "imageio-ffmpeg>=0.4.2",
-    "Pillow>=8.0.0",
-]
 [project.urls]
 Homepage = "https://github.com/henricryden/ndslice"
 Documentation = "https://github.com/henricryden/ndslice#readme"