From: Romulo Pinho <romulo.pinho@lyon.unicancer.fr>
Date: Fri, 28 Sep 2012 09:57:47 +0000 (+0200)
Subject: error in dicom key setting...
X-Git-Tag: v1.3.0~4^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6ec99bd65ed1fed5bf1fef20eb0e52243a82763a;p=clitk.git

error in dicom key setting...
---

diff --git a/tools/clitkWriteDicomSeriesGenericFilter.txx b/tools/clitkWriteDicomSeriesGenericFilter.txx
index 70123e6..9974d17 100644
--- a/tools/clitkWriteDicomSeriesGenericFilter.txx
+++ b/tools/clitkWriteDicomSeriesGenericFilter.txx
@@ -267,12 +267,12 @@ WriteDicomSeriesGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
     if (m_ArgsInfo.verbose_flag) 
       DD(entryId);
     
-    seriesUIDGiven = (entryId ==  seriesUIDkey || entryId ==  frameOfReferenceUIDKey);
-    seriesNumberGiven = (entryId == seriesNumberKey);
-    seriesDescriptionGiven = (entryId == seriesDescriptionKey);
-    studyUIDGiven = (entryId == studyUIDKey);
-    studyIDGiven = (entryId == studyIDKey);
-    studyDescriptionGiven = (entryId == studyDescriptionKey);
+    seriesUIDGiven |= (entryId ==  seriesUIDkey || entryId ==  frameOfReferenceUIDKey);
+    seriesNumberGiven |= (entryId == seriesNumberKey);
+    seriesDescriptionGiven |= (entryId == seriesDescriptionKey);
+    studyUIDGiven |= (entryId == studyUIDKey);
+    studyIDGiven |= (entryId == studyIDKey);
+    studyDescriptionGiven |= (entryId == studyDescriptionKey);
   }
 
   // force the creation of a new series if a new study was specified
@@ -367,7 +367,7 @@ WriteDicomSeriesGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
     // series description/number
     if (seriesUIDGiven || m_ArgsInfo.newSeriesUID_flag) {
       if (!seriesDescriptionGiven)
-        itk::EncapsulateMetaData<std::string>( *((*dictionary)[fni]), seriesDescriptionKey, m_ArgsInfo.outputDir_arg );
+        itk::EncapsulateMetaData<std::string>( *((*dictionary)[fni]), seriesDescriptionKey, "blabla");//m_ArgsInfo.outputDir_arg );
       if (!seriesNumberGiven)
         itk::EncapsulateMetaData<std::string>( *((*dictionary)[fni]), seriesNumberKey, m_ArgsInfo.outputDir_arg );