Do not use Series Details

[clitk.git] / tools / clitkDicom2Image.cxx

diff --git a/tools/clitkDicom2Image.cxx b/tools/clitkDicom2Image.cxx
index e6e239650a19af0b8a71d0a10f6069d86aa6d655..d32fbae019e1ca525c30044f7363fbe0d1924adc 100644 (file)
--- a/tools/clitkDicom2Image.cxx
+++ b/tools/clitkDicom2Image.cxx
@@ -60,7 +60,7 @@ int main(int argc, char * argv[])
   //Get GDCMSeriesFileNames order to sort filenames
   typedef itk::GDCMSeriesFileNames NamesGeneratorType;
   NamesGeneratorType::Pointer nameGenerator = NamesGeneratorType::New();
-  nameGenerator->SetUseSeriesDetails(true);
+  nameGenerator->SetUseSeriesDetails(false);
   std::string folderName=".";
   const size_t last_slash_idx = input_files[0].rfind('/');
   if (std::string::npos != last_slash_idx)
@@ -93,11 +93,9 @@ int main(int argc, char * argv[])
     hreader.Read();
     gdcm::DataSet& ds = hreader.GetFile().GetDataSet();
 
-    if (args_info.extract_series_flag) {
-      gdcm::Attribute<0x20,0x000e> series_UID_att;
-      series_UID_att.SetFromDataSet(ds);
-      series_UID = series_UID_att.GetValue();
-    }
+    gdcm::Attribute<0x20,0x000e> series_UID_att;
+    series_UID_att.SetFromDataSet(ds);
+    series_UID = series_UID_att.GetValue().c_str();
 
     series_UIDs.insert(series_UID);
     theorigin[series_UID] = gdcm::ImageHelper::GetOriginValue(hreader.GetFile());
@@ -132,9 +130,7 @@ int main(int argc, char * argv[])
   header->SetMaxSizeLoadEntry(16384); // required ?
   header->Load();
 
-  if (args_info.extract_series_flag) {
-    series_UID = header->GetEntryValue(0x20,0x000e).c_str();
-  }
+  series_UID = header->GetEntryValue(0x20,0x000e).c_str();
 
   series_UIDs.insert(series_UID);
   theorigin[series_UID].resize(3);
@@ -168,7 +164,7 @@ int main(int argc, char * argv[])
       while (sliceIndex.size()==i && j<temp.size()) {
         const size_t last_slash_idx2 = temp[j].rfind('/');
         std::string tempFilename(temp[j]);
-        if (std::string::npos != last_slash_idx2)
+        if (temp[j][0] == '.' && std::string::npos != last_slash_idx2)
           tempFilename = temp[j].substr(last_slash_idx2+1, temp[j].size()-1);
         if (tempFilename == files[i])
           sliceIndex.push_back(j);