populator: instances_count is now applied in each series and not only MR & CT series

Author: amazy

Diff for: orthanc_tools/orthanc_test_db_populator.py

@@ -36,7 +36,7 @@ def __init__(self,
                  api_client: OrthancApiClient,
                  studies_count: int,
                  series_count: int = None,                  # to force the number of series in a study
-                 instances_count: int = None,               # to force the number of instances in a study
+                 instances_count: int = None,               # to force the number of instances in each series
                  random_seed: int = None,                   # to make the generation repeatable
                  from_study_date: datetime.date = datetime.date(2000, 1, 1),     # StudyDate for generated studies
                  to_study_date: datetime.date = datetime.date(2022, 4, 21),        # StudyDate for generated studies
@@ -172,6 +172,12 @@ def _generate_study_thread(self, thread_id):
             for series_counter in range(0, series_count):
                 tags = self.generate_series_tags(tags, series_counter, study_counter)
 
+                # force MR or CT series if the instances_count is forced at large values 
+                if self._instances_count is not None and self._instances_count > 1:
+                    tags["Modality"] = random.choice(["MR", "CT"])
+                elif self._instances_count is not None and self._instances_count == 1:
+                    tags["Modality"] = random.choice(["CR", "DX"])
+
                 if tags["Modality"] in ["MR", "CT"]:
                     if self._instances_count is not None:
                         instances_count = self._instances_count

Diff for: release-notes.md

@@ -1,3 +1,8 @@
+v 0.15.1
+========
+- `OrthancTestDbPopulator`: `instances_count` is now applied to every generated series
+  and not only MR & CT series. 
+
 v 0.15.0
 ========
 - Added `Hl7FolderMonitor` which allows to read HL7 messages from a folder. 

Diff for: setup.py

@@ -28,7 +28,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/guides/single-sourcing-package-version/
-    version='0.15.0',  # Required
+    version='0.15.1',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:

Diff for: tests/test_3_orthancs.py

@@ -146,6 +146,14 @@ def test_populator_repeatability_with_forced_quantities(self):
         self.assertEqual(a_ids, b_ids)
         self.assertEqual(len(a_ids), 2)
 
+    def test_populator_quantities(self):
+        self.oa.delete_all_content()
+
+        populator_a = OrthancTestDbPopulator(api_client=self.oa, studies_count=2, series_count=2, instances_count=10, random_seed=42)
+        populator_a.execute()
+
+        self.assertEqual(40, len(self.oa.instances.get_all_ids()))
+
 
     def test_monitor_recovery(self):
         with tempfile.TemporaryDirectory() as temp_dir: