mosamatic2 2.0.3__tar.gz → 2.0.4__tar.gz

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mosamatic2
-Version: 2.0.3
+Version: 2.0.4
 Summary: 
 Author: Ralph Brecheisen
 Author-email: r.brecheisen@maastrichtuniversity.nl
@@ -8,6 +8,7 @@ Requires-Python: >=3.11,<3.12
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: antspyx (>=0.5.4)
+Requires-Dist: dicom2nifti (>=2.6.2)
 Requires-Dist: flask (>=3.1.2)
 Requires-Dist: nibabel (>=5.3.2)
 Requires-Dist: numpy (>=1.26.4)

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mosamatic2"
-version = "2.0.3"
+version = "2.0.4"
 description = ""
 authors = [
     {name = "Ralph Brecheisen", email = "r.brecheisen@maastrichtuniversity.nl"}
@@ -10,6 +10,7 @@ requires-python = ">=3.11,<3.12"
 dependencies = [
     "pyside6-essentials>=6.9",
     "pydicom>=3.0.1",
+    "dicom2nifti>=2.6.2",
     "numpy>=1.26.4",
     "pandas>=2.3.2",
     "nibabel>=5.3.2",

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/cli.py

@@ -4,6 +4,7 @@ from mosamatic2.commands import (
     rescaledicomimages,
     segmentmusclefatl3tensorflow,
     createpngsfromsegmentations,
+    dicom2nifti,
 )
 from mosamatic2.core.utils import show_doc_command
 
@@ -29,4 +30,5 @@ main.add_command(calculatescores.calculatescores)
 main.add_command(rescaledicomimages.rescaledicomimages)
 main.add_command(segmentmusclefatl3tensorflow.segmentmusclefatl3tensorflow)
 main.add_command(createpngsfromsegmentations.createpngsfromsegmentations)
+main.add_command(dicom2nifti.dicom2nifti)
 main.add_command(show_doc_command(main)) # Special command to show long description for command

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/commands/calculatescores.py

@@ -48,7 +48,7 @@ def calculatescores(images, segmentations, output, file_type, overwrite):
     Parameters
     ----------
     --images : str
-        Directory with with input L3 images
+        Directory with input L3 images
 
     --segmentations : str
         Directory with L3 muscle and fat segmenation files. Must be output of 

mosamatic2-2.0.4/src/mosamatic2/commands/dicom2nifti.py

@@ -0,0 +1,46 @@
+import click
+
+from mosamatic2.core.tasks import Dicom2NiftiTask
+
+
+@click.command(help='Converts DICOM series to NIFTI')
+@click.option(
+    '--images', 
+    required=True, 
+    type=click.Path(exists=True), 
+    help='Directory with images',
+)
+@click.option(
+    '--output', 
+    required=True, 
+    type=click.Path(), 
+    help='Output directory'
+)
+@click.option(
+    '--overwrite', 
+    type=click.BOOL, 
+    default=False, 
+    help='Overwrite [true|false]'
+)
+def dicom2nifti(images, output, overwrite):
+    """
+    Converts single DICOM series (scan) to NIFTI
+    
+    Parameters
+    ----------
+    --images : str
+        Directory with DICOM images of a single series
+
+    --output : str
+        Path to output directory
+
+    --overwrite : bool
+        Overwrite contents output directory [true|false]
+    """
+    task = Dicom2NiftiTask(
+        inputs={'images': images},
+        params=None,
+        output=output,
+        overwrite=overwrite,
+    )
+    task.run()

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/commands/rescaledicomimages.py

@@ -34,7 +34,7 @@ def rescaledicomimages(images, output, target_size, overwrite):
     Parameters
     ----------
     --images : str
-        Directory with with input DICOM images
+        Directory with input DICOM images
 
     --output : str
         Path to output directory

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/commands/segmentmusclefatl3tensorflow.py

@@ -35,7 +35,7 @@ def segmentmusclefatl3tensorflow(images, model_files, output, overwrite):
     Parameters
     ----------
     --images : str
-        Directory with with input L3 images
+        Directory with input L3 images
 
     --model_files : str
         Directory with AI model files (model-1.0.zip, contour_model-1.0.zip, params-1.0.json)

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/core/tasks/__init__.py

@@ -1,4 +1,5 @@
 from mosamatic2.core.tasks.rescaledicomimagestask.rescaledicomimagestask import RescaleDicomImagesTask
 from mosamatic2.core.tasks.segmentmusclefatl3tensorflowtask.segmentmusclefatl3tensorflowtask import SegmentMuscleFatL3TensorFlowTask
 from mosamatic2.core.tasks.calculatescorestask.calculatescorestask import CalculateScoresTask
-from mosamatic2.core.tasks.createpngsfromsegmentationstask.createpngsfromsegmentationstask import CreatePngsFromSegmentationsTask
+from mosamatic2.core.tasks.createpngsfromsegmentationstask.createpngsfromsegmentationstask import CreatePngsFromSegmentationsTask
+from mosamatic2.core.tasks.dicom2niftitask.dicom2niftitask import Dicom2NiftiTask

mosamatic2-2.0.4/src/mosamatic2/core/tasks/dicom2niftitask/dicom2niftitask.py

@@ -0,0 +1,24 @@
+import os
+import dicom2nifti
+from mosamatic2.core.tasks.task import Task
+from mosamatic2.core.managers.logmanager import LogManager
+
+LOG = LogManager()
+
+
+class Dicom2NiftiTask(Task):
+    INPUTS = ['images']
+    PARAMS = []
+
+    def __init__(self, inputs, params, output, overwrite):
+        super(Dicom2NiftiTask, self).__init__(inputs, params, output, overwrite)
+
+    def run(self):
+        nifti_file_name = os.path.split(self.input('images'))[1] + '.nii.gz'
+        LOG.info(f'Converting DICOM directory to {nifti_file_name}')
+        dicom2nifti.dicom_series_to_nifti(
+            self.input('images'),
+            os.path.join(self.output(), nifti_file_name),
+            reorient_nifti=True,
+        )
+        self.set_progress(0, 1)

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/core/tasks/task.py

@@ -25,10 +25,11 @@ class Task:
         for k, v in self._inputs.items():
             assert k in self.__class__.INPUTS
             assert isinstance(v, str)
-        # Check that param names match specification
-        assert len(self._params.keys()) == len(self.__class__.PARAMS)
-        for k in self._params.keys():
-            assert k in self.__class__.PARAMS
+        # Check that param names match specification (if not None)
+        if self._params:
+            assert len(self._params.keys()) == len(self.__class__.PARAMS)
+            for k in self._params.keys():
+                assert k in self.__class__.PARAMS
 
     def input(self, name):
         return self._inputs[name]

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/server.py

@@ -5,6 +5,7 @@ from mosamatic2.core.tasks import RescaleDicomImagesTask
 from mosamatic2.core.tasks import SegmentMuscleFatL3TensorFlowTask
 from mosamatic2.core.tasks import CalculateScoresTask
 from mosamatic2.core.tasks import CreatePngsFromSegmentationsTask
+from mosamatic2.core.tasks import Dicom2NiftiTask
 
 app = Flask(__name__)
 
@@ -89,6 +90,20 @@ def run_createpngsfromsegmentations():
     return 'PASSED'
 
 
+@app.route('/dicom2nifti')
+def run_dicom2nifti():
+    images = request.args.get('images')
+    output = request.args.get('output')
+    overwrite = request.args.get('overwrite', default=True, type=bool)
+    task = Dicom2NiftiTask(
+        inputs={'images': images},
+        params=None,
+        output=output,
+        overwrite=overwrite,
+    )
+    task.run()
+    return 'PASSED'
+
 
 def main():
     parser = argparse.ArgumentParser()

{mosamatic2-2.0.3 → mosamatic2-2.0.4}/src/mosamatic2/ui/mainwindow.py

@@ -18,6 +18,7 @@ from mosamatic2.ui.widgets.panels.tasks.rescaledicomimagestaskpanel import Resca
 from mosamatic2.ui.widgets.panels.tasks.segmentmusclefatl3tensorflowtaskpanel import SegmentMuscleFatL3TensorFlowTaskPanel
 from mosamatic2.ui.widgets.panels.tasks.createpngsfromsegmentationstaskpanel import CreatePngsFromSegmentationsTaskPanel
 from mosamatic2.ui.widgets.panels.tasks.calculatescorestaskpanel import CalculateScoresTaskPanel
+from mosamatic2.ui.widgets.panels.tasks.dicom2niftitaskpanel import Dicom2NiftiTaskPanel
 from mosamatic2.ui.widgets.panels.pipelines.defaultpipelinepanel import DefaultPipelinePanel
 
 LOG = LogManager()
@@ -34,6 +35,7 @@ class MainWindow(QMainWindow):
         self._segment_muscle_fat_l3_tensorflow_task_panel = None
         self._create_pngs_from_segmentations_task_panel = None
         self._calculate_scores_task_panel = None
+        self._dicom2nifti_task_panel = None
         self._default_pipeline_panel = None
         self.init_window()
 
@@ -71,11 +73,14 @@ class MainWindow(QMainWindow):
         calculate_scores_task_action.triggered.connect(self.handle_calculate_scores_task_action)
         create_pngs_from_segmentations_task_action = QAction('CreatePngsFromSegmentationsTask', self)
         create_pngs_from_segmentations_task_action.triggered.connect(self.handle_create_pngs_from_segmentations_task_action)
+        dicom2nifti_task_action = QAction('Dicom2NiftiTask', self)
+        dicom2nifti_task_action.triggered.connect(self.handle_dicom2nifti_task_action)
         tasks_menu = self.menuBar().addMenu('Tasks')
         tasks_menu.addAction(rescale_dicom_images_task_action)
         tasks_menu.addAction(segment_muscle_fat_l3_tensorflow_task_action)
         tasks_menu.addAction(calculate_scores_task_action)
         tasks_menu.addAction(create_pngs_from_segmentations_task_action)
+        tasks_menu.addAction(dicom2nifti_task_action)
 
     def init_pipelines_menu(self):
         default_pipeline_action = QAction('DefaultPipeline', self)
@@ -100,6 +105,7 @@ class MainWindow(QMainWindow):
             self._main_panel.add_panel(self.segment_muscle_fat_l3_tensorflow_task_panel(), 'segmentmusclefatl3tensorflowtaskpanel')
             self._main_panel.add_panel(self.create_pngs_from_segmentations_task_panel(), 'createpngsfromsegmentationstaskpanel')
             self._main_panel.add_panel(self.calculate_scores_task_panel(), 'calculatescorestaskpanel')
+            self._main_panel.add_panel(self.dicom2nifti_task_panel(), 'dicom2niftitaskpanel')
             self._main_panel.add_panel(self.default_pipeline_panel(), 'defaultpipelinepanel')
             self._main_panel.select_panel('defaultpipelinepanel')
         return self._main_panel
@@ -132,6 +138,11 @@ class MainWindow(QMainWindow):
             self._calculate_scores_task_panel = CalculateScoresTaskPanel()
         return self._calculate_scores_task_panel
     
+    def dicom2nifti_task_panel(self):
+        if not self._dicom2nifti_task_panel:
+            self._dicom2nifti_task_panel = Dicom2NiftiTaskPanel()
+        return self._dicom2nifti_task_panel
+    
     def default_pipeline_panel(self):
         if not self._default_pipeline_panel:
             self._default_pipeline_panel = DefaultPipelinePanel()
@@ -156,6 +167,9 @@ class MainWindow(QMainWindow):
     def handle_calculate_scores_task_action(self):
         self.main_panel().select_panel('calculatescorestaskpanel')
 
+    def handle_dicom2nifti_task_action(self):
+        self.main_panel().select_panel('dicom2niftitaskpanel')
+
     def handle_default_pipeline_action(self):
         self.main_panel().select_panel('defaultpipelinepanel')
 
@@ -169,6 +183,7 @@ class MainWindow(QMainWindow):
         self.segment_muscle_fat_l3_tensorflow_task_panel().save_inputs_and_parameters()
         self.create_pngs_from_segmentations_task_panel().save_inputs_and_parameters()
         self.calculate_scores_task_panel().save_inputs_and_parameters()
+        self.dicom2nifti_task_panel().save_inputs_and_parameters()
         self.default_pipeline_panel().save_inputs_and_parameters()
         return super().closeEvent(event)
 

mosamatic2-2.0.4/src/mosamatic2/ui/resources/VERSION

@@ -0,0 +1 @@
+2.0.4 

mosamatic2-2.0.4/src/mosamatic2/ui/widgets/panels/tasks/dicom2niftitaskpanel.py

@@ -0,0 +1,183 @@
+import os
+
+from PySide6.QtWidgets import (
+    QLineEdit,
+    QCheckBox,
+    QSpinBox,
+    QHBoxLayout,
+    QVBoxLayout,
+    QFormLayout,
+    QPushButton,
+    QFileDialog,
+    QMessageBox,
+)
+from PySide6.QtCore import (
+    QThread, 
+    Slot,
+)
+
+from mosamatic2.core.managers.logmanager import LogManager
+from mosamatic2.ui.widgets.panels.taskpanel import TaskPanel
+from mosamatic2.ui.settings import Settings
+from mosamatic2.ui.utils import is_macos
+from mosamatic2.ui.worker import Worker
+from mosamatic2.core.tasks import Dicom2NiftiTask
+
+LOG = LogManager()
+
+PANEL_TITLE = 'Dicom2NiftiTask'
+PANEL_NAME = 'dicom2niftitaskpanel'
+
+
+class Dicom2NiftiTaskPanel(TaskPanel):
+    def __init__(self):
+        super(Dicom2NiftiTaskPanel, self).__init__()
+        self.set_title(PANEL_TITLE)
+        self._images_dir_line_edit = None
+        self._images_dir_select_button = None
+        self._output_dir_line_edit = None
+        self._output_dir_select_button = None
+        self._overwrite_checkbox = None
+        self._form_layout = None
+        self._run_task_button = None
+        self._settings = None
+        self._task = None
+        self._worker = None
+        self._thread = None
+        self.init_layout()
+
+    def images_dir_line_edit(self):
+        if not self._images_dir_line_edit:
+            self._images_dir_line_edit = QLineEdit(self.settings().get(f'{PANEL_NAME}/images_dir'))
+        return self._images_dir_line_edit
+    
+    def images_dir_select_button(self):
+        if not self._images_dir_select_button:
+            self._images_dir_select_button = QPushButton('Select')
+            self._images_dir_select_button.clicked.connect(self.handle_images_dir_select_button)
+        return self._images_dir_select_button
+    
+    def output_dir_line_edit(self):
+        if not self._output_dir_line_edit:
+            self._output_dir_line_edit = QLineEdit(self.settings().get(f'{PANEL_NAME}/output_dir'))
+        return self._output_dir_line_edit
+    
+    def output_dir_select_button(self):
+        if not self._output_dir_select_button:
+            self._output_dir_select_button = QPushButton('Select')
+            self._output_dir_select_button.clicked.connect(self.handle_output_dir_select_button)
+        return self._output_dir_select_button
+    
+    def overwrite_checkbox(self):
+        if not self._overwrite_checkbox:
+            self._overwrite_checkbox = QCheckBox('')
+            self._overwrite_checkbox.setChecked(self.settings().get_bool(f'{PANEL_NAME}/overwrite', True))
+        return self._overwrite_checkbox
+    
+    def form_layout(self):
+        if not self._form_layout:
+            self._form_layout = QFormLayout()
+            if is_macos():
+                self._form_layout.setFieldGrowthPolicy(QFormLayout.ExpandingFieldsGrow)
+        return self._form_layout
+    
+    def run_task_button(self):
+        if not self._run_task_button:
+            self._run_task_button = QPushButton('Run task')
+            self._run_task_button.clicked.connect(self.handle_run_task_button)
+        return self._run_task_button
+    
+    def settings(self):
+        if not self._settings:
+            self._settings = Settings()
+        return self._settings
+    
+    def init_layout(self):
+        images_dir_layout = QHBoxLayout()
+        images_dir_layout.addWidget(self.images_dir_line_edit())
+        images_dir_layout.addWidget(self.images_dir_select_button())
+        output_dir_layout = QHBoxLayout()
+        output_dir_layout.addWidget(self.output_dir_line_edit())
+        output_dir_layout.addWidget(self.output_dir_select_button())
+        self.form_layout().addRow('Images directory', images_dir_layout)
+        self.form_layout().addRow('Output directory', output_dir_layout)
+        self.form_layout().addRow('Overwrite', self.overwrite_checkbox())
+        layout = QVBoxLayout()
+        layout.addLayout(self.form_layout())
+        layout.addWidget(self.run_task_button())
+        self.setLayout(layout)
+        self.setObjectName(PANEL_NAME)
+
+    def handle_images_dir_select_button(self):
+        last_directory = self.settings().get('last_directory')
+        directory = QFileDialog.getExistingDirectory(dir=last_directory)
+        if directory:
+            self.images_dir_line_edit().setText(directory)
+            self.settings().set('last_directory', directory)
+
+    def handle_output_dir_select_button(self):
+        last_directory = self.settings().get('last_directory')
+        directory = QFileDialog.getExistingDirectory(dir=last_directory)
+        if directory:
+            self.output_dir_line_edit().setText(directory)
+            self.settings().set('last_directory', directory)
+
+    def handle_run_task_button(self):
+        errors = self.check_inputs_and_parameters()
+        if len(errors) > 0:
+            error_message = 'Following errors were encountered:\n'
+            for error in errors:
+                error_message += f' - {error}\n'
+            QMessageBox.information(self, 'Error', error_message)
+        else:
+            LOG.info('Running task...')
+            self.run_task_button().setEnabled(False)
+            self.save_inputs_and_parameters()
+            self._task = Dicom2NiftiTask(
+                inputs={'images': self.images_dir_line_edit().text()},
+                params=None,
+                output=self.output_dir_line_edit().text(),
+                overwrite=self.overwrite_checkbox().isChecked(),
+            )
+            self._worker = Worker(self._task)
+            self._thread = QThread()
+            self._worker.moveToThread(self._thread)
+            self._thread.started.connect(self._worker.run)
+            self._worker.progress.connect(self.handle_progress)
+            self._worker.status.connect(self.handle_status)
+            self._worker.finished.connect(self.handle_finished)
+            self._worker.finished.connect(self._thread.quit)
+            self._worker.finished.connect(self._worker.deleteLater)
+            self._thread.finished.connect(self._thread.deleteLater)
+            self._thread.start()
+
+    @Slot(int)
+    def handle_progress(self, progress):
+        LOG.info(f'Progress: {progress} / 100%')
+
+    @Slot(str)
+    def handle_status(self, status):
+        LOG.info(f'Status: {status}')
+
+    @Slot()
+    def handle_finished(self):
+        self.run_task_button().setEnabled(True)
+
+    # HELPERS
+
+    def check_inputs_and_parameters(self):
+        errors = []
+        if self.images_dir_line_edit().text() == '':
+            errors.append('Empty images directory path')
+        if not os.path.isdir(self.images_dir_line_edit().text()):
+            errors.append('Images directory does not exist')
+        if self.output_dir_line_edit().text() == '':
+            errors.append('Empty output directory path')
+        if os.path.isdir(self.output_dir_line_edit().text()) and not self.overwrite_checkbox().isChecked():
+            errors.append('Output directory exists but overwrite=False. Please remove output directory first')
+        return errors
+    
+    def save_inputs_and_parameters(self):
+        self.settings().set(f'{PANEL_NAME}/images_dir', self.images_dir_line_edit().text())
+        self.settings().set(f'{PANEL_NAME}/output_dir', self.output_dir_line_edit().text())
+        self.settings().set(f'{PANEL_NAME}/overwrite', self.overwrite_checkbox().isChecked())

mosamatic2-2.0.3/src/mosamatic2/ui/resources/VERSION

@@ -1 +0,0 @@
-2.0.3