rt-utils 1.4.0__tar.gz → 1.4.1__tar.gz

{rt_utils-1.4.0/rt_utils.egg-info → rt_utils-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rt-utils
-Version: 1.4.0
+Version: 1.4.1
 Summary: A small library for handling masks and RT-Structs
 Author-email: Asim Shrestha <asim.shrestha@hotmail.com>
 License-Expression: MIT
@@ -33,7 +33,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydicom
 Requires-Dist: numpy
-Requires-Dist: opencv-python>=4.0.0
+Requires-Dist: opencv-python-headless>=4.0.0
 Provides-Extra: nifti
 Requires-Dist: SimpleITK; extra == "nifti"
 Provides-Extra: dev
@@ -71,18 +71,12 @@ RT-Utils provides a builder class to faciliate the creation and loading of an RT
 The format for the ROI mask is an nd numpy array of type bool. It is an array of 2d binary masks, one plane for each slice location within the DICOM series. The slices should be sorted in ascending order within the mask. Through these masks, we extract the contours of the regions of interest and place them within the RT Struct file. Note that there is currently only support for the use of one frame of reference UID and structered set ROI sequence. Also note that holes within the ROI may be handled poorly.
 
 ## Installation
-```
+```bash
 pip install rt_utils
 ```
-##
-**libGL**  
-   libGL is a required system dependency. Install it on Linux using:
-   ```
-   ```bash
-   sudo apt install libgl1
-```
+
 ## Installation in editable mode
-```
+```bash
 git clone https://github.com/qurit/rt-utils.git
 cd rt-utils
 pip install -e .

{rt_utils-1.4.0 → rt_utils-1.4.1}/README.md

@@ -26,18 +26,12 @@ RT-Utils provides a builder class to faciliate the creation and loading of an RT
 The format for the ROI mask is an nd numpy array of type bool. It is an array of 2d binary masks, one plane for each slice location within the DICOM series. The slices should be sorted in ascending order within the mask. Through these masks, we extract the contours of the regions of interest and place them within the RT Struct file. Note that there is currently only support for the use of one frame of reference UID and structered set ROI sequence. Also note that holes within the ROI may be handled poorly.
 
 ## Installation
-```
+```bash
 pip install rt_utils
 ```
-##
-**libGL**  
-   libGL is a required system dependency. Install it on Linux using:
-   ```
-   ```bash
-   sudo apt install libgl1
-```
+
 ## Installation in editable mode
-```
+```bash
 git clone https://github.com/qurit/rt-utils.git
 cd rt-utils
 pip install -e .

{rt_utils-1.4.0 → rt_utils-1.4.1}/pyproject.toml

@@ -38,7 +38,7 @@ classifiers = [
 dependencies = [
     "pydicom",
     "numpy",
-    "opencv-python>=4.0.0",
+    "opencv-python-headless>=4.0.0",
 ]
 dynamic = ["version"]
 

{rt_utils-1.4.0 → rt_utils-1.4.1}/rt_utils/_version.py

@@ -1,3 +1,3 @@
 """RT-Utils package version."""
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"

{rt_utils-1.4.0 → rt_utils-1.4.1}/rt_utils/rtstruct.py

@@ -23,6 +23,26 @@ class RTStruct:
         """
         self.ds.SeriesDescription = description
 
+    def _next_roi_number(self) -> int:
+        """Return an ROINumber not already used in this structure set.
+
+        Counting the sequence is not enough. An ROI deleted in another
+        application leaves a gap, so len(StructureSetROISequence) + 1 can
+        collide with an ROINumber that is still in use. ROINumber is the key
+        that ties StructureSetROISequence to ROIContourSequence, so a
+        duplicate silently associates two ROIs with the same contours.
+
+        DICOM numbers ROIs from 1, so an empty structure set yields 1.
+        """
+        used = []
+        for structure_roi in self.ds.StructureSetROISequence:
+            try:
+                used.append(int(structure_roi.ROINumber))
+            except (AttributeError, TypeError, ValueError):
+                continue
+
+        return max(used, default=0) + 1
+
     def add_roi(
         self,
         mask: np.ndarray,
@@ -83,7 +103,7 @@ class RTStruct:
         """
         # TODO: test if name already exists
         self.validate_mask(mask)
-        roi_number = len(self.ds.StructureSetROISequence) + 1
+        roi_number = self._next_roi_number()
         roi_data = ROIData(
             mask,
             color,

{rt_utils-1.4.0 → rt_utils-1.4.1/rt_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rt-utils
-Version: 1.4.0
+Version: 1.4.1
 Summary: A small library for handling masks and RT-Structs
 Author-email: Asim Shrestha <asim.shrestha@hotmail.com>
 License-Expression: MIT
@@ -33,7 +33,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydicom
 Requires-Dist: numpy
-Requires-Dist: opencv-python>=4.0.0
+Requires-Dist: opencv-python-headless>=4.0.0
 Provides-Extra: nifti
 Requires-Dist: SimpleITK; extra == "nifti"
 Provides-Extra: dev
@@ -71,18 +71,12 @@ RT-Utils provides a builder class to faciliate the creation and loading of an RT
 The format for the ROI mask is an nd numpy array of type bool. It is an array of 2d binary masks, one plane for each slice location within the DICOM series. The slices should be sorted in ascending order within the mask. Through these masks, we extract the contours of the regions of interest and place them within the RT Struct file. Note that there is currently only support for the use of one frame of reference UID and structered set ROI sequence. Also note that holes within the ROI may be handled poorly.
 
 ## Installation
-```
+```bash
 pip install rt_utils
 ```
-##
-**libGL**  
-   libGL is a required system dependency. Install it on Linux using:
-   ```
-   ```bash
-   sudo apt install libgl1
-```
+
 ## Installation in editable mode
-```
+```bash
 git clone https://github.com/qurit/rt-utils.git
 cd rt-utils
 pip install -e .

{rt_utils-1.4.0 → rt_utils-1.4.1}/rt_utils.egg-info/requires.txt

@@ -1,6 +1,6 @@
 pydicom
 numpy
-opencv-python>=4.0.0
+opencv-python-headless>=4.0.0
 
 [dev]
 pytest