From: dbcache Date: Thu, 27 Sep 2012 13:17:45 +0000 (+0200) Subject: corrections... X-Git-Tag: v1.3.0~4^2~5 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8f2913259ad3f434058ed0360f66f04820051b82;p=clitk.git corrections... --- diff --git a/tools/clitkWriteDicomSeriesGenericFilter.txx b/tools/clitkWriteDicomSeriesGenericFilter.txx index 9d1b427..32c52e8 100644 --- a/tools/clitkWriteDicomSeriesGenericFilter.txx +++ b/tools/clitkWriteDicomSeriesGenericFilter.txx @@ -273,11 +273,6 @@ WriteDicomSeriesGenericFilter::UpdateWithDimAndPixelType() seriesUID = gdcm::Util::CreateUniqueUID( gdcmIO->GetUIDPrefix()); frameOfReferenceUID = gdcm::Util::CreateUniqueUID( gdcmIO->GetUIDPrefix()); #endif - if (m_ArgsInfo.verbose_flag) - { - DD(seriesUID); - DD(frameOfReferenceUID); - } } studyUIDGiven = (entryId == studyUIDKey); @@ -290,18 +285,13 @@ WriteDicomSeriesGenericFilter::UpdateWithDimAndPixelType() #else studyUID = gdcm::Util::CreateUniqueUID( gdcmIO->GetUIDPrefix()); #endif - if (m_ArgsInfo.verbose_flag) - DD(studyUID); } -#if GDCM_MAJOR_VERSION < 2 -<<<<<<< Updated upstream - else - gdcmIO->KeepOriginalUID(); -======= - else - gdcmIO->SetKeepOriginalUID(true); ->>>>>>> Stashed changes -#endif + } + + if (m_ArgsInfo.verbose_flag) { + DD(seriesUID); + DD(frameOfReferenceUID); + DD(studyUID); } // check if file UIDs will be be preserved @@ -311,6 +301,9 @@ WriteDicomSeriesGenericFilter::UpdateWithDimAndPixelType() else { namesGenerator->SetOutputDirectory( m_ArgsInfo.outputDir_arg ); filenames_out = namesGenerator->GetOutputFileNames(); +#if GDCM_MAJOR_VERSION < 2 + gdcmIO->SetKeepOriginalUID(true); +#endif } filenames_out.resize(numberOfFilenames);