mosamatic2 2.0.11__tar.gz → 2.0.13__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of mosamatic2 might be problematic. Click here for more details.

Files changed (104) hide show
  1. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/PKG-INFO +2 -1
  2. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/pyproject.toml +2 -1
  3. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/cli.py +4 -0
  4. mosamatic2-2.0.13/src/mosamatic2/commands/boadockerpipeline.py +48 -0
  5. mosamatic2-2.0.13/src/mosamatic2/commands/defaultdockerpipeline.py +73 -0
  6. mosamatic2-2.0.13/src/mosamatic2/commands/dicom2nifti.py +55 -0
  7. mosamatic2-2.0.13/src/mosamatic2/core/data/multiniftiimage.py +26 -0
  8. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/multinumpyimage.py +4 -4
  9. mosamatic2-2.0.13/src/mosamatic2/core/data/niftiimage.py +13 -0
  10. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/numpyimage.py +1 -1
  11. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/pipelines/__init__.py +2 -1
  12. mosamatic2-2.0.13/src/mosamatic2/core/pipelines/boadockerpipeline/boadockerpipeline.py +70 -0
  13. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/pipelines/defaultdockerpipeline/defaultdockerpipeline.py +5 -12
  14. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/calculatescorestask/calculatescorestask.py +2 -2
  15. mosamatic2-2.0.13/src/mosamatic2/core/tasks/dicom2niftitask/dicom2niftitask.py +41 -0
  16. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/segmentmusclefatl3tensorflowtask/segmentmusclefatl3tensorflowtask.py +3 -0
  17. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/selectslicefromscanstask/selectslicefromscanstask.py +1 -1
  18. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/utils.py +27 -3
  19. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/mainwindow.py +15 -0
  20. mosamatic2-2.0.13/src/mosamatic2/ui/resources/VERSION +1 -0
  21. mosamatic2-2.0.13/src/mosamatic2/ui/widgets/panels/pipelines/boadockerpipelinepanel.py +185 -0
  22. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/pipelines/defaultdockerpipelinepanel.py +0 -14
  23. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/dicom2niftitaskpanel.py +23 -23
  24. mosamatic2-2.0.13/src/mosamatic2/ui/widgets/panels/visualizations/slicevisualization/__init__.py +0 -0
  25. mosamatic2-2.0.11/src/mosamatic2/commands/dicom2nifti.py +0 -46
  26. mosamatic2-2.0.11/src/mosamatic2/core/tasks/dicom2niftitask/dicom2niftitask.py +0 -24
  27. mosamatic2-2.0.11/src/mosamatic2/ui/resources/VERSION +0 -1
  28. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/README.md +0 -0
  29. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/models.py +0 -0
  30. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/__init__.py +0 -0
  31. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/app.py +0 -0
  32. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/__init__.py +0 -0
  33. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/calculatescores.py +0 -0
  34. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/createdicomsummary.py +0 -0
  35. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/createpngsfromsegmentations.py +0 -0
  36. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/defaultpipeline.py +0 -0
  37. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/rescaledicomimages.py +0 -0
  38. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/segmentmusclefatl3tensorflow.py +0 -0
  39. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/commands/selectslicefromscans.py +0 -0
  40. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/constants.py +0 -0
  41. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/__init__.py +0 -0
  42. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/__init__.py +0 -0
  43. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/dicomimage.py +0 -0
  44. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/dicomimageseries.py +0 -0
  45. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/dixonseries.py +0 -0
  46. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/filedata.py +0 -0
  47. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/data/multidicomimage.py +0 -0
  48. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/managers/__init__.py +0 -0
  49. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/managers/logmanager.py +0 -0
  50. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/managers/logmanagerlistener.py +0 -0
  51. {mosamatic2-2.0.11/src/mosamatic2/core/pipelines/defaultdockerpipeline → mosamatic2-2.0.13/src/mosamatic2/core/pipelines/boadockerpipeline}/__init__.py +0 -0
  52. {mosamatic2-2.0.11/src/mosamatic2/core/pipelines/defaultpipeline → mosamatic2-2.0.13/src/mosamatic2/core/pipelines/defaultdockerpipeline}/__init__.py +0 -0
  53. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/calculatescorestask → mosamatic2-2.0.13/src/mosamatic2/core/pipelines/defaultpipeline}/__init__.py +0 -0
  54. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/pipelines/defaultpipeline/defaultpipeline.py +0 -0
  55. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/pipelines/pipeline.py +0 -0
  56. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/singleton.py +0 -0
  57. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/__init__.py +0 -0
  58. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/createdicomsummarytask → mosamatic2-2.0.13/src/mosamatic2/core/tasks/calculatescorestask}/__init__.py +0 -0
  59. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/createpngsfromsegmentationstask → mosamatic2-2.0.13/src/mosamatic2/core/tasks/createdicomsummarytask}/__init__.py +0 -0
  60. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/createdicomsummarytask/createdicomsummarytask.py +0 -0
  61. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/dicom2niftitask → mosamatic2-2.0.13/src/mosamatic2/core/tasks/createpngsfromsegmentationstask}/__init__.py +0 -0
  62. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/createpngsfromsegmentationstask/createpngsfromsegmentationstask.py +0 -0
  63. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/rescaledicomimagestask → mosamatic2-2.0.13/src/mosamatic2/core/tasks/dicom2niftitask}/__init__.py +0 -0
  64. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/segmentmusclefatl3tensorflowtask → mosamatic2-2.0.13/src/mosamatic2/core/tasks/rescaledicomimagestask}/__init__.py +0 -0
  65. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/rescaledicomimagestask/rescaledicomimagestask.py +0 -0
  66. {mosamatic2-2.0.11/src/mosamatic2/core/tasks/selectslicefromscanstask → mosamatic2-2.0.13/src/mosamatic2/core/tasks/segmentmusclefatl3tensorflowtask}/__init__.py +0 -0
  67. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/segmentmusclefatl3tensorflowtask/paramloader.py +0 -0
  68. {mosamatic2-2.0.11/src/mosamatic2/ui → mosamatic2-2.0.13/src/mosamatic2/core/tasks/selectslicefromscanstask}/__init__.py +0 -0
  69. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/core/tasks/task.py +0 -0
  70. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/server.py +0 -0
  71. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets → mosamatic2-2.0.13/src/mosamatic2/ui}/__init__.py +0 -0
  72. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/resources/icons/mosamatic2.icns +0 -0
  73. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/resources/icons/mosamatic2.ico +0 -0
  74. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/resources/icons/spinner.gif +0 -0
  75. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/resources/images/body-composition.jpg +0 -0
  76. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/settings.py +0 -0
  77. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/utils.py +0 -0
  78. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets/dialogs → mosamatic2-2.0.13/src/mosamatic2/ui/widgets}/__init__.py +0 -0
  79. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets/panels → mosamatic2-2.0.13/src/mosamatic2/ui/widgets/dialogs}/__init__.py +0 -0
  80. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/dialogs/dialog.py +0 -0
  81. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/dialogs/helpdialog.py +0 -0
  82. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets/panels/pipelines → mosamatic2-2.0.13/src/mosamatic2/ui/widgets/panels}/__init__.py +0 -0
  83. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/defaultpanel.py +0 -0
  84. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/logpanel.py +0 -0
  85. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/mainpanel.py +0 -0
  86. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets/panels/tasks → mosamatic2-2.0.13/src/mosamatic2/ui/widgets/panels/pipelines}/__init__.py +0 -0
  87. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/pipelines/defaultpipelinepanel.py +0 -0
  88. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/pipelines/pipelinepanel.py +0 -0
  89. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/stackedpanel.py +0 -0
  90. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets/panels/visualizations → mosamatic2-2.0.13/src/mosamatic2/ui/widgets/panels/tasks}/__init__.py +0 -0
  91. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/calculatescorestaskpanel.py +0 -0
  92. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/createdicomsummarytaskpanel.py +0 -0
  93. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/createpngsfromsegmentationstaskpanel.py +0 -0
  94. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/rescaledicomimagestaskpanel.py +0 -0
  95. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/segmentmusclefatl3tensorflowtaskpanel.py +0 -0
  96. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/selectslicefromscanstaskpanel.py +0 -0
  97. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/tasks/taskpanel.py +0 -0
  98. {mosamatic2-2.0.11/src/mosamatic2/ui/widgets/panels/visualizations/slicevisualization → mosamatic2-2.0.13/src/mosamatic2/ui/widgets/panels/visualizations}/__init__.py +0 -0
  99. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/visualizations/slicevisualization/custominteractorstyle.py +0 -0
  100. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/visualizations/slicevisualization/sliceviewer.py +0 -0
  101. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/visualizations/slicevisualization/slicevisualization.py +0 -0
  102. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/panels/visualizations/visualization.py +0 -0
  103. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/widgets/splashscreen.py +0 -0
  104. {mosamatic2-2.0.11 → mosamatic2-2.0.13}/src/mosamatic2/ui/worker.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: mosamatic2
3
- Version: 2.0.11
3
+ Version: 2.0.13
4
4
  Summary:
5
5
  Author: Ralph Brecheisen
6
6
  Author-email: r.brecheisen@maastrichtuniversity.nl
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
9
9
  Classifier: Programming Language :: Python :: 3.11
10
10
  Requires-Dist: antspyx (>=0.5.4)
11
11
  Requires-Dist: dicom2nifti (>=2.6.2)
12
+ Requires-Dist: docker
12
13
  Requires-Dist: flask (>=3.1.2)
13
14
  Requires-Dist: moosez
14
15
  Requires-Dist: nibabel (>=5.3.2)
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "mosamatic2"
3
- version = "2.0.11"
3
+ version = "2.0.13"
4
4
  description = ""
5
5
  authors = [
6
6
  {name = "Ralph Brecheisen", email = "r.brecheisen@maastrichtuniversity.nl"}
@@ -34,6 +34,7 @@ dependencies = [
34
34
  "vtk>=9.5.1",
35
35
  "pyqtgraph>=0.13.7",
36
36
  "moosez",
37
+ "docker",
37
38
  ]
38
39
 
39
40
  [tool.poetry]
@@ -8,6 +8,8 @@ from mosamatic2.commands import (
8
8
  selectslicefromscans,
9
9
  createdicomsummary,
10
10
  defaultpipeline,
11
+ defaultdockerpipeline,
12
+ boadockerpipeline,
11
13
  )
12
14
  from mosamatic2.core.utils import show_doc_command
13
15
 
@@ -37,4 +39,6 @@ main.add_command(dicom2nifti.dicom2nifti)
37
39
  main.add_command(selectslicefromscans.selectslicefromscans)
38
40
  main.add_command(createdicomsummary.createdicomsummary)
39
41
  main.add_command(defaultpipeline.defaultpipeline)
42
+ main.add_command(defaultdockerpipeline.defaultdockerpipeline)
43
+ main.add_command(boadockerpipeline.boadockerpipeline)
40
44
  main.add_command(show_doc_command(main)) # Special command to show long description for command
@@ -0,0 +1,48 @@
1
+ import click
2
+
3
+ from mosamatic2.core.pipelines import BoaDockerPipeline
4
+
5
+
6
+ @click.command(help='Runs 3D body composition analysis pipeline using BOA algorithm')
7
+ @click.option(
8
+ '--scans',
9
+ required=True,
10
+ type=click.Path(exists=True),
11
+ help='Root directory with scan directories for each patient (no spaces allowed)',
12
+ )
13
+ @click.option(
14
+ '--output',
15
+ required=True,
16
+ type=click.Path(),
17
+ help='Output directory (no spaces allowed)'
18
+ )
19
+ @click.option(
20
+ '--overwrite',
21
+ type=click.BOOL,
22
+ default=False,
23
+ help='Overwrite [true|false]'
24
+ )
25
+ def boadockerpipeline(scans, output, overwrite):
26
+ """
27
+ Runs 3D body composition analysis pipeline using BOA algorithm.
28
+
29
+ Parameters
30
+ ----------
31
+ --scans : str
32
+ Root directory with scan directories for each patient. Each scan directory should
33
+ contain DICOM images for a single scan only and nothing else. Also, the directory
34
+ paths cannot contain any spaces.
35
+
36
+ --output : str
37
+ Path to output directory. No spaces allowed.
38
+
39
+ --overwrite : bool
40
+ Overwrite contents output directory [true|false]
41
+ """
42
+ pipeline = BoaDockerPipeline(
43
+ inputs={'scans': scans},
44
+ params=None,
45
+ output=output,
46
+ overwrite=overwrite,
47
+ )
48
+ pipeline.run()
@@ -0,0 +1,73 @@
1
+ import click
2
+
3
+ from mosamatic2.core.pipelines import DefaultDockerPipeline
4
+
5
+
6
+ @click.command(help='Runs default L3 analysis pipeline through Docker')
7
+ @click.option(
8
+ '--images',
9
+ required=True,
10
+ type=click.Path(exists=True),
11
+ help='Directory with L3 images (no spaces allowed)',
12
+ )
13
+ @click.option(
14
+ '--model_files',
15
+ required=True,
16
+ type=click.Path(),
17
+ help='Input directory with AI model files (no spaces allowed)'
18
+ )
19
+ @click.option(
20
+ '--output',
21
+ required=True,
22
+ type=click.Path(),
23
+ help='Output directory (no spaces allowed)'
24
+ )
25
+ @click.option(
26
+ '--overwrite',
27
+ type=click.BOOL,
28
+ default=False,
29
+ help='Overwrite [true|false]'
30
+ )
31
+ def defaultdockerpipeline(images, model_files, output, overwrite):
32
+ """
33
+ Runs default L3 analysis pipeline through Docker
34
+
35
+ Parameters
36
+ ----------
37
+ --images : str
38
+ Directory with L3 images. Warning: This directory path cannot contain any spaces!
39
+ Docker has issues working with that.
40
+
41
+ --model_files : str
42
+ Directory with AI model files. This directory can ONLY contain the following
43
+ files:
44
+
45
+ (1) contour_model-1.0.zip
46
+ (2) model-1.0.zip
47
+ (3) params-1.0.json
48
+
49
+ These files can be downloaded from:
50
+ https://mosamatic.rbeesoft.nl/wordpress/mosamatic/installation/
51
+
52
+ Warning: This directory path cannot contain any spaces!
53
+
54
+ --output : str
55
+ Path to output directory (no spaces!)
56
+
57
+ --overwrite : bool
58
+ Overwrite contents output directory [true|false]
59
+ """
60
+ pipeline = DefaultDockerPipeline(
61
+ inputs={'images': images, 'model_files': model_files},
62
+ params={
63
+ 'target_size': 512,
64
+ 'model_type': 'tensorflow',
65
+ 'model_version': 1.0,
66
+ 'file_type': 'npy',
67
+ 'fig_width': 10,
68
+ 'fig_height': 10,
69
+ },
70
+ output=output,
71
+ overwrite=overwrite,
72
+ )
73
+ pipeline.run()
@@ -0,0 +1,55 @@
1
+ import click
2
+
3
+ from mosamatic2.core.tasks import Dicom2NiftiTask
4
+
5
+
6
+ @click.command(help='Converts root directory with DICOM series to NIFTI format')
7
+ @click.option(
8
+ '--scans',
9
+ required=True,
10
+ type=click.Path(exists=True),
11
+ help='Root directory with DICOM scans (one for each patient)',
12
+ )
13
+ @click.option(
14
+ '--compressed',
15
+ type=click.BOOL,
16
+ default=True,
17
+ help='Compress with gzip [true|false] (default: True)'
18
+ )
19
+ @click.option(
20
+ '--output',
21
+ required=True,
22
+ type=click.Path(),
23
+ help='Output directory'
24
+ )
25
+ @click.option(
26
+ '--overwrite',
27
+ type=click.BOOL,
28
+ default=False,
29
+ help='Overwrite [true|false]'
30
+ )
31
+ def dicom2nifti(scans, compressed, output, overwrite):
32
+ """
33
+ Converts DICOM scans to NIFTI format.
34
+
35
+ Parameters
36
+ ----------
37
+ --scans : str
38
+ Root directory with DICOM scans (one subdirectory for each patient)
39
+
40
+ --compressed : bool
41
+ Whether to compress the NIFTI file with gzip or not (default: True)
42
+
43
+ --output : str
44
+ Path to output directory
45
+
46
+ --overwrite : bool
47
+ Overwrite contents output directory [true|false]
48
+ """
49
+ task = Dicom2NiftiTask(
50
+ inputs={'scans': scans},
51
+ params={'compressed': compressed},
52
+ output=output,
53
+ overwrite=overwrite,
54
+ )
55
+ task.run()
@@ -0,0 +1,26 @@
1
+ import os
2
+ from mosamatic2.core.managers.logmanager import LogManager
3
+ from mosamatic2.core.data.filedata import FileData
4
+ from mosamatic2.core.data.niftiimage import NiftiImage
5
+
6
+ LOG = LogManager()
7
+
8
+
9
+ class MultiNiftiImage(FileData):
10
+ def __init__(self):
11
+ super(MultiNiftiImage, self).__init__()
12
+ self._images = []
13
+
14
+ def images(self):
15
+ return self._images
16
+
17
+ def load(self):
18
+ if self.path():
19
+ for f in os.listdir(self.path()):
20
+ f_path = os.path.join(self.path(), f)
21
+ image = NiftiImage()
22
+ image.set_path(f_path)
23
+ if image.load():
24
+ self._images.append(image)
25
+ return True
26
+ return False
@@ -1,14 +1,14 @@
1
1
  import os
2
2
  from mosamatic2.core.managers.logmanager import LogManager
3
3
  from mosamatic2.core.data.filedata import FileData
4
- from mosamatic2.core.data.numpyimage import NumPyImage
4
+ from mosamatic2.core.data.numpyimage import NumpyImage
5
5
 
6
6
  LOG = LogManager()
7
7
 
8
8
 
9
- class MultiNumPyImage(FileData):
9
+ class MultiNumpyImage(FileData):
10
10
  def __init__(self):
11
- super(MultiNumPyImage, self).__init__()
11
+ super(MultiNumpyImage, self).__init__()
12
12
  self._images = []
13
13
 
14
14
  def images(self):
@@ -18,7 +18,7 @@ class MultiNumPyImage(FileData):
18
18
  if self.path():
19
19
  for f in os.listdir(self.path()):
20
20
  f_path = os.path.join(self.path(), f)
21
- image = NumPyImage()
21
+ image = NumpyImage()
22
22
  image.set_path(f_path)
23
23
  if image.load():
24
24
  self._images.append(image)
@@ -0,0 +1,13 @@
1
+ from mosamatic2.core.data.filedata import FileData
2
+ from mosamatic2.core.utils import (
3
+ is_nifti,
4
+ load_nifti,
5
+ )
6
+
7
+ class NiftiImage(FileData):
8
+ def load(self):
9
+ if self.path():
10
+ if is_nifti(self.path()):
11
+ self.set_object(load_nifti(self.path()))
12
+ return True
13
+ return False
@@ -4,7 +4,7 @@ from mosamatic2.core.utils import (
4
4
  load_numpy_array,
5
5
  )
6
6
 
7
- class NumPyImage(FileData):
7
+ class NumpyImage(FileData):
8
8
  def load(self):
9
9
  if self.path():
10
10
  if is_numpy(self.path()):
@@ -1,2 +1,3 @@
1
1
  from mosamatic2.core.pipelines.defaultpipeline.defaultpipeline import DefaultPipeline
2
- from mosamatic2.core.pipelines.defaultdockerpipeline.defaultdockerpipeline import DefaultDockerPipeline
2
+ from mosamatic2.core.pipelines.defaultdockerpipeline.defaultdockerpipeline import DefaultDockerPipeline
3
+ from mosamatic2.core.pipelines.boadockerpipeline.boadockerpipeline import BoaDockerPipeline
@@ -0,0 +1,70 @@
1
+ import os
2
+ from mosamatic2.core.pipelines.pipeline import Pipeline
3
+ from mosamatic2.core.tasks import Dicom2NiftiTask
4
+ from mosamatic2.core.managers.logmanager import LogManager
5
+ from mosamatic2.core.utils import (
6
+ is_docker_running,
7
+ to_unix_path,
8
+ current_time_in_seconds,
9
+ elapsed_time_in_seconds,
10
+ duration,
11
+ )
12
+
13
+ LOG = LogManager()
14
+
15
+
16
+ class BoaDockerPipeline(Pipeline):
17
+ INPUTS = ['scans']
18
+ PARAMS = []
19
+
20
+ def __init__(self, inputs, params, output, overwrite):
21
+ super(BoaDockerPipeline, self).__init__(inputs, params, output, overwrite)
22
+
23
+ def load_nifti_files(self):
24
+ nifti_files_dir = os.path.join(self.output(), 'dicom2niftitask')
25
+ nifti_files = []
26
+ for f in os.listdir(nifti_files_dir):
27
+ f_path = os.path.join(nifti_files_dir, f)
28
+ if f.endswith('.nii') or f.endswith('.nii.gz'):
29
+ nifti_files.append(f_path)
30
+ return nifti_files
31
+
32
+ def run(self):
33
+ assert is_docker_running()
34
+ # First convert DICOM series to NIFTI format
35
+ dicom2nifti_task = Dicom2NiftiTask(
36
+ inputs={'scans': self.input('scans')},
37
+ params={'compressed': True},
38
+ output=self.output(),
39
+ overwrite=self.overwrite(),
40
+ )
41
+ dicom2nifti_task.run()
42
+ # Load NIFTI file paths
43
+ nifti_files = self.load_nifti_files()
44
+ workspaces_dir = to_unix_path(os.path.join(self.output(), 'workspaces'))
45
+ os.makedirs(workspaces_dir, exist_ok=True)
46
+ weights_dir = to_unix_path(os.path.join(self.output(), 'weights'))
47
+ start_time = current_time_in_seconds()
48
+ for f in nifti_files:
49
+ start_time_f = current_time_in_seconds()
50
+ f = to_unix_path(f)
51
+ dir_name = os.path.split(f)[1][:-7]
52
+ workspace = to_unix_path(os.path.join(workspaces_dir, dir_name))
53
+ # Build Docker script
54
+ docker_script = 'docker run --rm ' + \
55
+ '-v "{}":/image.nii.gz '.format(f) + \
56
+ '-v "{}":/workspace '.format(workspace) + \
57
+ '-v "{}":/app/weights '.format(weights_dir) + \
58
+ '--gpus all ' + \
59
+ '--network host ' + \
60
+ '--shm-size=8g --ulimit memlock=-1 --ulimit stack=67108864 ' + \
61
+ '--entrypoint /bin/sh ' + \
62
+ 'shipai/boa-cli -c ' + \
63
+ '"python body_organ_analysis --input-image /image.nii.gz --output-dir /workspace/ --models all --verbose"'
64
+ LOG.info(f'Running BOA Docker script: {docker_script}')
65
+ # Run Docker script
66
+ os.system(docker_script)
67
+ elapsed_f = elapsed_time_in_seconds(start_time_f)
68
+ LOG.info(f'Elapsed {dir_name}: {duration(elapsed_f)}')
69
+ elapsed_total = elapsed_time_in_seconds(start_time)
70
+ LOG.info(f'Elapsed total: {duration(elapsed_total)}')
@@ -1,17 +1,9 @@
1
1
  import os
2
-
3
2
  from mosamatic2.core.pipelines.pipeline import Pipeline
4
3
  from mosamatic2.core.managers.logmanager import LogManager
4
+ from mosamatic2.core.utils import is_docker_running, to_unix_path
5
5
 
6
6
  LOG = LogManager()
7
- DOCKER_SCRIPT = """
8
- docker run --rm ^
9
- -v "%IMAGES%":/data/images ^
10
- -v "%MODEL_FILES%":/data/model_files ^
11
- -v "%OUTPUT%":/data/output ^
12
- brecheisen/mosamatic2-cli:%VERSION% defaultpipeline ^
13
- --images /data/images --model_files /data/model_files --output /data/output --overwrite true
14
- """
15
7
 
16
8
 
17
9
  class DefaultDockerPipeline(Pipeline):
@@ -32,10 +24,11 @@ class DefaultDockerPipeline(Pipeline):
32
24
  super(DefaultDockerPipeline, self).__init__(inputs, params, output, overwrite)
33
25
 
34
26
  def run(self):
27
+ assert is_docker_running()
35
28
  docker_script = 'docker run --rm ' + \
36
- '-v "{}":/data/images '.format(self.input('images')) + \
37
- '-v "{}":/data/model_files '.format(self.input('model_files')) + \
38
- '-v "{}":/data/output '.format(self.output()) + \
29
+ '-v "{}":/data/images '.format(to_unix_path(self.input('images'))) + \
30
+ '-v "{}":/data/model_files '.format(to_unix_path(self.input('model_files'))) + \
31
+ '-v "{}":/data/output '.format(to_unix_path(self.output())) + \
39
32
  'brecheisen/mosamatic2-cli:{} defaultpipeline '.format(self.param('version')) + \
40
33
  '--images /data/images --model_files /data/model_files --output /data/output --overwrite true'
41
34
  LOG.info(f'Running Docker script: {docker_script}')
@@ -4,7 +4,7 @@ import pandas as pd
4
4
  from mosamatic2.core.tasks.task import Task
5
5
  from mosamatic2.core.managers.logmanager import LogManager
6
6
  from mosamatic2.core.data.multidicomimage import MultiDicomImage
7
- from mosamatic2.core.data.numpyimage import NumPyImage
7
+ from mosamatic2.core.data.numpyimage import NumpyImage
8
8
  from mosamatic2.core.utils import (
9
9
  get_pixels_from_dicom_object,
10
10
  calculate_area,
@@ -74,7 +74,7 @@ class CalculateScoresTask(Task):
74
74
 
75
75
  def load_segmentation(self, f, file_type='npy'):
76
76
  if file_type == 'npy':
77
- segmentation = NumPyImage()
77
+ segmentation = NumpyImage()
78
78
  segmentation.set_path(f)
79
79
  if segmentation.load():
80
80
  return segmentation.object()
@@ -0,0 +1,41 @@
1
+ import os
2
+ import dicom2nifti
3
+ from mosamatic2.core.tasks.task import Task
4
+ from mosamatic2.core.managers.logmanager import LogManager
5
+ from mosamatic2.core.utils import is_dicom
6
+
7
+ LOG = LogManager()
8
+
9
+
10
+ class Dicom2NiftiTask(Task):
11
+ INPUTS = ['scans']
12
+ PARAMS = ['compressed']
13
+
14
+ def __init__(self, inputs, params, output, overwrite):
15
+ super(Dicom2NiftiTask, self).__init__(inputs, params, output, overwrite)
16
+
17
+ def load_scan_dirs(self):
18
+ scan_dirs = []
19
+ for d in os.listdir(self.input('scans')):
20
+ scan_dir = os.path.join(self.input('scans'), d)
21
+ if os.path.isdir(scan_dir):
22
+ scan_dirs.append(scan_dir)
23
+ return scan_dirs
24
+
25
+ def run(self):
26
+ scan_dirs = self.load_scan_dirs()
27
+ nr_steps = len(scan_dirs)
28
+ for step in range(nr_steps):
29
+ scan_dir = scan_dirs[step]
30
+ scan_name = os.path.split(scan_dir)[1]
31
+ if self.param('compressed'):
32
+ nifti_file_name = scan_name + '.nii.gz'
33
+ else:
34
+ nifti_file_name = scan_name + '.nii'
35
+ LOG.info(f'Converting DICOM series in {scan_dir} to {nifti_file_name}')
36
+ dicom2nifti.dicom_series_to_nifti(
37
+ scan_dir,
38
+ os.path.join(self.output(), nifti_file_name),
39
+ reorient_nifti=True,
40
+ )
41
+ self.set_progress(step, nr_steps)
@@ -9,6 +9,7 @@ from mosamatic2.core.tasks.task import Task
9
9
  from mosamatic2.core.tasks.segmentmusclefatl3tensorflowtask.paramloader import ParamLoader
10
10
  from mosamatic2.core.data.multidicomimage import MultiDicomImage
11
11
  from mosamatic2.core.data.dicomimage import DicomImage
12
+ from mosamatic2.core.managers.logmanager import LogManager
12
13
  from mosamatic2.core.utils import (
13
14
  normalize_between,
14
15
  get_pixels_from_dicom_object,
@@ -16,6 +17,8 @@ from mosamatic2.core.utils import (
16
17
  )
17
18
 
18
19
  DEVICE = 'cpu'
20
+ L3_INDEX = 167
21
+ LOG = LogManager()
19
22
 
20
23
 
21
24
  class SegmentMuscleFatL3TensorFlowTask(Task):
@@ -30,7 +30,7 @@ class SelectSliceFromScansTask(Task):
30
30
  os.makedirs(self._error_dir, exist_ok=True)
31
31
  self._error_file = os.path.join(self._error_dir, 'errors.txt')
32
32
  with open(self._error_file, 'w') as f:
33
- f.write('Errors:\n')
33
+ f.write('Errors:\n\n')
34
34
  LOG.info(f'Error directory: {self._error_dir}')
35
35
 
36
36
  def write_error(self, message):
@@ -5,6 +5,7 @@ import textwrap
5
5
  import math
6
6
  import pendulum
7
7
  import numpy as np
8
+ import nibabel as nb
8
9
  import struct
9
10
  import binascii
10
11
  import pydicom
@@ -134,6 +135,16 @@ def is_jpeg2000_compressed(p):
134
135
  return False
135
136
 
136
137
 
138
+ def is_nifti(f):
139
+ return f.endswith('.nii') or f.endswith('.nii.gz')
140
+
141
+
142
+ def load_nifti(f):
143
+ if is_nifti(f):
144
+ return nb.load(f)
145
+ return None
146
+
147
+
137
148
  def is_numpy_array(value):
138
149
  return isinstance(value, np.array)
139
150
 
@@ -149,8 +160,7 @@ def is_numpy(f):
149
160
  def load_numpy_array(f):
150
161
  if is_numpy(f):
151
162
  return np.load(f)
152
- else:
153
- return None
163
+ return None
154
164
 
155
165
 
156
166
  def get_pixels_from_tag_file(tag_file_path):
@@ -340,4 +350,18 @@ def convert_numpy_array_to_png_image(
340
350
  png_file_name += '.png'
341
351
  png_file_path = os.path.join(output_dir_path, png_file_name)
342
352
  image.save(png_file_path)
343
- return png_file_path
353
+ return png_file_path
354
+
355
+
356
+ def is_docker_running():
357
+ import docker
358
+ try:
359
+ client = docker.from_env()
360
+ client.ping()
361
+ return True
362
+ except Exception:
363
+ return False
364
+
365
+
366
+ def to_unix_path(path):
367
+ return path.replace("\\", "/").replace(" ", "\\ ")
@@ -23,6 +23,7 @@ from mosamatic2.ui.widgets.panels.tasks.createdicomsummarytaskpanel import Creat
23
23
  from mosamatic2.ui.widgets.panels.tasks.selectslicefromscanstaskpanel import SelectSliceFromScansTaskPanel
24
24
  from mosamatic2.ui.widgets.panels.pipelines.defaultpipelinepanel import DefaultPipelinePanel
25
25
  from mosamatic2.ui.widgets.panels.pipelines.defaultdockerpipelinepanel import DefaultDockerPipelinePanel
26
+ from mosamatic2.ui.widgets.panels.pipelines.boadockerpipelinepanel import BoaDockerPipelinePanel
26
27
  from mosamatic2.ui.widgets.panels.visualizations.slicevisualization.slicevisualization import SliceVisualization
27
28
 
28
29
  LOG = LogManager()
@@ -44,6 +45,7 @@ class MainWindow(QMainWindow):
44
45
  self._select_slice_from_scans_task_panel = None
45
46
  self._default_pipeline_panel = None
46
47
  self._default_docker_pipeline_panel = None
48
+ self._boa_docker_pipeline_panel = None
47
49
  self._slice_visualization = None
48
50
  self.init_window()
49
51
 
@@ -102,9 +104,12 @@ class MainWindow(QMainWindow):
102
104
  default_pipeline_action.triggered.connect(self.handle_default_pipeline_action)
103
105
  default_docker_pipeline_action = QAction('DefaultDockerPipeline', self)
104
106
  default_docker_pipeline_action.triggered.connect(self.handle_default_docker_pipeline_action)
107
+ boa_docker_pipeline_action = QAction('BoaDockerPipeline', self)
108
+ boa_docker_pipeline_action.triggered.connect(self.handle_boa_docker_pipeline_action)
105
109
  pipelines_menu = self.menuBar().addMenu('Pipelines')
106
110
  pipelines_menu.addAction(default_pipeline_action)
107
111
  pipelines_menu.addAction(default_docker_pipeline_action)
112
+ pipelines_menu.addAction(boa_docker_pipeline_action)
108
113
 
109
114
  def init_visualizations_menu(self):
110
115
  slice_visualization_action = QAction('SliceVisualization', self)
@@ -134,6 +139,7 @@ class MainWindow(QMainWindow):
134
139
  self._main_panel.add_panel(self.select_slice_from_scans_task_panel(), 'selectslicefromscanstaskpanel')
135
140
  self._main_panel.add_panel(self.default_pipeline_panel(), 'defaultpipelinepanel')
136
141
  self._main_panel.add_panel(self.default_docker_pipeline_panel(), 'defaultdockerpipelinepanel')
142
+ self._main_panel.add_panel(self.boa_docker_pipeline_panel(), 'boadockerpipelinepanel')
137
143
  self._main_panel.add_panel(self.slice_visualization(), 'slicevisualization')
138
144
  self._main_panel.select_panel('defaultpipelinepanel')
139
145
  return self._main_panel
@@ -190,6 +196,11 @@ class MainWindow(QMainWindow):
190
196
  if not self._default_docker_pipeline_panel:
191
197
  self._default_docker_pipeline_panel = DefaultDockerPipelinePanel()
192
198
  return self._default_docker_pipeline_panel
199
+
200
+ def boa_docker_pipeline_panel(self):
201
+ if not self._boa_docker_pipeline_panel:
202
+ self._boa_docker_pipeline_panel = BoaDockerPipelinePanel()
203
+ return self._boa_docker_pipeline_panel
193
204
 
194
205
  def slice_visualization(self):
195
206
  if not self._slice_visualization:
@@ -230,6 +241,9 @@ class MainWindow(QMainWindow):
230
241
  def handle_default_docker_pipeline_action(self):
231
242
  self.main_panel().select_panel('defaultdockerpipelinepanel')
232
243
 
244
+ def handle_boa_docker_pipeline_action(self):
245
+ self.main_panel().select_panel('boadockerpipelinepanel')
246
+
233
247
  def handle_slice_visualization_action(self):
234
248
  self.main_panel().select_panel('slicevisualization')
235
249
 
@@ -248,6 +262,7 @@ class MainWindow(QMainWindow):
248
262
  self.select_slice_from_scans_task_panel().save_inputs_and_parameters()
249
263
  self.default_pipeline_panel().save_inputs_and_parameters()
250
264
  self.default_docker_pipeline_panel().save_inputs_and_parameters()
265
+ self.boa_docker_pipeline_panel().save_inputs_and_parameters()
251
266
  self.slice_visualization().save_inputs_and_parameters()
252
267
  return super().closeEvent(event)
253
268