Mercurial > hg > orthanc

changeset 84:a84291457608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix of multi-frames
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Sep 2012 15:01:06 +0200
parents a7bffca29031
children ebce15865cce
files Core/DicomFormat/DicomMap.cpp OrthancServer/ServerIndex.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Core/DicomFormat/DicomMap.cpp	Tue Sep 25 12:06:30 2012 +0200
+++ b/Core/DicomFormat/DicomMap.cpp	Tue Sep 25 15:01:06 2012 +0200
@@ -66,7 +66,6 @@
     DicomTag(0x0020, 0x0011),   // SeriesNumber
     //DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES,
     DICOM_TAG_IMAGES_IN_ACQUISITION,
-    DICOM_TAG_NUMBER_OF_FRAMES,
     DICOM_TAG_NUMBER_OF_SLICES,
     DICOM_TAG_SERIES_INSTANCE_UID
   };
@@ -78,6 +77,7 @@
     DicomTag(0x0020, 0x0012),   // AcquisitionNumber
     DICOM_TAG_IMAGE_INDEX,
     DICOM_TAG_INSTANCE_NUMBER,
+    DICOM_TAG_NUMBER_OF_FRAMES,
     DICOM_TAG_SOP_INSTANCE_UID
   };
 
--- a/OrthancServer/ServerIndex.cpp	Tue Sep 25 12:06:30 2012 +0200
+++ b/OrthancServer/ServerIndex.cpp	Tue Sep 25 15:01:06 2012 +0200
@@ -307,7 +307,7 @@
     s.BindString(2, dicomSeries);
 
     const DicomValue* expectedNumberOfInstances;
-    if ((expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_FRAMES)) != NULL ||
+    if (//(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_FRAMES)) != NULL ||
         (expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL ||
         //(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL ||
         (expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL)